From 1b53767b988b339aac8b353327a1542b2a0c0610 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sun, 15 Apr 2018 22:29:33 +0200 Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules) --- CMakeLists.txt | 3 --- src/CMakeLists.txt | 8 ++++++-- tests/CMakeLists.txt | 12 +++++++++--- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index eb006d9..fa4b0cb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,9 +34,6 @@ else() set( QT_DONT_USE_QTGUI TRUE ) include( ${QT_USE_FILE} ) - macro(qt5_use_modules) - endmacro() - macro(qt_wrap_cpp) qt4_wrap_cpp(${ARGN}) endmacro() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 802125b..253e81e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -79,9 +79,13 @@ QT_WRAP_CPP(LIBMYGPO_QT_MOC_SRC ${LIBMYGPO_QT_MOC_H} ) add_library( ${MYGPO_QT_TARGET_NAME} SHARED ${LIBMYGPO_QT_SRC} ${LIBMYGPO_QT_MOC_SRC} ) -target_link_libraries( ${MYGPO_QT_TARGET_NAME} ${QJSON_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ) set_target_properties( ${MYGPO_QT_TARGET_NAME} PROPERTIES VERSION ${MYGPO_QT_VERSION} SOVERSION ${MYGPO_QT_SONAME} DEFINE_SYMBOL MYGPO_MAKEDLL) -qt5_use_modules( ${MYGPO_QT_TARGET_NAME} Core Network ) + +if( NOT BUILD_WITH_QT4 ) + target_link_libraries( ${MYGPO_QT_TARGET_NAME} Qt5::Core Qt5::Network) +else() + target_link_libraries( ${MYGPO_QT_TARGET_NAME} ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QJSON_LIBRARIES}) +endif() install( TARGETS ${MYGPO_QT_TARGET_NAME} EXPORT ${MYGPO_QT_TARGET_NAME}Export DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index a3e3223..4f77158 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -11,11 +11,15 @@ include_directories( ${QJSON_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CU # UrlBuilder library add_library( UrlBuilder ${TESTOBJECTS_SRCDIR}/UrlBuilder.cpp ${TESTOBJECTS_SRCDIR}/Config.cpp ) -qt5_use_modules( UrlBuilder Core ) +if( NOT BUILD_WITH_QT4 ) + target_link_libraries( UrlBuilder Qt5::Core ) +endif() # JSONCreator library QT_WRAP_CPP(LIBMYGPO_QT_MOC_SRC ${TESTOBJECTS_SRCDIR}/EpisodeAction.h ${TESTOBJECTS_SRCDIR}/EpisodeAction_p.h ) add_library( JsonCreator ${TESTOBJECTS_SRCDIR}/JsonCreator.cpp ${TESTOBJECTS_SRCDIR}/EpisodeAction.cpp ${TESTOBJECTS_SRCDIR}/qjsonwrapper/Json.cpp ${LIBMYGPO_QT_MOC_SRC}) -qt5_use_modules( JsonCreator Core Network ) +if( NOT BUILD_WITH_QT4 ) + target_link_libraries( JsonCreator Qt5::Core Qt5::Network ) +endif() set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) @@ -25,7 +29,9 @@ macro(add_libmygpo_test _source) add_executable(${_name} ${_source} ${${_name}_MOC_SRC}) target_link_libraries(${_name} ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ${QT_QTNETWORK_LIBRARY}) add_test(${_name}-test ${EXECUTABLE_OUTPUT_PATH}/${_name}) - qt5_use_modules(${_name} Network Test) + if( NOT BUILD_WITH_QT4 ) + target_link_libraries(${_name} Qt5::Network Qt5::Test) + endif() endmacro(add_libmygpo_test) add_libmygpo_test( UrlBuilderTest.cpp ) '>2017-10-30tests: install: Estimate the installation system disk size....1500 MiB are too small for a current system, thus let system-disk-image estimate the required size. * gnu/tests/install.scm: (run-install): Pass "#:disk-image-size 'guess" to system-disk-image. Hartmut Goebel 2017-09-26tests: install: Switch to modifying the gc-root-service-type....Fixes <https://bugs.gnu.org/28600>. Fixes a regression introduced in 4e854b1814a9216ae7cc90aef4d82fd989a519c3. Reported by Christopher Baines <mail@cbaines.net>. * gnu/tests/install.scm (operating-system-with-gc-roots): Use 'simple-service' to extend GC-ROOT-SERVICE-TYPE instead of instantiating it. Ludovic Courtès 2017-09-08tests: Fix incorrect use of 'file-append'....Fixes a regression introduced in fbc7b1f12561159e0ec3f6459d336f95cf2ce503. * gnu/tests/install.scm (run-install)[install]: Don't use 'file-append' with a string as its first argument; use a gexp with 'string-append' instead. Use a gexp instead of a list for "-cdrom IMG". Ludovic Courtès 2017-09-06tests: Add test for installing from an ISO Image....* gnu/tests/install.scm (%test-iso-image-installer): New variable. (run-install): Add #:installation-disk-image-file-system-type as a keyword argument. Christopher Baines 2017-08-23gnu: bootloader: Deprecate "device" field in favor of "target"....* gnu/bootloader.scm (<bootloader-configuration>): Deprecate "device" field in favor of "target" field. This is mostly a renaming but also a generalization to support UEFI targets being paths to a mounted partition instead of a device name. * gnu/system/examples/bare-bones.tmpl: * gnu/system/examples/desktop.tmpl: * gnu/system/examples/lightweight-desktop.tmpl: * gnu/system/examples/vm-image.tmpl: * gnu/system/install.scm: * gnu/tests.scm: * gnu/tests/install.scm: * gnu/tests/nfs.scm: * tests/system.scm: Adapt all invocations of bootloader-configuration. * guix/scripts/system.scm (perform-action): Rename device argument to bootloader-target. (process-action): Adapt caller. * doc/guix.texi (Proceeding with the Installation): * doc/guix.texi (Bootloader Configuration): Update documentation. Andy Wingo