caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

put source changes for qtpropertybrowser back and make build simple

Browse Source
This commit is contained in:
Miodrag Milanovic 2018-06-20 14:24:16 +02:00
parent e45508f6c4
commit e14b8bac66
12 changed files with 16 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
3rdparty/QtPropertyBrowser/.gitignore vendored
View File

@ -29,3 +29,9 @@
# Ignores 'build' in any sub folder # Ignores 'build' in any sub folder
build/ build/
src/moc_*.cpp
src/*.moc
src/qrc_*.cpp
src/*_automoc.cpp
src/*_export.h

41
3rdparty/QtPropertyBrowser/CMakeLists.txt vendored
View File

@ -1,17 +1,6 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11) CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
PROJECT(QtPropertyBrowser) PROJECT(QtPropertyBrowser)
########################### Misc. Configs ##############################
# Add custom cmake files folder
SET (PROJECT_CMAKE_DIR ${PROJECT_SOURCE_DIR}/cmake)
SET (CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${PROJECT_CMAKE_DIR}")
# Add custom Compile Settings and flags
INCLUDE(CompileSettings)
# Add custom Install Settings
INCLUDE(InstallSettings)
##################### Look for required libraries ###################### ##################### Look for required libraries ######################
# Add QT dependencies # Add QT dependencies
@ -19,33 +8,3 @@ FIND_PACKAGE(Qt5Widgets REQUIRED)
######################### Add Primary Targets ########################## ######################### Add Primary Targets ##########################
ADD_SUBDIRECTORY(src) ADD_SUBDIRECTORY(src)
########################## Add the Examples ############################
OPTION (BUILD_EXAMPLES "Build Examples" ON)
IF(BUILD_EXAMPLES)
ADD_SUBDIRECTORY(examples)
ENDIF()
######################### Installation Stuff ###########################
INCLUDE(InstallProjectConfig)
###################### Add uninstall target ############################
ADD_CUSTOM_TARGET(uninstall
COMMAND ${CMAKE_COMMAND} -P ${PROJECT_CMAKE_DIR}/cmake_uninstall.cmake)
##################### Show Configuration Summary ######################
MESSAGE(STATUS "===============================================================")
MESSAGE(STATUS "================ Configuration Summary ======================")
MESSAGE(STATUS "Project Name: ${PROJECT_NAME}")
MESSAGE(STATUS "Build type: ${CMAKE_BUILD_TYPE}")
MESSAGE(STATUS "Build type Flags: ${CMAKE_BUILD_TYPE_FLAGS}")
MESSAGE(STATUS "C++ compile flags: ${CMAKE_CXX_FLAGS}")
MESSAGE(STATUS "Install Path: ${CMAKE_INSTALL_PREFIX}")
MESSAGE(STATUS "Build Examples: ${BUILD_EXAMPLES}")
IF(Qt5Widgets_FOUND)
MESSAGE(STATUS "QT Version: ${Qt5Widgets_VERSION_STRING}")
MESSAGE(STATUS "QT INCLUDE DIRS: ${Qt5Widgets_INCLUDE_DIRS}")
MESSAGE(STATUS "QT COMPILE DEFS: ${Qt5Widgets_COMPILE_DEFINITIONS}")
MESSAGE(STATUS "QT DEFS: ${Qt5Widgets_DEFINITIONS}")
MESSAGE(STATUS "QT EXE FLAGS: ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
ENDIF()

28
3rdparty/QtPropertyBrowser/src/CMakeLists.txt vendored
View File

@ -16,9 +16,6 @@ set(_SRCS
qtvariantproperty.cpp qtvariantproperty.cpp
) )
file(GLOB _IMPL_HDRS *.h)
file(GLOB _PUBLIC_HDRS Qt*)
set(_UI_FORMS set(_UI_FORMS
) )
@ -31,7 +28,7 @@ QT5_ADD_RESOURCES(_QRC_SRCS ${_RESOURCES})
set(TARGET_NAME ${PROJECT_NAME}) set(TARGET_NAME ${PROJECT_NAME})
add_library(${TARGET_NAME} add_library(${TARGET_NAME} STATIC
${_SRCS} ${_SRCS}
${_UI_SRCS} ${_UI_SRCS}
${_QRC_SRCS} ${_QRC_SRCS}
@ -39,26 +36,3 @@ add_library(${TARGET_NAME}
) )
target_link_libraries(${TARGET_NAME} Qt5::Widgets) target_link_libraries(${TARGET_NAME} Qt5::Widgets)
######################### Installation Stuff ###########################
include(GenerateExportHeader)
generate_export_header(${TARGET_NAME})
install(TARGETS ${TARGET_NAME}
EXPORT ${TARGET_NAME}Targets
RUNTIME DESTINATION ${INSTALL_BIN_DIR}
LIBRARY DESTINATION ${INSTALL_LIB_DIR}
ARCHIVE DESTINATION ${INSTALL_LIB_DIR}
INCLUDES DESTINATION ${INSTALL_INCLUDE_DIR}
)
install(
FILES
${_PUBLIC_HDRS}
${_IMPL_HDRS}
DESTINATION
${INSTALL_INCLUDE_DIR}
COMPONENT
Devel
)

2
3rdparty/QtPropertyBrowser/src/qtbuttonpropertybrowser.cpp vendored
View File

@ -626,4 +626,4 @@ bool QtButtonPropertyBrowser::isExpanded(QtBrowserItem *item) const
QT_END_NAMESPACE QT_END_NAMESPACE
#endif #endif
#include "moc_qtbuttonpropertybrowser.hpp" #include "moc_qtbuttonpropertybrowser.cpp"

2
3rdparty/QtPropertyBrowser/src/qteditorfactory.cpp vendored
View File

@ -2575,5 +2575,5 @@ void QtFontEditorFactory::disconnectPropertyManager(QtFontPropertyManager *manag
QT_END_NAMESPACE QT_END_NAMESPACE
#endif #endif
#include "moc_qteditorfactory.hpp" #include "moc_qteditorfactory.cpp"
#include "qteditorfactory.moc" #include "qteditorfactory.moc"

2
3rdparty/QtPropertyBrowser/src/qtgroupboxpropertybrowser.cpp vendored
View File

@ -533,4 +533,4 @@ void QtGroupBoxPropertyBrowser::itemChanged(QtBrowserItem *item)
QT_END_NAMESPACE QT_END_NAMESPACE
#endif #endif
#include "moc_qtgroupboxpropertybrowser.hpp" #include "moc_qtgroupboxpropertybrowser.cpp"

2
3rdparty/QtPropertyBrowser/src/qtpropertybrowser.cpp vendored
View File

@ -2045,4 +2045,4 @@ void QtAbstractPropertyBrowser::setCurrentItem(QtBrowserItem *item)
QT_END_NAMESPACE QT_END_NAMESPACE
#endif #endif
#include "moc_qtpropertybrowser.hpp" #include "moc_qtpropertybrowser.cpp"

2
3rdparty/QtPropertyBrowser/src/qtpropertymanager.cpp vendored
View File

@ -6421,5 +6421,5 @@ void QtCursorPropertyManager::uninitializeProperty(QtProperty *property)
QT_END_NAMESPACE QT_END_NAMESPACE
#endif #endif
#include "moc_qtpropertymanager.hpp" #include "moc_qtpropertymanager.cpp"
#include "qtpropertymanager.moc" #include "qtpropertymanager.moc"

2
3rdparty/QtPropertyBrowser/src/qttreepropertybrowser.cpp vendored
View File

@ -1072,5 +1072,5 @@ void QtTreePropertyBrowser::editItem(QtBrowserItem *item)
QT_END_NAMESPACE QT_END_NAMESPACE
#endif #endif
#include "moc_qttreepropertybrowser.hpp" #include "moc_qttreepropertybrowser.cpp"
#include "qttreepropertybrowser.moc" #include "qttreepropertybrowser.moc"

2
3rdparty/QtPropertyBrowser/src/qtvariantproperty.cpp vendored
View File

@ -2355,4 +2355,4 @@ void QtVariantEditorFactory::disconnectPropertyManager(QtVariantPropertyManager
QT_END_NAMESPACE QT_END_NAMESPACE
#endif #endif
#include "moc_qtvariantproperty.hpp" #include "moc_qtvariantproperty.cpp"

2
CMakeLists.txt
View File

@ -26,6 +26,8 @@ execute_process(
add_subdirectory(3rdparty/googletest/googletest EXCLUDE_FROM_ALL) add_subdirectory(3rdparty/googletest/googletest EXCLUDE_FROM_ALL)
enable_testing() enable_testing()
add_subdirectory(3rdparty/QtPropertyBrowser)
add_definitions("-DGIT_COMMIT_HASH=${GIT_COMMIT_HASH}") add_definitions("-DGIT_COMMIT_HASH=${GIT_COMMIT_HASH}")
configure_file( configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/common/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/generated/version.h ${CMAKE_CURRENT_SOURCE_DIR}/common/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/generated/version.h

36
gui/gui.cmake
View File

@ -28,39 +28,3 @@ qt5_add_resources_custom(GUI_RESOURCE_FILES gui/nextpnr.qrc)
aux_source_directory(gui/ GUI_ALL_SOURCE_FILES) aux_source_directory(gui/ GUI_ALL_SOURCE_FILES)
set(GUI_SOURCE_FILES ${GUI_ALL_SOURCE_FILES} ${GENERATED_MOC_FILES} ${GENERATED_UI_HEADERS} ${GUI_RESOURCE_FILES}) set(GUI_SOURCE_FILES ${GUI_ALL_SOURCE_FILES} ${GENERATED_MOC_FILES} ${GENERATED_UI_HEADERS} ${GUI_RESOURCE_FILES})
set(GUI_LIBRARY_FILES Qt5::Widgets Qt5::OpenGL ${OPENGL_LIBRARIES} QtPropertyBrowser) set(GUI_LIBRARY_FILES Qt5::Widgets Qt5::OpenGL ${OPENGL_LIBRARIES} QtPropertyBrowser)
add_library(QtPropertyBrowser STATIC "")
qt5_generate_moc(3rdparty/QtPropertyBrowser/src/qtpropertybrowser.h ${CMAKE_CURRENT_BINARY_DIR}/generated/moc_qtpropertybrowser.hpp)
qt5_generate_moc(3rdparty/QtPropertyBrowser/src/qtgroupboxpropertybrowser.h ${CMAKE_CURRENT_BINARY_DIR}/generated/moc_qtgroupboxpropertybrowser.hpp)
qt5_generate_moc(3rdparty/QtPropertyBrowser/src/qtvariantproperty.h ${CMAKE_CURRENT_BINARY_DIR}/generated/moc_qtvariantproperty.hpp)
qt5_generate_moc(3rdparty/QtPropertyBrowser/src/qtpropertymanager.h ${CMAKE_CURRENT_BINARY_DIR}/generated/moc_qtpropertymanager.hpp)
qt5_generate_moc(3rdparty/QtPropertyBrowser/src/qtbuttonpropertybrowser.h ${CMAKE_CURRENT_BINARY_DIR}/generated/moc_qtbuttonpropertybrowser.hpp)
qt5_generate_moc(3rdparty/QtPropertyBrowser/src/qteditorfactory.h ${CMAKE_CURRENT_BINARY_DIR}/generated/moc_qteditorfactory.hpp)
qt5_generate_moc(3rdparty/QtPropertyBrowser/src/qttreepropertybrowser.h ${CMAKE_CURRENT_BINARY_DIR}/generated/moc_qttreepropertybrowser.hpp)
qt5_generate_moc(3rdparty/QtPropertyBrowser/src/qtpropertybrowserutils_p.h ${CMAKE_CURRENT_BINARY_DIR}/generated/moc_qtpropertybrowserutils_p.cpp)
qt5_generate_moc(3rdparty/QtPropertyBrowser/src/qtpropertymanager.cpp ${CMAKE_CURRENT_BINARY_DIR}/generated/qtpropertymanager.moc)
qt5_generate_moc(3rdparty/QtPropertyBrowser/src/qttreepropertybrowser.cpp ${CMAKE_CURRENT_BINARY_DIR}/generated/qttreepropertybrowser.moc)
qt5_generate_moc(3rdparty/QtPropertyBrowser/src/qteditorfactory.cpp ${CMAKE_CURRENT_BINARY_DIR}/generated/qteditorfactory.moc)
set(QTPB_GENERATED_MOC_FILES
${CMAKE_CURRENT_BINARY_DIR}/generated/moc_qtpropertybrowser.hpp
${CMAKE_CURRENT_BINARY_DIR}/generated/moc_qtgroupboxpropertybrowser.hpp
${CMAKE_CURRENT_BINARY_DIR}/generated/moc_qtvariantproperty.hpp
${CMAKE_CURRENT_BINARY_DIR}/generated/moc_qtpropertymanager.hpp
${CMAKE_CURRENT_BINARY_DIR}/generated/moc_qtbuttonpropertybrowser.hpp
${CMAKE_CURRENT_BINARY_DIR}/generated/moc_qteditorfactory.hpp
${CMAKE_CURRENT_BINARY_DIR}/generated/moc_qttreepropertybrowser.hpp
${CMAKE_CURRENT_BINARY_DIR}/generated/qtpropertymanager.moc
${CMAKE_CURRENT_BINARY_DIR}/generated/qttreepropertybrowser.moc
${CMAKE_CURRENT_BINARY_DIR}/generated/qteditorfactory.moc
${CMAKE_CURRENT_BINARY_DIR}/generated/moc_qtpropertybrowserutils_p.cpp
)
qt5_add_resources_custom(QTPB_RESOURCE_FILES 3rdparty/QtPropertyBrowser/src/qtpropertybrowser.qrc)
aux_source_directory(3rdparty/QtPropertyBrowser/src/ QTPROPBROWSER_SRC_ALL)
target_sources(QtPropertyBrowser PRIVATE ${QTPROPBROWSER_SRC_ALL} ${QTPB_GENERATED_MOC_FILES} ${QTPB_RESOURCE_FILES})
target_include_directories(QtPropertyBrowser PRIVATE 3rdparty/QtPropertyBrowser/src generated)
target_link_libraries(QtPropertyBrowser PRIVATE Qt5::Core Qt5::Widgets)