[Liblas-commits] hg: 3 new changesets

[liblas-commits at liblas.org]

changeset 12b5f473b6e2 in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=12b5f473b6e2
summary: Fix up order detection so GDAL is put on the include directory list first.  Turn OSRSetEquirectangular2 detection back on.

changeset 241a163c2203 in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=241a163c2203
summary: I don't have LASZIP build on windows yet...

changeset a23105c5fa8b in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=a23105c5fa8b
summary: silence unused variable warning

diffstat:

 CMakeLists.txt  |  55 +++++++++++++++++++++++++++++--------------------------
 hobu-config.bat |   7 ++++---
 src/factory.cpp |   3 ++-
 3 files changed, 35 insertions(+), 30 deletions(-)

diffs (123 lines):

diff -r ecaf4ec83cd2 -r a23105c5fa8b CMakeLists.txt
--- a/CMakeLists.txt	Sat Dec 18 12:31:40 2010 -0800
+++ b/CMakeLists.txt	Sun Dec 19 14:45:17 2010 -0600
@@ -188,7 +188,34 @@
     endif()
 endif()
 
+# GDAL/OGR support - optional, default=OFF
+set(WITH_GDAL FALSE CACHE BOOL "Choose if GDAL support should be built")
 
+if(WITH_GDAL)
+
+  find_package(GDAL 1.6.0)
+
+  if(GDAL_FOUND)
+    # Confirm required API is available
+    include(CheckFunctionExists) 
+    set(CMAKE_REQUIRED_LIBRARIES ${GDAL_LIBRARY})
+    check_function_exists(OSRSetEquirectangular2 HAVE_OSRSETEQUIRECTANGULAR2)
+    
+    if(NOT HAVE_OSRSETEQUIRECTANGULAR2)
+      # Reset to NOT found for GDAL/OGR
+      set(GDAL_FOUND)
+      message(FATAL_ERROR
+        "Unable to find OSRSetEquirectangular2 within GDAL library at ${GDAL_INCLUDE_DIR} ${GDAL_LIBRARY}")
+    else()
+      include_directories(${GDAL_INCLUDE_DIR})
+      add_definitions(-DHAVE_GDAL=1)
+    endif()
+  endif()
+
+  mark_as_advanced(CLEAR GDAL_INCLUDE_DIR) 
+  mark_as_advanced(CLEAR GDAL_LIBRARY) 
+
+endif()
 
 # GeoTIFF support - optional, default=OFF
 set(WITH_GEOTIFF FALSE CACHE BOOL "Choose if GeoTIFF support should be built")
@@ -227,38 +254,14 @@
   endif()
 endif()
 
-# GDAL/OGR support - optional, default=OFF
-set(WITH_GDAL FALSE CACHE BOOL "Choose if GDAL support should be built")
-
 if(WITH_GDAL)
   if (NOT GEOTIFF_FOUND)
     message(FATAL_ERROR
       "GDAL support requires GeoTIFF library which was not selected")
   endif()
+endif()
 
-  find_package(GDAL 1.6.0)
 
-#  if(GDAL_FOUND)
-#    # Confirm required API is available
-#    include(CheckFunctionExists) 
-#    set(CMAKE_REQUIRED_LIBRARIES ${GDAL_LIBRARY})
-#    check_function_exists(OSRSetEquirectangular2 HAVE_OSRSETEQUIRECTANGULAR2)
-    
-#    if(NOT HAVE_OSRSETEQUIRECTANGULAR2)
-#      # Reset to NOT found for GDAL/OGR
-#      set(GDAL_FOUND)
-#      message(FATAL_ERROR
-#        "Unable to find OSRSetEquirectangular2 within GDAL library at ${GDAL_INCLUDE_DIR} ${GDAL_LIBRARY}")
-#    else()
-      include_directories(${GDAL_INCLUDE_DIR})
-      add_definitions(-DHAVE_GDAL=1)
-#    endif()
-#  endif()
-
-  mark_as_advanced(CLEAR GDAL_INCLUDE_DIR) 
-  mark_as_advanced(CLEAR GDAL_LIBRARY) 
-
-endif()
 
 # Oracle support - optional, default=OFF
 set(WITH_ORACLE FALSE CACHE BOOL "Choose if Oracle support should be built")
@@ -368,7 +371,7 @@
 SET(CPACK_PACKAGE_VERSION_MAJOR "1")
 SET(CPACK_PACKAGE_VERSION_MINOR "6")
 SET(CPACK_PACKAGE_VERSION_PATCH "0b3")
-SET(OSGEO4W_UPSTREAM_RELEASE "1")
+SET(OSGEO4W_UPSTREAM_RELEASE "2")
 
 SET(CPACK_SOURCE_GENERATOR "TGZ;ZIP;TBZ2")
 SET(CPACK_CMAKE_GENERATOR "Unix Makefiles")
diff -r ecaf4ec83cd2 -r a23105c5fa8b hobu-config.bat
--- a/hobu-config.bat	Sat Dec 18 12:31:40 2010 -0800
+++ b/hobu-config.bat	Sun Dec 19 14:45:17 2010 -0600
@@ -14,6 +14,9 @@
 
 set PATH=%OSGEO4W%\apps\gdal-dev\bin;%OSGEO4W%\bin;%PATH%
 
+REM    -DLASZIP_INCLUDE_DIR=%LASZIP_ROOT%\include ^
+REM    -DLASZIP_LIBRARY=%LASZIP_ROOT%\bin\Debug\Debug\liblaszip.lib ^
+    
 cmake -G %G% ^
     -DBOOST_INCLUDEDIR=%BOOST% ^
     -DWITH_GDAL=ON ^
@@ -28,8 +31,6 @@
     -DGDAL_LIBRARY=%OSGEO4W%\apps\gdal-dev\lib\gdal_i.lib ^
     -DORACLE_INCLUDE_DIR=%ORACLE_HOME%\include ^
     -DORACLE_OCI_LIBRARY=%ORACLE_HOME%\lib\oci.lib ^
-    -DLASZIP_INCLUDE_DIR=%LASZIP_ROOT%\include ^
-    -DLASZIP_LIBRARY=%LASZIP_ROOT%\bin\Debug\Debug\liblaszip.lib ^
     -DCMAKE_BUILD_TYPE=%BUILD_TYPE% ^
-    -DCMAKE_VERBOSE_MAKEFILE=ON ^
+    -DCMAKE_VERBOSE_MAKEFILE=OFF ^
     %LIBLAS%
diff -r ecaf4ec83cd2 -r a23105c5fa8b src/factory.cpp
--- a/src/factory.cpp	Sat Dec 18 12:31:40 2010 -0800
+++ b/src/factory.cpp	Sun Dec 19 14:45:17 2010 -0600
@@ -116,7 +116,8 @@
     WriterIPtr w  = WriterIPtr(new detail::ZipWriterImpl(stream));
     return liblas::Writer(w);
 #else
-    throw std::runtime_error("Compression support not enabled in liblas configuration");
+    boost::ignore_unused_variable_warning(stream);
+    throw std::runtime_error("Compression support not enabled in libLAS configuration");
 #endif
 }