[Liblas-commits] hg: add defines and libs to liblas-config

[liblas-commits at liblas.org]

details:   http://hg.liblas.orghg/rev/93097e6f160b
changeset: 2666:93097e6f160b
user:      Howard Butler <hobu.inc at gmail.com>
date:      Mon Jan 03 10:13:03 2011 -0600
description:
add defines and libs to liblas-config

diffstat:

 apps/CMakeLists.txt   |  12 ++++++++++--
 apps/liblas-config.in |   4 ++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diffs (45 lines):

diff -r 20328697f704 -r 93097e6f160b apps/CMakeLists.txt
--- a/apps/CMakeLists.txt	Thu Dec 30 15:25:24 2010 -0600
+++ b/apps/CMakeLists.txt	Mon Jan 03 10:13:03 2011 -0600
@@ -218,10 +218,18 @@
     set(prefix ${CMAKE_INSTALL_PREFIX})
     set(exec_prefix ${CMAKE_INSTALL_PREFIX}/bin)
     set(libdir ${CMAKE_INSTALL_PREFIX}/lib)
-    
+
+    GET_DIRECTORY_PROPERTY(LIBLAS_DEFINITIONS DIRECTORY ${libLAS_SOURCE_DIR}/ COMPILE_DEFINITIONS)   
+
+    set(LIBLAS_CONFIG_DEFINITIONS "")
+    foreach(definition ${LIBLAS_DEFINITIONS})
+        set(LIBLAS_CONFIG_DEFINITIONS "${LIBLAS_CONFIG_DEFINITIONS} -D${definition}")
+    endforeach()
+
+     
     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/liblas-config.in
       ${CMAKE_CURRENT_BINARY_DIR}/liblas-config @ONLY)
-    
+      
     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/liblas-config
       DESTINATION bin/
       PERMISSIONS
diff -r 20328697f704 -r 93097e6f160b apps/liblas-config.in
--- a/apps/liblas-config.in	Thu Dec 30 15:25:24 2010 -0600
+++ b/apps/liblas-config.in	Mon Jan 03 10:13:03 2011 -0600
@@ -95,7 +95,7 @@
     ;;
 
   --defines)
-    echo 
+    echo @LIBLAS_CONFIG_DEFINITIONS@
     ;;
 
   --includes)
@@ -103,7 +103,7 @@
     ;;
 
   --cflags)
-    echo -I${prefix}/include 
+    echo @CMAKE_C_FLAGS@
     ;;
 
   --cxxflags)