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

List:       kde-commits
Subject:    KDE/kdegames/libkdegames
From:       Albert Astals Cid <tsdgeos () terra ! es>
Date:       2012-07-25 18:54:03
Message-ID: 20120725185403.49B86AC7A9 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1307778 by aacid:

Kill FindKDEGames.cmake and install KDEGamesConfig.cmake in the correct place
Patch by Raphael Kubo da Costa


 M  +6 -4      CMakeLists.txt  
 D             FindKDEGames.cmake  


--- trunk/KDE/kdegames/libkdegames/CMakeLists.txt #1307777:1307778
@@ -182,9 +182,12 @@
 export(TARGETS kdegames kdegamesprivate
     FILE "${PROJECT_BINARY_DIR}/KDEGamesLibraryDepends.cmake")
 
+# define the installation directory for the CMake files
+set(CMAKECONFIG_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/KDEGames)
+
 # create the Config.cmake and ConfigVersion.cmake files
 file(RELATIVE_PATH CONF_REL_INCLUDE_DIR
-    "${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_DIR}/cmake/modules"
+    "${CMAKE_INSTALL_PREFIX}/${CMAKECONFIG_INSTALL_DIR}"
     "${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}")
 configure_file(KDEGamesConfig.cmake.in
     "${PROJECT_BINARY_DIR}/KDEGamesConfig.cmake" @ONLY)
@@ -192,11 +195,10 @@
     "${PROJECT_BINARY_DIR}/KDEGamesConfigVersion.cmake" @ONLY)
 
 install(FILES
-    FindKDEGames.cmake
     "${PROJECT_BINARY_DIR}/KDEGamesConfig.cmake"
     "${PROJECT_BINARY_DIR}/KDEGamesConfigVersion.cmake"
-DESTINATION "${DATA_INSTALL_DIR}/cmake/modules" COMPONENT Devel)
+DESTINATION ${CMAKECONFIG_INSTALL_DIR} COMPONENT Devel)
 
 # install the export set for use with the install-tree
 install(EXPORT KDEGamesLibraryDepends DESTINATION
-    "${DATA_INSTALL_DIR}/cmake/modules" COMPONENT Devel)
+    ${CMAKECONFIG_INSTALL_DIR} COMPONENT Devel)
[prev in list] [next in list] [prev in thread] [next in thread]