[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kde-workspace] /: Use ecm_configure_package_config_file on the libs as well
From:       Àlex_Fiestas <afiestas () kde ! org>
Date:       2014-03-27 11:41:55
Message-ID: E1WT8h1-0004K8-Jq () scm ! kde ! org
[Download RAW message or body]

Git commit 2fb7f6682c8e1ed02686f6b70538ce8bfb3c5c32 by =C3=80lex Fiestas.
Committed on 27/03/2014 at 11:37.
Pushed by afiestas into branch 'master'.

Use ecm_configure_package_config_file on the libs as well

M  +6    -3    libksysguard/CMakeLists.txt
M  +4    -3    plasma-workspace/libkworkspace/CMakeLists.txt
M  +5    -3    plasma-workspace/libtaskmanager/CMakeLists.txt

http://commits.kde.org/kde-workspace/2fb7f6682c8e1ed02686f6b70538ce8bfb3c5c=
32

diff --git a/libksysguard/CMakeLists.txt b/libksysguard/CMakeLists.txt
index c743070..fef8de9 100644
--- a/libksysguard/CMakeLists.txt
+++ b/libksysguard/CMakeLists.txt
@@ -22,8 +22,10 @@ include(KDECompilerSettings)
 =

 include(ECMAddTests)
 include(ECMInstallIcons)
+include(ECMPackageConfigHelpers)
 include(CheckIncludeFiles)
 =

+
 set(LIBKSYSGUARD_VERSION_MAJOR 4)
 set(LIBKSYSGUARD_VERSION_MINOR 90)
 set(LIBKSYSGUARD_VERSION_PATCH 1)
@@ -62,10 +64,11 @@ add_subdirectory( tests )
 install(DIRECTORY scripts/ DESTINATION ${DATA_INSTALL_DIR}/ksysguard/scrip=
ts)
 =

 set(CMAKECONFIG_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/KF5SysGuard)
+ecm_configure_package_config_file(KF5SysGuardConfig.cmake.in
+    "${CMAKE_CURRENT_BINARY_DIR}/KF5SysGuardConfig.cmake"
+    INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR})
 =

-configure_file(KF5SysGuardConfig.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/KF5=
SysGuardConfig.cmake" @ONLY)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/KF5SysGuardConfig.cmake
-              ${CMAKE_CURRENT_BINARY_DIR}/KF5SysGuardConfigVersion.cmake
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/KF5SysGuardConfigVersion.cmake
         DESTINATION ${CMAKECONFIG_INSTALL_DIR})
 =

 install(EXPORT libksysguardLibraryTargets
diff --git a/plasma-workspace/libkworkspace/CMakeLists.txt b/plasma-workspa=
ce/libkworkspace/CMakeLists.txt
index 909297d..1315706 100644
--- a/plasma-workspace/libkworkspace/CMakeLists.txt
+++ b/plasma-workspace/libkworkspace/CMakeLists.txt
@@ -49,10 +49,11 @@ install( FILES kdisplaymanager.h
          DESTINATION ${INCLUDE_INSTALL_DIR}/kworkspace COMPONENT Devel )
 =

 set(CMAKECONFIG_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/LibKWorkspace)
+ecm_configure_package_config_file(LibKWorkspaceConfig.cmake.in
+    "${CMAKE_CURRENT_BINARY_DIR}/LibKWorkspaceConfig.cmake"
+    INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR})
 =

-configure_file(LibKWorkspaceConfig.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/L=
ibKWorkspaceConfig.cmake" @ONLY)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/LibKWorkspaceConfig.cmake
-              ${CMAKE_CURRENT_BINARY_DIR}/LibKWorkspaceConfigVersion.cmake
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/LibKWorkspaceConfigVersion.cmake
         DESTINATION ${CMAKECONFIG_INSTALL_DIR})
 =

 install(EXPORT libkworkspaceLibraryTargets
diff --git a/plasma-workspace/libtaskmanager/CMakeLists.txt b/plasma-worksp=
ace/libtaskmanager/CMakeLists.txt
index 0bc3e6f..4a34ca9 100644
--- a/plasma-workspace/libtaskmanager/CMakeLists.txt
+++ b/plasma-workspace/libtaskmanager/CMakeLists.txt
@@ -85,9 +85,11 @@ install(FILES
 write_basic_config_version_file(${CMAKE_CURRENT_BINARY_DIR}/LibTaskManager=
ConfigVersion.cmake VERSION "${PLASMAWORKSPACE_VERSION_STRING}" COMPATIBILI=
TY AnyNewerVersion)
 =

 set(CMAKECONFIG_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/LibTaskManager)
-configure_file(LibTaskManagerConfig.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/=
LibTaskManagerConfig.cmake" @ONLY)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/LibTaskManagerConfig.cmake
-              ${CMAKE_CURRENT_BINARY_DIR}/LibTaskManagerConfigVersion.cmake
+ecm_configure_package_config_file(LibTaskManagerConfig.cmake.in
+    "${CMAKE_CURRENT_BINARY_DIR}/LibTaskManagerConfig.cmake"
+    INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR})
+
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/LibTaskManagerConfigVersion.cmake
         DESTINATION ${CMAKECONFIG_INSTALL_DIR})
 =

 install(EXPORT libtaskmanagerLibraryTargets
[prev in list] [next in list] [prev in thread] [next in thread]