[Liblas-commits] hg: 4 new changesets

[liblas-commits at liblas.org]

changeset 2a622d0bc76f in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=2a622d0bc76f
summary: silence unintialized warning

changeset dff322986678 in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=dff322986678
summary: verbose makefile option

changeset d72a9c8085d2 in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=d72a9c8085d2
summary: add osgeo4w include/lib to CMAKE_INCLUDE_PATH and CMAKE_LIBRARY_PATH for find_path and find_library default on win32

changeset fc67f81addc4 in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=fc67f81addc4
summary: put osgeo4w's gdal-dev package ahead of the default osgeo4w gdal search paths

diffstat:

 CMakeLists.txt               |  14 ++++++++++++--
 cmake/modules/FindGDAL.cmake |   2 ++
 hobu-config.bat              |   2 +-
 include/liblas/lasbounds.hpp |   2 +-
 4 files changed, 16 insertions(+), 4 deletions(-)

diffs (81 lines):

diff -r 29f90cc49906 -r fc67f81addc4 CMakeLists.txt
--- a/CMakeLists.txt	Mon Nov 01 20:44:33 2010 -0500
+++ b/CMakeLists.txt	Tue Nov 02 09:50:25 2010 -0500
@@ -100,6 +100,9 @@
     mark_as_advanced(VCPROJ_USER_ENVIRONMENT_PATH_DEBUG)
 
   endif()
+  
+  set(CMAKE_INCLUDE_PATH c:/osgeo4w/include;$ENV{CMAKE_INCLUDE_PATH})
+  set(CMAKE_LIBRARY_PATH c:/osgeo4w/lib;$ENV{CMAKE_LIBRARY_PATH})
 else()
 
   # Recommended C++ compilation flags
@@ -173,9 +176,12 @@
   # Determine libTIFF availability, required
   if (GEOTIFF_FOUND)
 
+    mark_as_advanced(CLEAR TIFF_INCLUDE_DIR) 
+    mark_as_advanced(CLEAR TIFF_LIBRARY) 
+    if (WIN32)
+        set(TIFF_NAMES libtiff_i)
+    endif(WIN32)
     find_package(TIFF) 
-    mark_as_advanced(CLEAR TIFF_INCLUDE_DIR) 
-    mark_as_advanced(CLEAR TIFF_LIBRARIES) 
     if (TIFF_FOUND)
       include_directories(${TIFF_INCLUDE_DIR})
     endif()
@@ -209,6 +215,10 @@
       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
diff -r 29f90cc49906 -r fc67f81addc4 cmake/modules/FindGDAL.cmake
--- a/cmake/modules/FindGDAL.cmake	Mon Nov 01 20:44:33 2010 -0500
+++ b/cmake/modules/FindGDAL.cmake	Tue Nov 02 09:50:25 2010 -0500
@@ -55,6 +55,7 @@
             NAMES gdal.h 
             PATH_PREFIXES gdal gdal-1.6
             PATHS
+            "${OSGEO4W_ROOT_DIR}/apps/gdal-dev/include"
             "$ENV{LIB_DIR}/include/gdal"
             ${OSGEO4W_ROOT_DIR}/include)
 
@@ -66,6 +67,7 @@
             "$ENV{LIB_DIR}/lib"
             /usr/lib
             c:/msys/local/lib
+            "${OSGEO4W_ROOT_DIR}/apps/gdal-dev/lib"            
             ${OSGEO4W_ROOT_DIR}/lib)
         
         IF(GDAL_LIBRARY)
diff -r 29f90cc49906 -r fc67f81addc4 hobu-config.bat
--- a/hobu-config.bat	Mon Nov 01 20:44:33 2010 -0500
+++ b/hobu-config.bat	Tue Nov 02 09:50:25 2010 -0500
@@ -26,5 +26,5 @@
     -DORACLE_INCLUDE_DIR=%ORACLE_HOME%\include ^
     -DORACLE_OCI_LIBRARY=%ORACLE_HOME%\lib\oci.lib ^
     -DCMAKE_BUILD_TYPE=%BUILD_TYPE% ^
-    -DCMAKE_VERBOSE_FILE=OFF ^
+    -DCMAKE_VERBOSE_MAKEFILE=OFF ^
     %LIBLAS%
\ No newline at end of file
diff -r 29f90cc49906 -r fc67f81addc4 include/liblas/lasbounds.hpp
--- a/include/liblas/lasbounds.hpp	Mon Nov 01 20:44:33 2010 -0500
+++ b/include/liblas/lasbounds.hpp	Tue Nov 02 09:50:25 2010 -0500
@@ -533,7 +533,7 @@
 
 T volume() const
 {
-    T output;
+    T output = static_cast<T>(0);
     for (size_type i = 0; i < dimension(); i++) {
         output = output * ranges[i].length();
     }