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

List:       kde-commits
Subject:    KDE/kdeedu/marble
From:       Carsten Wolff <wolff () kde ! org>
Date:       2008-07-17 22:37:41
Message-ID: 1216334261.644251.8410.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 834070 by wolff:

Fix installation path of the FindMarble cmake module,
both for normal installation and for packaging


 M  +8 -2      CMakeLists.txt  


--- trunk/KDE/kdeedu/marble/CMakeLists.txt #834069:834070
@@ -57,9 +57,11 @@
   if(QTONLY)
     set(data_dir data)
     set(plugin_dir plugins)
+    set(cmake_modules_install_path ${CMAKE_ROOT}/Modules)
   else(QTONLY)
     set(data_dir ${DATA_INSTALL_DIR}/marble/data)
     set(plugin_dir ${PLUGIN_INSTALL_DIR}/plugins/marble)
+    set(cmake_modules_install_path ${DATA_INSTALL_DIR}/cmake/modules)
   endif(QTONLY)
 else(WIN32)
   if(APPLE)
@@ -91,9 +93,11 @@
     if (QTONLY)
       set(data_dir ${CMAKE_INSTALL_PREFIX}/share/apps/marble/data)
       set(plugin_dir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/marble/plugins)
+      set(cmake_modules_install_path ${PACKAGE_ROOT_PREFIX}${CMAKE_ROOT}/Modules)
     else (QTONLY)
       set(data_dir ${DATA_INSTALL_DIR}/marble/data)
       set(plugin_dir ${PLUGIN_INSTALL_DIR}/plugins/marble)
+      set(cmake_modules_install_path ${PACKAGE_ROOT_PREFIX}${DATA_INSTALL_DIR}/cmake/modules)
     endif (QTONLY)
   endif(APPLE)
 endif(WIN32)
@@ -248,8 +252,10 @@
 
 ####################################################
 # Install CMake module
-install( FILES FindMarble.cmake 
-         DESTINATION ${DATA_INSTALL_DIR}/cmake/modules  )
+if( cmake_modules_install_path )
+  install( FILES FindMarble.cmake 
+           DESTINATION ${cmake_modules_install_path}  )
+endif( cmake_modules_install_path )
 
 ############################################################
 # Uninstall stuff
[prev in list] [next in list] [prev in thread] [next in thread]