diff options
author | albert-github <albert.tests@gmail.com> | 2018-07-12 12:19:00 (GMT) |
---|---|---|
committer | albert-github <albert.tests@gmail.com> | 2018-07-12 12:19:00 (GMT) |
commit | 858d65a9cd7b9b7cf71da01098f47d583b3322f5 (patch) | |
tree | 965217503677442e224e80549bee3d0aea3a7857 /addon | |
parent | 5b735d5118581e3bca686f79de341b8b2e76691f (diff) | |
parent | 56c60e84e6dd6d7e4e7774be24d1402782fd3230 (diff) | |
download | Doxygen-858d65a9cd7b9b7cf71da01098f47d583b3322f5.zip Doxygen-858d65a9cd7b9b7cf71da01098f47d583b3322f5.tar.gz Doxygen-858d65a9cd7b9b7cf71da01098f47d583b3322f5.tar.bz2 |
Merge branch 'feature/bug_tableofcontents_latex' of https://github.com/albert-github/doxygen into feature/bug_tableofcontents_latex
Diffstat (limited to 'addon')
-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) |