[Liblas-commits] hg: 2 new changesets

[liblas-commits at liblas.org]

changeset 4f92861400da in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=4f92861400da
summary: start on some CPack stuff

changeset 5e070e3337d1 in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=5e070e3337d1
summary: use LAS_GetFullVersion for information

diffstat:

 .hgignore       |   2 ++
 CMakeLists.txt  |  15 ++++++++++++++-
 apps/las2las.c  |   2 +-
 apps/lasinfo.c  |   2 +-
 apps/lasmerge.c |   2 +-
 5 files changed, 19 insertions(+), 4 deletions(-)

diffs (91 lines):

diff -r 36817c6af832 -r 5e070e3337d1 .hgignore
--- a/.hgignore	Thu Mar 18 07:56:37 2010 -0600
+++ b/.hgignore	Fri Mar 19 08:46:53 2010 -0500
@@ -47,6 +47,8 @@
 CMakeCache.txt
 CMakeFiles
 CTestTestfile.cmake
+install_manifest.txt
+_CPack_Packages/
 src/CMakeFiles
 config.guess
 config.log
diff -r 36817c6af832 -r 5e070e3337d1 CMakeLists.txt
--- a/CMakeLists.txt	Thu Mar 18 07:56:37 2010 -0600
+++ b/CMakeLists.txt	Fri Mar 19 08:46:53 2010 -0500
@@ -12,6 +12,11 @@
 # libLAS general settings
 project(libLAS)
 
+# Version information
+SET(CPACK_PACKAGE_VERSION_MAJOR "1")
+SET(CPACK_PACKAGE_VERSION_MINOR "3")
+SET(CPACK_PACKAGE_VERSION_PATCH "0")
+
 # Name of C++ library
 set(LIBLAS_LIB_NAME las)
 
@@ -32,7 +37,7 @@
 
 ###############################################################################
 # CMake settings
-cmake_minimum_required(VERSION 2.6.0)
+cmake_minimum_required(VERSION 2.8.0)
 
 set(CMAKE_COLOR_MAKEFILE ON)
 
@@ -153,6 +158,7 @@
 
     # Determine libTIFF availability, required
     if (GEOTIFF_FOUND)
+        mark_as_advanced(CLEAR TIFF)
         find_package(TIFF)
         if (TIFF_FOUND)
             include_directories(${TIFF_INCLUDE_DIR})
@@ -291,3 +297,10 @@
         message(WARNING "CTest support requested but WITH_TESTS option not specified to build of libLAS unit tests")
     endif()
 endif()
+
+
+SET(CPACK_SOURCE_GENERATOR "TGZ;TBZ2")
+SET(CPACK_PACKAGE_DESCRIPTION_FILE "README.txt")
+SET(CPACK_RESOURCE_FILE_README "README.txt")
+SET(CPACK_SOURCE_PACKAGE_FILE_NAME "libLAS-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+INCLUDE(CPack)
diff -r 36817c6af832 -r 5e070e3337d1 apps/las2las.c
--- a/apps/las2las.c	Thu Mar 18 07:56:37 2010 -0600
+++ b/apps/las2las.c	Fri Mar 19 08:46:53 2010 -0500
@@ -88,7 +88,7 @@
 void usage()
 {
     fprintf(stderr,"----------------------------------------------------------\n");
-    fprintf(stderr,"    las2las (version %s) usage:\n", LAS_GetVersion());
+    fprintf(stderr,"    las2las (version %s) usage:\n", LAS_GetFullVersion());
     fprintf(stderr,"----------------------------------------------------------\n");
     fprintf(stderr,"\n");
 
diff -r 36817c6af832 -r 5e070e3337d1 apps/lasinfo.c
--- a/apps/lasinfo.c	Thu Mar 18 07:56:37 2010 -0600
+++ b/apps/lasinfo.c	Fri Mar 19 08:46:53 2010 -0500
@@ -34,7 +34,7 @@
 
 void usage()
 {
-    char* version = LAS_GetVersion();
+    char* version = LAS_GetFullVersion();
     fprintf(stderr,"----------------------------------------------------------\n");
     fprintf(stderr,"    lasinfo (version %s) usage:\n", version);
     fprintf(stderr,"----------------------------------------------------------\n");
diff -r 36817c6af832 -r 5e070e3337d1 apps/lasmerge.c
--- a/apps/lasmerge.c	Thu Mar 18 07:56:37 2010 -0600
+++ b/apps/lasmerge.c	Fri Mar 19 08:46:53 2010 -0500
@@ -27,7 +27,7 @@
 {
 
     fprintf(stderr,"----------------------------------------------------------\n");
-    fprintf(stderr,"    lasmerge (version %s) usage:\n", LAS_GetVersion());
+    fprintf(stderr,"    lasmerge (version %s) usage:\n", LAS_GetFullVersion());
     fprintf(stderr,"----------------------------------------------------------\n");
     fprintf(stderr,"\n");