Changeset 2905

Timestamp:

Feb 5, 2010, 1:24:32 PM (15 years ago)

Author:

mloskot

Message:

Fixed CMake version comparison to disable platform.h (#317)

File:

• trunk/CMakeLists.txt (modified) (3 diffs)

trunk/CMakeLists.txt

@@ -14 +14 @@
 project(geos)
 cmake_minimum_required(VERSION 2.6)
+
+if(NOT CMAKE_VERSION)
+    set(CMAKE_VERSION "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}")
+endif()
 
 # Location of custom CMake modules with macros used by GEOS
@@ -218 +222 @@
 
 if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/include/geos/platform.h)
-  if (${CMAKE_VERSION} VERSION_LESS "2.8.0")
+  message(STATUS "Disabling existing ${CMAKE_CURRENT_SOURCE_DIR}/include/geos/platform.h")
+
+  if(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 6)
     file(REMOVE ${CMAKE_CURRENT_SOURCE_DIR}/include/geos/platform.h)
+    set(PH_RESULT "removed")
   else()
     file(RENAME
       ${CMAKE_CURRENT_SOURCE_DIR}/include/geos/platform.h
       ${CMAKE_CURRENT_SOURCE_DIR}/include/geos/platform.h.disabled)
-  endif()
+      set(PH_RESULT "renamed")
+  endif()
+
+  message(STATUS "Disabling existing ${CMAKE_CURRENT_SOURCE_DIR}/include/geos/platform.h - ${PH_RESULT}")
 endif()
 
@@ -267 +277 @@
 #################################################################################
 # DEBUG settings - TODO: make a summary
+
+message(STATUS "CMake ${CMAKE_VERSION} successfully configured ${PROJECT_NAME} using ${CMAKE_GENERATOR} generator")
+
 #message(STATUS "XXX: CMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}")
 #message(STATUS "XXX: CMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG}")