rpm/doxygen
SHA256
1
0
Fork 0
forked from pool/doxygen
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/devel:tools/doxygen?expand=0&rev=129

Browse Source
This commit is contained in:
Petr Gajdos 2018-06-19 12:05:05 +00:00 committed by Git OBS Bridge
parent f4ea61d56e
commit cda618380b
1 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
doxywizard-qt-5.11.patch
View File

@ -1,15 +1,38 @@
Index: doxygen-1.8.14/addon/doxywizard/CMakeLists.txt
===================================================================
--- doxygen-1.8.14.orig/addon/doxywizard/CMakeLists.txt
+++ doxygen-1.8.14/addon/doxywizard/CMakeLists.txt
@@ -104,9 +104,8 @@ ${GENERATED_SRC_WIZARD}/configdoc.cpp
--- a/addon/doxywizard/CMakeLists.txt
+++ a/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
-target_link_libraries(doxywizard
-${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY}
+ Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml
)
-)
+
+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)