[Liblas-commits] laszip: fix install target to LASZIP_LIB_DIR instead of _BIN, bu...

liblas-commits at liblas.org liblas-commits at liblas.org
Thu Dec 30 11:53:55 EST 2010


details:   http://hg.liblas.orglaszip/rev/f30dd5b85cdc
changeset: 98:f30dd5b85cdc
user:      Howard Butler <hobu.inc at gmail.com>
date:      Thu Dec 30 10:53:47 2010 -0600
description:
fix install target to LASZIP_LIB_DIR instead of _BIN, build shared library by default

diffstat:

 CMakeLists.txt     |  1 -
 src/CMakeLists.txt |  6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diffs (33 lines):

diff -r 724ec4f2a7de -r f30dd5b85cdc CMakeLists.txt
--- a/CMakeLists.txt	Thu Dec 30 09:10:52 2010 -0600
+++ b/CMakeLists.txt	Thu Dec 30 10:53:47 2010 -0600
@@ -110,7 +110,6 @@
 set(LASZIP_BIN_DIR ${LASZIP_BIN_SUBDIR})
 set(LASZIP_LIB_DIR ${LASZIP_LIB_SUBDIR})
 set(LASZIP_INCLUDE_DIR ${LASZIP_INCLUDE_SUBDIR})
-set(LASZIP_DATA_DIR ${LASZIP_DATA_SUBDIR})
 
 ###############################################################################
 # Processing of project directories
diff -r 724ec4f2a7de -r f30dd5b85cdc src/CMakeLists.txt
--- a/src/CMakeLists.txt	Thu Dec 30 09:10:52 2010 -0600
+++ b/src/CMakeLists.txt	Thu Dec 30 10:53:47 2010 -0600
@@ -68,15 +68,15 @@
 # Standard include directory of laszip library
 include_directories(../include ../include/laszip .)
 
-add_library(${LASZIP_LIB_NAME} STATIC ${LASZIP_SOURCES})
+add_library(${LASZIP_LIB_NAME} SHARED ${LASZIP_SOURCES})
 
 ###############################################################################
 # Targets installation
 
 install(TARGETS ${LASZIP_LIB_NAME} 
   RUNTIME DESTINATION ${LASZIP_BIN_DIR}
-  LIBRARY DESTINATION ${LASZIP_BIN_DIR}
-  ARCHIVE DESTINATION ${LASZIP_BIN_DIR})
+  LIBRARY DESTINATION ${LASZIP_LIB_DIR}
+  ARCHIVE DESTINATION ${LASZIP_LIB_DIR})
 
 install(DIRECTORY ${LASZIP_HEADERS_DIR}
   DESTINATION ${LASZIP_INCLUDE_DIR}


More information about the Liblas-commits mailing list