[Liblas-commits] hg: 3 new changesets

[liblas-commits at liblas.org]

changeset aa59dfd518c1 in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=aa59dfd518c1
summary: don't try OSRCleanup if we don't have it, this is a new function

changeset f87f619fdbec in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=f87f619fdbec
summary: don't add a newline to the full version info

changeset 6e971a2fa393 in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=6e971a2fa393
summary: start on a some cmake to build osgeo4w packaging

diffstat:

 apps/lasinfo.c                   |   2 +
 cmake/modules/BuildOSGeo4W.cmake |  45 ++++++++++++++++++++++++++++++++++++++++
 src/las_c_api.cpp                |   2 +-
 3 files changed, 48 insertions(+), 1 deletions(-)

diffs (74 lines):

diff -r 5e070e3337d1 -r 6e971a2fa393 apps/lasinfo.c
--- a/apps/lasinfo.c	Fri Mar 19 08:46:53 2010 -0500
+++ b/apps/lasinfo.c	Fri Mar 19 11:43:56 2010 -0500
@@ -406,7 +406,9 @@
 
 #ifdef HAVE_GDAL
     /* Various GDAL related cleanups */
+#ifdef OSRCleanup
     OSRCleanup();
+#endif
     CPLFinderClean();
     CPLFreeConfig();
     CPLCleanupTLS();
diff -r 5e070e3337d1 -r 6e971a2fa393 cmake/modules/BuildOSGeo4W.cmake
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cmake/modules/BuildOSGeo4W.cmake	Fri Mar 19 11:43:56 2010 -0500
@@ -0,0 +1,45 @@
+###############################################################################
+#
+# OSGeo4W packaging
+#
+# On success, the macro sets the following variables:
+# GEOTIFF_FOUND       = if the library found
+# GEOTIFF_LIBRARIES   = full path to the library
+# GEOTIFF_INCLUDE_DIR = where to find the library headers also defined,
+#                       but not for general use are
+# GEOTIFF_LIBRARY     = where to find the PROJ.4 library.
+# GEOTIFF_VERSION     = version of library which was found, e.g. "1.2.5"
+#
+# Copyright (c) 2009 Mateusz Loskot <mateusz at loskot.net>
+#
+# Module source: http://github.com/mloskot/workshop/tree/master/cmake/
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
+###############################################################################
+
+if(WIN32)
+    set(DEFAULT_LIB_SUBDIR lib)
+    set(DEFAULT_DATA_SUBDIR .)
+    set(DEFAULT_INCLUDE_SUBDIR include)
+
+    if (MSVC)
+        set(DEFAULT_BIN_SUBDIR bin)
+    else()
+        set(DEFAULT_BIN_SUBDIR .)
+    endif()
+else()
+    # Common locatoins for Unix and Mac OS X
+    set(DEFAULT_BIN_SUBDIR bin)
+    set(DEFAULT_LIB_SUBDIR lib)
+    set(DEFAULT_DATA_SUBDIR share/liblas)
+    set(DEFAULT_INCLUDE_SUBDIR include)
+endif()
+
+ ADD_CUSTOM_COMMAND(
+   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/foo.c
+   COMMAND ${CMAKE_COMMAND} copy ${CMAKE_CURRENT_SOURCE_DIR}/bar.c ${CMAKE_CURRENT_BINARY_DIR}/foo.c
+   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bar.c
+   )
+ ADD_EXECUTABLE(foo foo.c)
diff -r 5e070e3337d1 -r 6e971a2fa393 src/las_c_api.cpp
--- a/src/las_c_api.cpp	Fri Mar 19 08:46:53 2010 -0500
+++ b/src/las_c_api.cpp	Fri Mar 19 11:43:56 2010 -0500
@@ -1572,7 +1572,7 @@
     {
         os << " with" << info;
     }
-    os << std::endl;
+
 
     return strdup(os.str().c_str());
 }