[Liblas-commits] hg: use liblas_c for name of library on windows, ensure that loc...

[liblas-commits at liblas.org]

changeset 1111988c675c in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=1111988c675c
summary: use liblas_c for name of library on windows, ensure that local project includes are used before externals

diffstat:

 CMakeLists.txt |  20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)

diffs (35 lines):

diff -r 8b253eedbcbe -r 1111988c675c CMakeLists.txt
--- a/CMakeLists.txt	Mon Jun 07 11:58:27 2010 -0500
+++ b/CMakeLists.txt	Mon Jun 07 21:38:50 2010 -0500
@@ -17,15 +17,27 @@
 SET(CPACK_PACKAGE_VERSION_MINOR "3")
 SET(CPACK_PACKAGE_VERSION_PATCH "0")
 
-# Name of C++ library
-set(LIBLAS_LIB_NAME las)
+if(WIN32)
+    # Name of C++ library
+    set(LIBLAS_LIB_NAME liblas)
 
-# Name of C library
-set(LIBLAS_C_LIB_NAME las_c)
+    # Name of C library
+    set(LIBLAS_C_LIB_NAME liblas_c)
+else()
+    # Name of C++ library
+    set(LIBLAS_LIB_NAME las)
+
+    # Name of C library
+    set(LIBLAS_C_LIB_NAME las_c)
+
+endif()
+
 
 # Name of test suite runner
 set(LIBLAS_UNIT_TEST liblas_test)
 
+set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)
+
 # Choose package components
 set(WITH_UTILITIES TRUE CACHE BOOL "Choose if libLAS utilities should be built")
 set(WITH_TESTS TRUE CACHE BOOL "Choose if libLAS unit tests should be built")