[Liblas-commits] hg: Added install target of headers to CMake build configuration...

[liblas-commits at liblas.org]

changeset 6792ec6f6205 in /home/www/liblas.org/hg
details: http://hg.liblas.org/main/hg?cmd=changeset;node=6792ec6f6205
summary: Added install target of headers to CMake build configuration (Ticket #52)

diffstat:

 CMakeLists.txt             |  5 +++--
 build/cmake/FindGDAL.cmake |  4 ++++
 src/CMakeLists.txt         |  4 ++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diffs (47 lines):

diff -r 97f58cc1660a -r 6792ec6f6205 CMakeLists.txt
--- a/CMakeLists.txt	Sun Sep 27 22:54:07 2009 +0100
+++ b/CMakeLists.txt	Sun Sep 27 23:19:54 2009 +0100
@@ -4,7 +4,8 @@
 # Author: Mateusz Loskot <mateusz at loskot.net>
 #
 # ************************************************************************
-# WARNING (mloskot): A PROTOTYPE - WORK IN PROGRESS - FEEL FREE TO IMPROVE
+# WARNING (mloskot): A PROTOTYPE - WORK IN PROGRESS
+# Here are details about this work: http://liblas.org/ticket/52
 # ************************************************************************
 #
 ###############################################################################
@@ -152,7 +153,7 @@
     SET(DEFAULT_BIN_SUBDIR bin)
     SET(DEFAULT_LIB_SUBDIR lib)
     SET(DEFAULT_DATA_SUBDIR share/liblas)
-    SET(DEFAULT_INCLUDE_SUBDIR include/liblas)
+    SET(DEFAULT_INCLUDE_SUBDIR include)
 ENDIF()
 
 # Locations are changeable by user to customize layout of libLAS installation
diff -r 97f58cc1660a -r 6792ec6f6205 build/cmake/FindGDAL.cmake
--- a/build/cmake/FindGDAL.cmake	Sun Sep 27 22:54:07 2009 +0100
+++ b/build/cmake/FindGDAL.cmake	Sun Sep 27 23:19:54 2009 +0100
@@ -89,6 +89,10 @@
         /usr/bin/)
             
     IF(GDAL_CONFIG) 
+
+        # TODO: Replace the regex hacks with CMake version comparison feature:
+        # if(version1 VERSION_LESS version2)
+
         # Extract GDAL version
         EXEC_PROGRAM(${GDAL_CONFIG} ARGS --version OUTPUT_VARIABLE GDAL_VERSION)
         SET(GDAL_VERSION_STRING "${GDAL_VERSION}" CACHE STRING "Version of GDAL package found")
diff -r 97f58cc1660a -r 6792ec6f6205 src/CMakeLists.txt
--- a/src/CMakeLists.txt	Sun Sep 27 22:54:07 2009 +0100
+++ b/src/CMakeLists.txt	Sun Sep 27 23:19:54 2009 +0100
@@ -133,3 +133,7 @@
     RUNTIME DESTINATION ${LIBLAS_BIN_DIR}
     LIBRARY DESTINATION ${LIBLAS_LIB_DIR}
     ARCHIVE DESTINATION ${LIBLAS_LIB_DIR})
+
+INSTALL(DIRECTORY ${LIBLAS_HEADERS_DIR}
+    DESTINATION ${LIBLAS_INCLUDE_DIR}
+    FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp")