[Liblas-commits] hg: add laszip to my default configuration

[liblas-commits at liblas.org]

details:   http://hg.liblas.orghg/rev/f7ebd1f8deb7
changeset: 2660:f7ebd1f8deb7
user:      Howard Butler <hobu.inc at gmail.com>
date:      Thu Dec 30 11:32:08 2010 -0600
description:
add laszip to my default configuration
Subject: hg: import the laszip dll when we use it

details:   http://hg.liblas.orghg/rev/7a7830bb543e
changeset: 2661:7a7830bb543e
user:      Howard Butler <hobu.inc at gmail.com>
date:      Thu Dec 30 11:32:21 2010 -0600
description:
import the laszip dll when we use it

diffstat:

 hobu-config.bat    |  8 ++++----
 src/CMakeLists.txt |  1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diffs (48 lines):

diff -r 6377592d7194 -r 7a7830bb543e hobu-config.bat
--- a/hobu-config.bat	Thu Dec 30 08:54:26 2010 -0600
+++ b/hobu-config.bat	Thu Dec 30 11:32:21 2010 -0600
@@ -7,22 +7,20 @@
 set OSGEO4W=C:\OSGeo4W
 set BOOST=D:\boost\boost_1_44
 set ORACLE_HOME=%OSGEO4W%
-set LASZIP_ROOT=A:\dev\zip
+set LASZIP_ROOT=d:\laszip
 REM set BUILD_TYPE=RelWithDebInfo
 REM set BUILD_TYPE=Debug
 set BUILD_TYPE=Release
 
 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 ^
     -DWITH_GEOTIFF=ON ^
     -DWITH_ORACLE=ON ^
-    -DWITH_LASZIP=OFF ^
+    -DWITH_LASZIP=ON ^
     -DTIFF_INCLUDE_DIR=%OSGEO4W%\include ^
     -DTIFF_LIBRARY=%OSGEO4W%\lib\libtiff_i.lib ^
     -DGEOTIFF_INCLUDE_DIR=%OSGEO4W%\include ^
@@ -31,6 +29,8 @@
     -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\Release\liblaszip.lib ^
     -DCMAKE_BUILD_TYPE=%BUILD_TYPE% ^
     -DCMAKE_VERBOSE_MAKEFILE=OFF ^
     %LIBLAS%
diff -r 6377592d7194 -r 7a7830bb543e src/CMakeLists.txt
--- a/src/CMakeLists.txt	Thu Dec 30 08:54:26 2010 -0600
+++ b/src/CMakeLists.txt	Thu Dec 30 11:32:21 2010 -0600
@@ -212,6 +212,7 @@
 
 if(WIN32)
     add_definitions("-DLAS_DLL_EXPORT=1")
+    add_definitions("-DLASZIP_DLL_IMPORT=1")
 endif()
 
 add_library(${LIBLAS_LIB_NAME} SHARED ${LIBLAS_SOURCES})