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

List:       kde-commits
Subject:    [kdelibs/frameworks] tier1/kwindowsystem: kwindowsystem: use e-c-m 0.0.6
From:       Alex Neundorf <neundorf () kde ! org>
Date:       2012-11-25 16:17:08
Message-ID: 20121125161708.3EA8FA6091 () git ! kde ! org
[Download RAW message or body]

Git commit 07e12da5643998106c87fbb94ca9c64d6a5ef006 by Alex Neundorf.
Committed on 25/11/2012 at 17:16.
Pushed by neundorf into branch 'frameworks'.

kwindowsystem: use e-c-m 0.0.6

-use new macro ecm_setup_version()
-install an own targets file
-use a separate Config.cmake.in

Alex

M  +25   -14   tier1/kwindowsystem/CMakeLists.txt
A  +15   -0    tier1/kwindowsystem/kwindowsystemConfig.cmake.in
M  +3    -3    tier1/kwindowsystem/src/CMakeLists.txt

http://commits.kde.org/kdelibs/07e12da5643998106c87fbb94ca9c64d6a5ef006

diff --git a/tier1/kwindowsystem/CMakeLists.txt b/tier1/kwindowsystem/CMake=
Lists.txt
index b68e21d..4cc87b1 100644
--- a/tier1/kwindowsystem/CMakeLists.txt
+++ b/tier1/kwindowsystem/CMakeLists.txt
@@ -2,32 +2,43 @@ cmake_minimum_required(VERSION 2.8.10.1)
 =

 project(kwindowsystem)
 =

-find_package(ECM 0.0.5 REQUIRED NO_MODULE)
+find_package(ECM 0.0.6 REQUIRED NO_MODULE)
 =

 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
 =

-include(ECMVersion)
-
 find_package(KF5 5.0.0 REQUIRED MODULE COMPONENTS CMake Compiler InstallDi=
rs)
 =

-# -- Maintained by scripty
-ecm_version(5 0 0)
-# --
-
-include(ECMQtFramework)
-include(ECMWriteVersionHeader)
-
 find_package(Qt5Transitional REQUIRED MODULE COMPONENTS Core Test)
 =

-ecm_write_version_header(${CMAKE_CURRENT_BINARY_DIR}/kwindowsystem_version=
.h)
+include(FeatureSummary)
+include(CMakePackageConfigHelpers)
+include(ECMSetupVersion)
 =

-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kwindowsystem_version.h
-        DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel )
+ecm_setup_version(5 0 0 VARIABLE_PREFIX KWINDOWSYSTEM
+                        VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kwindo=
wsystem_version.h"
+                        PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/=
kwindowsystemConfigVersion.cmake")
 =

 add_subdirectory(src)
 add_subdirectory(autotests)
 =

-include(FeatureSummary)
+# create a Config.cmake and a ConfigVersion.cmake file and install them
+set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/kwindowsystem")
+
+configure_package_config_file("${CMAKE_CURRENT_LIST_DIR}/kwindowsystemConf=
ig.cmake.in"
+                              "${CMAKE_CURRENT_BINARY_DIR}/kwindowsystemCo=
nfig.cmake"
+                              INSTALL_DESTINATION  ${CMAKECONFIG_INSTALL_D=
IR}
+                              PATH_VARS  INCLUDE_INSTALL_DIR LIB_INSTALL_D=
IR CMAKE_INSTALL_PREFIX )
+
+install(FILES  "${CMAKE_CURRENT_BINARY_DIR}/kwindowsystemConfig.cmake"
+               "${CMAKE_CURRENT_BINARY_DIR}/kwindowsystemConfigVersion.cma=
ke"
+        DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
+        COMPONENT Devel )
+
+install(EXPORT kwindowsystemTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR=
}" FILE kwindowsystemTargets.cmake NAMESPACE KDE4__ )
+
+
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kwindowsystem_version.h
+        DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel )
 =

 if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
     feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/tier1/kwindowsystem/kwindowsystemConfig.cmake.in b/tier1/kwind=
owsystem/kwindowsystemConfig.cmake.in
new file mode 100644
index 0000000..a2db2bb
--- /dev/null
+++ b/tier1/kwindowsystem/kwindowsystemConfig.cmake.in
@@ -0,0 +1,15 @@
+@PACKAGE_INIT@
+
+# Any changes in this file will be overwritten by CMake.
+
+set(kwindowsystem_VERSION_MAJOR "@KWINDOWSYSTEM_VERSION_MAJOR@")
+set(kwindowsystem_VERSION_MINOR "@KWINDOWSYSTEM_VERSION_MINOR@")
+set(kwindowsystem_VERSION_PATCH "@KWINDOWSYSTEM_VERSION_PATCH@")
+
+set(kwindowsystem_INSTALL_PREFIX "@PACKAGE_CMAKE_INSTALL_PREFIX@")
+set_and_check(kwindowsystem_INCLUDE_DIR    "@PACKAGE_INCLUDE_INSTALL_DIR@")
+set_and_check(kwindowsystem_LIBRARY_DIR    "@PACKAGE_LIB_INSTALL_DIR@")
+
+include("${CMAKE_CURRENT_LIST_DIR}/kwindowsystemTargets.cmake")
+
+set(kwindowsystem_LIBRARY KDE4__kwindowsystem)
diff --git a/tier1/kwindowsystem/src/CMakeLists.txt b/tier1/kwindowsystem/s=
rc/CMakeLists.txt
index b3beb23..c3764e9 100644
--- a/tier1/kwindowsystem/src/CMakeLists.txt
+++ b/tier1/kwindowsystem/src/CMakeLists.txt
@@ -61,10 +61,10 @@ generate_export_header(kwindowsystem)
 =

 target_link_libraries(kwindowsystem ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRAR=
Y} ${QT_QTDBUS_LIBRARY} ${platformLinkLibraries} ${qt5CompatLib})
 =

-set_target_properties(kwindowsystem PROPERTIES VERSION   ${ECM_VERSION_STR=
ING}
-                                               SOVERSION ${ECM_SOVERSION})
+set_target_properties(kwindowsystem PROPERTIES VERSION   ${KWINDOWSYSTEM_V=
ERSION_STRING}
+                                               SOVERSION ${KWINDOWSYSTEM_S=
OVERSION})
 =

-install(TARGETS kwindowsystem EXPORT kdelibsLibraryTargets ${ECM_TARGET_DE=
FAULT_ARGS})
+install(TARGETS kwindowsystem EXPORT kwindowsystemTargets ${INSTALL_TARGET=
S_DEFAULT_ARGS})
 =

 install( FILES
    kstartupinfo.h
[prev in list] [next in list] [prev in thread] [next in thread]