[Liblas-commits] hg: fix up build type detection for bigfile debug test, be more ...

[liblas-commits at liblas.org]

changeset 5d5c0da9d980 in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=5d5c0da9d980
summary: fix up build type detection for bigfile debug test, be more specific testing for libspatialindex headers that don't have the same name as GEOS headers

diffstat:

 CMakeLists.txt                       |  4 +++-
 apps/CMakeLists.txt                  |  2 +-
 cmake/modules/FindSpatialIndex.cmake |  2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diffs (46 lines):

diff -r d1dbe75b5b93 -r 5d5c0da9d980 CMakeLists.txt
--- a/CMakeLists.txt	Mon Jul 12 12:01:59 2010 -0500
+++ b/CMakeLists.txt	Mon Jul 12 16:30:04 2010 -0500
@@ -63,8 +63,9 @@
 # General build settings
 
 # Default to release mode 
-set(CMAKE_BUILD_TYPE Release CACHE STRING
+set(CMAKE_BUILD_TYPE Release CACHE STRING 
     "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel"
+    FORCE
     )
 
 set(BUILD_PEDANTIC TRUE CACHE BOOL "Choose compilation in pedantic or relaxed mode")
@@ -123,6 +124,7 @@
 
 if (APPLE)
     set(SO_EXT dylib)
+    set(CMAKE_FIND_FRAMEWORK "LAST")
 elseif(WIN32)
     set(SO_EXT dll)
 else()
diff -r d1dbe75b5b93 -r 5d5c0da9d980 apps/CMakeLists.txt
--- a/apps/CMakeLists.txt	Mon Jul 12 12:01:59 2010 -0500
+++ b/apps/CMakeLists.txt	Mon Jul 12 16:30:04 2010 -0500
@@ -22,7 +22,7 @@
 set(LAS2LAS2 las2las2 )
 
 string(TOUPPER ${CMAKE_BUILD_TYPE} BUILD_TYPE_UPPER)
-if (CMAKE_BUILD_TYPE EQUAL ${BUILD_TYPE_UPPER})
+if (BUILD_TYPE_UPPER EQUAL "DEBUG")
 set(BIGFILE_TEST bigfile_test)
 endif()
 
diff -r d1dbe75b5b93 -r 5d5c0da9d980 cmake/modules/FindSpatialIndex.cmake
--- a/cmake/modules/FindSpatialIndex.cmake	Mon Jul 12 12:01:59 2010 -0500
+++ b/cmake/modules/FindSpatialIndex.cmake	Mon Jul 12 16:30:04 2010 -0500
@@ -37,7 +37,7 @@
 endif()
 
 find_path(SPATIALINDEX_INCLUDE_DIR
-  NAMES SpatialIndex.h RTree.h
+  NAMES MVRTree.h
   HINTS
   ${OSGEO4W_ROOT_DIR}/include
   PATHS