Message info
 
To:kde-commits@kde.org From:Alex Neundorf Subject:[extra-cmake-modules] modules: don\'t generate and install a Use-file anymore Date:Mon, 7 May 2012 22:34:58 +0200 (CEST)
 

Git commit ae1191b1a85a73151fffe084e853581683698489 by Alex Neundorf.
Committed on 07/05/2012 at 22:33.
Pushed by neundorf into branch 'master'.

don't generate and install a Use-file anymore

As discussed with Stephen on kde-frameworks-devel

Alex

M +3 -21 modules/ECMQtFramework.cmake
D +0 -4 modules/ECMQtUseFile.cmake.in

http://commits.kde.org/extra-cmake-modules/ae1191b1a85a73151fffe084e853581683698489

diff --git a/modules/ECMQtFramework.cmake b/modules/ECMQtFramework.cmake
index 482b922..5cc428b 100644
--- a/modules/ECMQtFramework.cmake
+++ b/modules/ECMQtFramework.cmake
@@ -70,18 +70,12 @@
#
# 12) The targets file is installed. This means that myspeciallib can be used as an imported target.
#
-# 13) A USE file is installed. This means that consumers of myspeciallib can
-#
-# include(${myspeciallib_USE_FILE})
-#
-# which will include the Qt USE file, and add the header directories for myspeciallib to include_directories()
-#
-# 14) A version file is created called myspeciallib_version.h, which contains version information usable by
+# 13) A version file is created called myspeciallib_version.h, which contains version information usable by
# the preprocessor. The version file must be installed by the user.
#
-# 15) The FeatureSummary module is included.
+# 14) The FeatureSummary module is included.
#
-# 16) The CMAKE_LINK_INTERFACE_LIBRARIES variable is set to empty. This means that the library targets created
+# 15) 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.

@@ -136,12 +130,6 @@ write_basic_config_version_file("${CMAKE_BINARY_DIR}/${PROJECT_NAME}ConfigVersio
COMPATIBILITY AnyNewerVersion
)

-configure_file(
- "${CMAKE_CURRENT_LIST_DIR}/ECMQtUseFile.cmake.in"
- "${CMAKE_BINARY_DIR}/${PROJECT_NAME}Use.cmake"
- @ONLY
-)
-
install(FILES
"${CMAKE_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
"${CMAKE_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
@@ -156,12 +144,6 @@ install(FILES
#COMPONENT Devel
#)

-install(FILES
- "${CMAKE_BINARY_DIR}/${PROJECT_NAME}Use.cmake"
- DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
- COMPONENT Devel
-)
-
string(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UPPER)

configure_file(
diff --git a/modules/ECMQtUseFile.cmake.in b/modules/ECMQtUseFile.cmake.in
deleted file mode 100644
index 39d0f51..0000000
--- a/modules/ECMQtUseFile.cmake.in
+++ /dev/null
@@ -1,4 +0,0 @@
-find_package(Qt4 REQUIRED)
-include(${QT_USE_FILE})
-
-include_directories(${@PROJECT_NAME@_INCLUDE_DIR})