[Liblas-commits] laszip: osgeo4w packaging

[liblas-commits at liblas.org]

details:   http://hg.liblas.orglaszip/rev/bb381252df0d
changeset: 110:bb381252df0d
user:      Howard Butler <hobu.inc at gmail.com>
date:      Mon Jan 03 12:31:23 2011 -0600
description:
osgeo4w packaging

diffstat:

 CMakeLists.txt                   |  13 ++++++-------
 cmake/modules/BuildOSGeo4W.cmake |  10 ++++------
 2 files changed, 10 insertions(+), 13 deletions(-)

diffs (62 lines):

diff -r 5702cc183fe5 -r bb381252df0d CMakeLists.txt
--- a/CMakeLists.txt	Mon Jan 03 12:20:33 2011 -0600
+++ b/CMakeLists.txt	Mon Jan 03 12:31:23 2011 -0600
@@ -15,13 +15,8 @@
 set(VERSION "${LASZIP_VERSION_MAJOR}.${LASZIP_VERSION_MINOR}.${LASZIP_VERSION_PATCH}")
 SET(LASZIP_LIB_SOVERSION "1.0.0")
 
-if(WIN32)
-  # Name of C++ library
-  set(LASZIP_LIB_NAME liblaszip)
-else()
-  # Name of C++ library
-  set(LASZIP_LIB_NAME laszip)
-endif()
+# Name of C++ library
+set(LASZIP_LIB_NAME laszip)
 
 message(STATUS "Configuring LASzip library - ${LIBLAS_LIB_NAME}")
 
@@ -152,3 +147,7 @@
 include(CPack)
 
 add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
+
+if (WIN32)
+    include(BuildOSGeo4W)
+endif(WIN32)
diff -r 5702cc183fe5 -r bb381252df0d cmake/modules/BuildOSGeo4W.cmake
--- a/cmake/modules/BuildOSGeo4W.cmake	Mon Jan 03 12:20:33 2011 -0600
+++ b/cmake/modules/BuildOSGeo4W.cmake	Mon Jan 03 12:31:23 2011 -0600
@@ -23,9 +23,6 @@
 
 set(OSGEO4W_DIRECTORIES
     ${OSGEO4W_DIR}
-    ${OSGEO4W_ETC_DIR}
-    ${OSGEO4W_ETC_INI_DIR}
-    ${OSGEO4W_ETC_POSTINSTALL_DIR}
     ${OSGEO4W_LIB_DIR}
     ${OSGEO4W_LIB_BIN_DIR}
     ${OSGEO4W_DEVEL_DIR}
@@ -79,6 +76,7 @@
     foreach(FILENAME ${COPY_FILES})
         set(SRC "${FILENAME}")
         set(DST "${DESTINATION}")
+
         add_custom_command(
             TARGET copy
             COMMAND ${CMAKE_COMMAND} -E copy ${SRC} ${DST}
@@ -109,10 +107,10 @@
 make_directories()
 copy_files(${LASZIP_BUILD_OUTPUT_DIRECTORY}/laszip.dll ${OSGEO4W_BIN_DIR}/  )
 copy_files(${LASZIP_BUILD_OUTPUT_DIRECTORY}/laszip.lib ${OSGEO4W_DEVEL_LIB_DIR}/  )
-copy_directory(./include/laszip/ ${OSGEO4W_DEVEL_INCLUDE_LASZIP_DIR}/  )
+copy_files(./include/laszip/*.hpp ${OSGEO4W_DEVEL_INCLUDE_LASZIP_DIR}/  )
 
-tar_directories(${OSGEO4W_DIR} ${libLAS_SOURCE_DIR}/${OSGEO4W_PACKAGES}/laszip-${VERSION}.tar.bz2 "bin/")
-tar_directories(${OSGEO4W_DIR}/devel ${libLAS_SOURCE_DIR}/${OSGEO4W_PACKAGES}/laszip-devel-${VERSION}.tar.bz2 "lib/;include")
+tar_directories(${OSGEO4W_DIR} ${laszip_SOURCE_DIR}/${OSGEO4W_PACKAGES}/laszip-${VERSION}.tar.bz2 "bin/")
+tar_directories(${OSGEO4W_DIR}/devel ${laszip_SOURCE_DIR}/${OSGEO4W_PACKAGES}/laszip-devel-${VERSION}.tar.bz2 "lib/;include")
 
 
 add_custom_target(osgeo4w