diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2018-06-24 08:43:40 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-24 08:43:40 (GMT) |
| commit | 8e767d891c68f9ac71c9d75ea963f0ae5cc0edce (patch) | |
| tree | fab0c244c0e09e349b79e348c662d5fd39560b04 | |
| parent | ed4c27d0ca1676fdba70985d929c2a12cfec9a67 (diff) | |
| parent | a74e24784f4d5b6be5cd2167340a7572d869e220 (diff) | |
| download | Doxygen-8e767d891c68f9ac71c9d75ea963f0ae5cc0edce.zip Doxygen-8e767d891c68f9ac71c9d75ea963f0ae5cc0edce.tar.gz Doxygen-8e767d891c68f9ac71c9d75ea963f0ae5cc0edce.tar.bz2 | |
Merge pull request #772 from pgajdos/master
fix build with qt 5.11
| -rw-r--r-- | addon/doxywizard/CMakeLists.txt | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/addon/doxywizard/CMakeLists.txt b/addon/doxywizard/CMakeLists.txt index 0907d23..810c0d0 100644 --- a/addon/doxywizard/CMakeLists.txt +++ b/addon/doxywizard/CMakeLists.txt @@ -4,9 +4,6 @@ if (NOT force_qt4) if (Qt5Core_FOUND) message(STATUS "Using Qt5") find_package(Qt5 COMPONENTS Widgets Gui Xml) - macro(qt_use_modules) - qt5_use_modules(${ARGN}) - endmacro() macro(qt_wrap_cpp) qt5_wrap_cpp(${ARGN}) endmacro() @@ -23,8 +20,6 @@ if (NOT Qt5Core_FOUND) message(STATUS "Using Qt4") endif() find_package(Qt4 REQUIRED COMPONENTS QtCore QtXml QtGui) - macro(qt_use_modules) - endmacro() macro(qt_wrap_cpp) qt4_wrap_cpp(${ARGN}) endmacro() @@ -104,9 +99,11 @@ ${GENERATED_SRC_WIZARD}/configdoc.cpp ${doxywizard_MOC} ${doxywizard_RESOURCES_RCC} ) -qt_use_modules(doxywizard Core Gui Widgets Xml) -target_link_libraries(doxywizard -${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} -) + +if(Qt5Core_FOUND) + target_link_libraries(doxywizard Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml) +else() + target_link_libraries(doxywizard ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY}) +endif() install(TARGETS doxywizard DESTINATION bin) |