[geos-commits] r3106 - trunk
svn_geos at osgeo.org
svn_geos at osgeo.org
Sun Oct 10 16:50:49 EDT 2010
Author: mloskot
Date: 2010-10-10 13:50:49 -0700 (Sun, 10 Oct 2010)
New Revision: 3106
Modified:
trunk/CMakeLists.txt
Log:
Do not set CMAKE_BUILD_TYPE for Visual Studio IDE generators - CMAKE_BUILD_TYPE is dedicated to single-configuration generators like Make or NMAKE.
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2010-10-10 11:32:36 UTC (rev 3105)
+++ trunk/CMakeLists.txt 2010-10-10 20:50:49 UTC (rev 3106)
@@ -72,11 +72,13 @@
# Setup C/C++ compiler options
#################################################################################
-if(NOT CMAKE_BUILD_TYPE)
- set(CMAKE_BUILD_TYPE Debug CACHE STRING
+if(NOT MSVC_IDE)
+ if(NOT CMAKE_BUILD_TYPE)
+ set(CMAKE_BUILD_TYPE Debug CACHE STRING
"Choose the type of build, options are: None Debug Release" FORCE)
+ endif()
+ message(STATUS "Setting GEOS build type - ${CMAKE_BUILD_TYPE}")
endif()
-message(STATUS "Setting GEOS build type - ${CMAKE_BUILD_TYPE}")
if(CMAKE_BUILD_TYPE STREQUAL Debug)
add_definitions(-D_DEBUG)
@@ -109,7 +111,6 @@
# Set pedantic mode by default
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
string(REGEX REPLACE "/W[0-9]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
- message(STATUS "Z: ${CMAKE_CXX_FLAGS}")
if(MSVC80 OR MSVC90 OR MSVC10)
More information about the geos-commits
mailing list