[Liblas-commits] laszip: fix osgeo4w dependency and add OSGEO4W_UPSTREAM_RELEASE ...

[liblas-commits at liblas.org]

details:   http://hg.liblas.orglaszip/rev/6cfec438cea3
changeset: 111:6cfec438cea3
user:      Howard Butler <hobu.inc at gmail.com>
date:      Mon Jan 03 14:47:10 2011 -0600
description:
fix osgeo4w dependency and add OSGEO4W_UPSTREAM_RELEASE usage

diffstat:

 CMakeLists.txt                   |  2 +-
 cmake/modules/BuildOSGeo4W.cmake |  9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diffs (38 lines):

diff -r bb381252df0d -r 6cfec438cea3 CMakeLists.txt
--- a/CMakeLists.txt	Mon Jan 03 12:31:23 2011 -0600
+++ b/CMakeLists.txt	Mon Jan 03 14:47:10 2011 -0600
@@ -125,7 +125,7 @@
 SET(CPACK_PACKAGE_VERSION_MAJOR ${LASZIP_VERSION_MAJOR})
 SET(CPACK_PACKAGE_VERSION_MINOR ${LASZIP_VERSION_MINOR})
 SET(CPACK_PACKAGE_VERSION_PATCH ${LASZIP_VERSION_MINOR})
-SET(OSGEO4W_UPSTREAM_RELEASE "2")
+SET(OSGEO4W_UPSTREAM_RELEASE "1")
 
 SET(CPACK_SOURCE_GENERATOR "TGZ;ZIP;TBZ2")
 SET(CPACK_CMAKE_GENERATOR "Unix Makefiles")
diff -r bb381252df0d -r 6cfec438cea3 cmake/modules/BuildOSGeo4W.cmake
--- a/cmake/modules/BuildOSGeo4W.cmake	Mon Jan 03 12:31:23 2011 -0600
+++ b/cmake/modules/BuildOSGeo4W.cmake	Mon Jan 03 14:47:10 2011 -0600
@@ -38,10 +38,7 @@
 add_custom_target(make_osgeo4w_directories
   COMMAND ${CMAKE_COMMAND} -E echo "Building OSGeo4W install directories")
 
-foreach(utility ${LASZIP_UTILITIES})
-    add_dependencies(  make_osgeo4w_directories  ${utility} )
-
-endforeach()
+add_dependencies(  make_osgeo4w_directories  ${LASZIP_LIB_NAME} )
 
 
 macro (make_directories)
@@ -109,8 +106,8 @@
 copy_files(${LASZIP_BUILD_OUTPUT_DIRECTORY}/laszip.lib ${OSGEO4W_DEVEL_LIB_DIR}/  )
 copy_files(./include/laszip/*.hpp ${OSGEO4W_DEVEL_INCLUDE_LASZIP_DIR}/  )
 
-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")
+tar_directories(${OSGEO4W_DIR} ${laszip_SOURCE_DIR}/${OSGEO4W_PACKAGES}/laszip-${VERSION}-${OSGEO4W_UPSTREAM_RELEASE}.tar.bz2 "bin/")
+tar_directories(${OSGEO4W_DIR}/devel ${laszip_SOURCE_DIR}/${OSGEO4W_PACKAGES}/laszip-devel-${VERSION}-${OSGEO4W_UPSTREAM_RELEASE}.tar.bz2 "lib/;include")
 
 
 add_custom_target(osgeo4w