Commit | Line | Data |
---|---|---|
01c48690 PL |
1 | From 1b53767b988b339aac8b353327a1542b2a0c0610 Mon Sep 17 00:00:00 2001 |
2 | From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> | |
3 | Date: Sun, 15 Apr 2018 22:29:33 +0200 | |
4 | Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules) | |
5 | ||
6 | --- | |
7 | CMakeLists.txt | 3 --- | |
8 | src/CMakeLists.txt | 8 ++++++-- | |
9 | tests/CMakeLists.txt | 12 +++++++++--- | |
10 | 3 files changed, 15 insertions(+), 8 deletions(-) | |
11 | ||
12 | diff --git a/CMakeLists.txt b/CMakeLists.txt | |
13 | index eb006d9..fa4b0cb 100644 | |
14 | --- a/CMakeLists.txt | |
15 | +++ b/CMakeLists.txt | |
16 | @@ -34,9 +34,6 @@ else() | |
17 | set( QT_DONT_USE_QTGUI TRUE ) | |
18 | include( ${QT_USE_FILE} ) | |
19 | ||
20 | - macro(qt5_use_modules) | |
21 | - endmacro() | |
22 | - | |
23 | macro(qt_wrap_cpp) | |
24 | qt4_wrap_cpp(${ARGN}) | |
25 | endmacro() | |
26 | diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt | |
27 | index 802125b..253e81e 100644 | |
28 | --- a/src/CMakeLists.txt | |
29 | +++ b/src/CMakeLists.txt | |
30 | @@ -79,9 +79,13 @@ QT_WRAP_CPP(LIBMYGPO_QT_MOC_SRC ${LIBMYGPO_QT_MOC_H} ) | |
31 | ||
32 | add_library( ${MYGPO_QT_TARGET_NAME} SHARED ${LIBMYGPO_QT_SRC} ${LIBMYGPO_QT_MOC_SRC} ) | |
33 | ||
34 | -target_link_libraries( ${MYGPO_QT_TARGET_NAME} ${QJSON_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ) | |
35 | set_target_properties( ${MYGPO_QT_TARGET_NAME} PROPERTIES VERSION ${MYGPO_QT_VERSION} SOVERSION ${MYGPO_QT_SONAME} DEFINE_SYMBOL MYGPO_MAKEDLL) | |
36 | -qt5_use_modules( ${MYGPO_QT_TARGET_NAME} Core Network ) | |
37 | + | |
38 | +if( NOT BUILD_WITH_QT4 ) | |
39 | + target_link_libraries( ${MYGPO_QT_TARGET_NAME} Qt5::Core Qt5::Network) | |
40 | +else() | |
41 | + target_link_libraries( ${MYGPO_QT_TARGET_NAME} ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QJSON_LIBRARIES}) | |
42 | +endif() | |
43 | ||
44 | install( TARGETS ${MYGPO_QT_TARGET_NAME} EXPORT ${MYGPO_QT_TARGET_NAME}Export DESTINATION ${LIB_INSTALL_DIR} ) | |
45 | ||
46 | diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt | |
47 | index a3e3223..4f77158 100644 | |
48 | --- a/tests/CMakeLists.txt | |
49 | +++ b/tests/CMakeLists.txt | |
50 | @@ -11,11 +11,15 @@ include_directories( ${QJSON_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CU | |
51 | ||
52 | # UrlBuilder library | |
53 | add_library( UrlBuilder ${TESTOBJECTS_SRCDIR}/UrlBuilder.cpp ${TESTOBJECTS_SRCDIR}/Config.cpp ) | |
54 | -qt5_use_modules( UrlBuilder Core ) | |
55 | +if( NOT BUILD_WITH_QT4 ) | |
56 | + target_link_libraries( UrlBuilder Qt5::Core ) | |
57 | +endif() | |
58 | # JSONCreator library | |
59 | QT_WRAP_CPP(LIBMYGPO_QT_MOC_SRC ${TESTOBJECTS_SRCDIR}/EpisodeAction.h ${TESTOBJECTS_SRCDIR}/EpisodeAction_p.h ) | |
60 | add_library( JsonCreator ${TESTOBJECTS_SRCDIR}/JsonCreator.cpp ${TESTOBJECTS_SRCDIR}/EpisodeAction.cpp ${TESTOBJECTS_SRCDIR}/qjsonwrapper/Json.cpp ${LIBMYGPO_QT_MOC_SRC}) | |
61 | -qt5_use_modules( JsonCreator Core Network ) | |
62 | +if( NOT BUILD_WITH_QT4 ) | |
63 | + target_link_libraries( JsonCreator Qt5::Core Qt5::Network ) | |
64 | +endif() | |
65 | ||
66 | set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) | |
67 | ||
68 | @@ -25,7 +29,9 @@ macro(add_libmygpo_test _source) | |
69 | add_executable(${_name} ${_source} ${${_name}_MOC_SRC}) | |
70 | target_link_libraries(${_name} ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ${QT_QTNETWORK_LIBRARY}) | |
71 | add_test(${_name}-test ${EXECUTABLE_OUTPUT_PATH}/${_name}) | |
72 | - qt5_use_modules(${_name} Network Test) | |
73 | + if( NOT BUILD_WITH_QT4 ) | |
74 | + target_link_libraries(${_name} Qt5::Network Qt5::Test) | |
75 | + endif() | |
76 | endmacro(add_libmygpo_test) | |
77 | ||
78 | add_libmygpo_test( UrlBuilderTest.cpp ) |