[geos-commits] r2902 - in trunk: . tools

[svn_geos at osgeo.org]

Author: mloskot
Date: 2010-02-04 18:35:41 -0500 (Thu, 04 Feb 2010)
New Revision: 2902

Modified:
   trunk/CMakeLists.txt
   trunk/tools/CMakeLists.txt
Log:
Fixed missing substitution of @libdir@ in geos-config generated by CMake #(317)

Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2010-02-02 18:14:43 UTC (rev 2901)
+++ trunk/CMakeLists.txt	2010-02-04 23:35:41 UTC (rev 2902)
@@ -211,7 +211,7 @@
 include_directories(${CMAKE_BINARY_DIR}/include)
 
 #################################################################################
-# Setup checks and generate config headers and geos-config tool
+# Setup checks and generate config headers
 #################################################################################
 
 # TODO: output to CMAKE_CURRENT_BINARY_DIR instead of CMAKE_SOURCE_DIR

Modified: trunk/tools/CMakeLists.txt
===================================================================
--- trunk/tools/CMakeLists.txt	2010-02-02 18:14:43 UTC (rev 2901)
+++ trunk/tools/CMakeLists.txt	2010-02-04 23:35:41 UTC (rev 2902)
@@ -17,12 +17,14 @@
   # Autoconf compatibility variables to use the same script source.
   set(prefix ${CMAKE_INSTALL_PREFIX})
   set(exec_prefix ${CMAKE_INSTALL_PREFIX}/bin)
+  set(libdir ${CMAKE_INSTALL_PREFIX}/lib)
 
   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geos-config.in
     ${CMAKE_CURRENT_BINARY_DIR}/geos-config @ONLY)
 
   install(FILES ${CMAKE_CURRENT_BINARY_DIR}/geos-config
     DESTINATION bin/
-    PERMISSIONS OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+    PERMISSIONS
+    OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 
 endif()