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

compile QtPropertyBrowser

Browse Source
This commit is contained in:
Miodrag Milanovic 2018-06-11 19:36:39 +02:00
parent eb392f649e
commit f1cf449c09
9 changed files with 42 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

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

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

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

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

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

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

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

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

2
CMakeLists.txt
View File

@ -93,7 +93,7 @@ foreach (family ${FAMILIES})
foreach (target ${family_targets})
# Include family-specific source files to all family targets and set defines appropriately
target_include_directories(${target} PRIVATE ${family}/)
target_compile_definitions(${target} PRIVATE ARCH_${ufamily} ARCHNAME=${family})
target_compile_definitions(${target} PRIVATE ARCH_${ufamily} ARCHNAME=${family} -DQT_NO_KEYWORDS)
target_link_libraries(${target} LINK_PUBLIC ${Boost_LIBRARIES} ${PYTHON_LIBRARIES} ${GUI_LIBRARY_FILES})
endforeach (target)
endforeach (family)

37
gui/gui.cmake
View File

@ -2,8 +2,6 @@
find_package(Qt5 COMPONENTS Core Widgets OpenGL REQUIRED)
find_package(OpenGL REQUIRED)
ADD_DEFINITIONS(-DQT_NO_KEYWORDS)
include( gui/Qt5Customizations.cmake )
# Find includes in corresponding build directories
@ -24,4 +22,37 @@ qt5_wrap_ui_custom(GENERATED_UI_HEADERS ${UI_SOURCES})
qt5_add_resources_custom(GUI_RESOURCE_FILES gui/nextpnr.qrc)
set(GUI_SOURCE_FILES gui/mainwindow.cc gui/fpgaviewwidget.cc gui/emb.cc ${GENERATED_MOC_FILES} ${GENERATED_UI_HEADERS} ${GUI_RESOURCE_FILES})
set(GUI_LIBRARY_FILES Qt5::Widgets Qt5::OpenGL ${OPENGL_LIBRARIES})
set(GUI_LIBRARY_FILES Qt5::Widgets Qt5::OpenGL ${OPENGL_LIBRARIES})
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/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
)
aux_source_directory(3rdparty/QtPropertyBrowser/src/ QTPROPBROWSER_SRC_ALL)
target_sources(QtPropertyBrowser PRIVATE ${QTPROPBROWSER_SRC_ALL} ${QTPB_GENERATED_MOC_FILES} )
target_include_directories(QtPropertyBrowser PRIVATE 3rdparty/QtPropertyBrowser/src generated)
target_link_libraries(QtPropertyBrowser PRIVATE Qt5::Widgets)