summaryrefslogtreecommitdiffstats
path: root/tests/auto/cmake/pass1/CMakeLists.txt
diff options
context:
space:
mode:
authorStephen Kelly <stephen.kelly@kdab.com>2012-05-05 23:40:19 +0200
committerQt by Nokia <qt-info@nokia.com>2012-05-10 23:15:56 +0200
commitc2f8fe64f1273ed25a8e5834f86dc19b79805855 (patch)
treecc885f61da329b384d1b79a62174db8f8f68be1d /tests/auto/cmake/pass1/CMakeLists.txt
parent78b9de746c9328cb56339d36598a67977360be2b (diff)
Make the qt5_use_modules public API.
This cmake function handles all of the necessary logic for using the include directories of Qt modules, linking to Qt modules, adding the required definitions, and most importantly, adding the position independent flags required on UNIX systems to use Qt by default. The function relies on functionality available in CMake 2.8.8, so it is only available if that version of CMake or greater is used. Change-Id: Ibe698e06819129479348c240844264c41553b5fb Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'tests/auto/cmake/pass1/CMakeLists.txt')
-rw-r--r--tests/auto/cmake/pass1/CMakeLists.txt41
1 files changed, 5 insertions, 36 deletions
diff --git a/tests/auto/cmake/pass1/CMakeLists.txt b/tests/auto/cmake/pass1/CMakeLists.txt
index cbe3afc7c4..d8efadc8ed 100644
--- a/tests/auto/cmake/pass1/CMakeLists.txt
+++ b/tests/auto/cmake/pass1/CMakeLists.txt
@@ -7,42 +7,11 @@ set(CMAKE_AUTOMOC ON)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
-macro(qt5_use_package _target _package)
- if (NOT Qt5${_package}_FOUND)
- find_package(Qt5${_package} ${ARG1})
- endif()
- if (Qt5${_package}_FOUND)
- # TODO: Handle public/private keywords?
- target_link_libraries(${_target} ${Qt5${_package}_LIBRARIES})
- # ### Requires CMake 2.8.8:
- # set_property(TARGET ${_target} APPEND PROPERTY INCLUDE_DIRECTORIES ${Qt5${_package}_INCLUDE_DIRS})
- include_directories(${Qt5${_package}_INCLUDE_DIRS})
- set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS ${Qt5${_package}_COMPILE_DEFINITIONS})
-
- # We can't just append to the COMPILE_FLAGS property. That creats a ';' separated list
- # which breaks the compile commmand line.
- # Ensure non-duplication here manually instead.
- get_property(_taget_type TARGET ${_target} PROPERTY TYPE)
- if ("${_taget_type}" STREQUAL "EXECUTABLE")
- get_target_property(_flags ${_target} COMPILE_FLAGS)
- if (_flags)
- list(APPEND _flags ${Qt5${_package}_EXECUTABLE_COMPILE_FLAGS})
- list(REMOVE_DUPLICATES _flags)
- else()
- set(_flags ${Qt5${_package}_EXECUTABLE_COMPILE_FLAGS})
- endif()
- if (_flags)
- set_target_properties(${_target} PROPERTIES COMPILE_FLAGS ${_flags})
- endif()
- endif()
- else()
- message(FATAL_ERROR "NOT FOUND: Qt5${_package}")
- endif()
-endmacro()
-
add_executable(two two.cpp)
add_executable(three three.cpp)
-qt5_use_package(two Test)
-qt5_use_package(three Widgets)
-qt5_use_package(three Test)
+find_package(Qt5Test)
+find_package(Qt5Widgets)
+
+qt5_use_modules(two Test)
+qt5_use_modules(three Widgets Test)