From 3897cbb499ac9ed9bcb828439c932e902050c1ac Mon Sep 17 00:00:00 2001 From: Nathan Osman Date: Wed, 25 Mar 2015 16:33:44 -0700 Subject: [PATCH] Lowered CMake version to 2.8.9 and used qt5_use_modules function. --- CMakeLists.txt | 2 +- src/CMakeLists.txt | 2 +- tests/CMakeLists.txt | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a280e4d..4ecf794 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.9) project(qhttpengine) option(BUILD_DOC "Build Doxygen documentation" OFF) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 674e5c0..3ab09c1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -15,7 +15,7 @@ set(SRC ) add_library(qhttpengine SHARED ${SRC}) -target_link_libraries(qhttpengine Qt5::Network) +qt5_use_modules(qhttpengine Network) set_target_properties(qhttpengine PROPERTIES DEFINE_SYMBOL QHTTPENGINE_LIBRARY diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 697c286..90fd1bc 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -10,6 +10,8 @@ set(TESTS foreach(TEST ${TESTS}) add_executable(${TEST} "${TEST}.cpp") - target_link_libraries(${TEST} Qt5::Test qhttpengine) + qt5_use_modules(${TEST} Test) + target_link_libraries(${TEST} qhttpengine) + add_test(NAME ${TEST} COMMAND ${TEST}) endforeach()