From 5f5eb8c9bf2f28fc88e19b4de3e43d60b56583af Mon Sep 17 00:00:00 2001 From: Alex Neundorf Date: Fri, 18 Nov 2011 19:41:45 +0100 Subject: change comment Alex --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 202fcc9a..9e12e23c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.4 FATAL_ERROR) # this will be upgraded to 2.8.6 +cmake_minimum_required(VERSION 2.8.4 FATAL_ERROR) # this will be upgraded to 2.8.6, and 2.8.7 soon project(extra-cmake-modules) -- cgit v1.2.1 From 0cf9c3c11d65cae585039d87e858adbe934dad5b Mon Sep 17 00:00:00 2001 From: Alex Neundorf Date: Fri, 18 Nov 2011 20:16:17 +0100 Subject: ...just testing Alex --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9e12e23c..202fcc9a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.4 FATAL_ERROR) # this will be upgraded to 2.8.6, and 2.8.7 soon +cmake_minimum_required(VERSION 2.8.4 FATAL_ERROR) # this will be upgraded to 2.8.6 project(extra-cmake-modules) -- cgit v1.2.1 From 4c2ffd7066970560f49d8d28c0035c114f333b7c Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Fri, 25 Nov 2011 01:18:26 +0100 Subject: Set a variable to clear the link interface libraries. This will only have an effect in CMake 2.8.7, but is harmless until then. --- modules/ECMQtFramework.cmake | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/ECMQtFramework.cmake b/modules/ECMQtFramework.cmake index 3d9eefa9..a87246d2 100644 --- a/modules/ECMQtFramework.cmake +++ b/modules/ECMQtFramework.cmake @@ -80,6 +80,10 @@ # the preprocessor. The version file must be installed by the user. # # 15) The FeatureSummary module is included. +# +# 16) The CMAKE_LINK_INTERFACE_LIBRARIES variable is set to empty. This means that the library targets created +# will have an empty link interface unless the LINK_INTERFACE_LIBRARIES or the LINK_PUBLIC keyword +# to target_link_libraries are used. # We need to make sure this file is included before Qt found. # Otherwise QT_USE_IMPORTED_TARGETS would have no effect. @@ -94,6 +98,9 @@ include(GenerateExportHeader) add_compiler_export_flags() +# This will only have an effect in CMake 2.8.7 +set(CMAKE_LINK_INTERFACE_LIBRARIES "") + # create coverage build type set(CMAKE_CONFIGURATION_TYPES ${CMAKE_CONFIGURATION_TYPES} Coverage) if(${CMAKE_VERSION} VERSION_GREATER 2.8.2) -- cgit v1.2.1