[Liblas-commits] hg: Removed BUILD_PEDANTIC option from CMake - default mode anyw...

[liblas-commits at liblas.org]

changeset 6c316ce9fb1c in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=6c316ce9fb1c
summary: Removed BUILD_PEDANTIC option from CMake - default mode anyway, no reason to disable.

diffstat:

 CMakeLists.txt |  15 +--------------
 1 files changed, 1 insertions(+), 14 deletions(-)

diffs (39 lines):

diff -r b4e076750a61 -r 6c316ce9fb1c CMakeLists.txt
--- a/CMakeLists.txt	Fri Jul 30 16:54:12 2010 +0100
+++ b/CMakeLists.txt	Fri Jul 30 17:05:09 2010 +0100
@@ -64,11 +64,7 @@
 
 # Default to release mode 
 set(CMAKE_BUILD_TYPE Release CACHE STRING 
-    "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel"
-    
-    )
-
-set(BUILD_PEDANTIC TRUE CACHE BOOL "Choose compilation in pedantic or relaxed mode")
+    "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel")
 
 # TODO: Still testing the output paths --mloskot
 set(LIBLAS_BUILD_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin/${CMAKE_BUILD_TYPE})
@@ -90,10 +86,6 @@
 
 if(WIN32)
     if (MSVC)
-        if(BUILD_PEDANTIC)
-            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
-        endif()
-
         if (MSVC80 OR MSVC90 OR MSVC10)
             add_definitions(-D_CRT_SECURE_NO_WARNINGS)
             add_definitions(-D_CRT_NONSTDC_NO_WARNING)
@@ -111,11 +103,6 @@
     if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
         
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -Wall -Wno-long-long -ansi")
-
-        if(BUILD_PEDANTIC)
-            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic")
-        endif()
-        
         if (CMAKE_COMPILER_IS_GNUCXX)
             set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
         endif()