From f62e242f7ed7e8239eb50d97a9014589aa1d2fbc Mon Sep 17 00:00:00 2001 From: Thomas Feuvrier <thomas.feuvrier@c-s.fr> Date: Wed, 10 Oct 2007 06:41:58 +0000 Subject: [PATCH] Modif : Ajout de CMAKE_COMPILER_IS_GNUCC en plus de CMAKE_COMPILER_IS_GNUCXX Ajout de CMAKE_C_FLAGS en plus de CMAKE_CXX_FLAGS --- Utilities/ITK/CMakeLists.txt | 44 ++++++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 14 deletions(-) diff --git a/Utilities/ITK/CMakeLists.txt b/Utilities/ITK/CMakeLists.txt index 495a98445d..aec013c0ab 100644 --- a/Utilities/ITK/CMakeLists.txt +++ b/Utilities/ITK/CMakeLists.txt @@ -261,21 +261,37 @@ ENDIF(MINGW) #----------------------------------------------------------------------------- # Adjust the compiler flags to avoid all warning. -IF(CMAKE_COMPILER_IS_GNUCXX) - # Hide warnings in ossim code. - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w") - - # CMake versions before 2.4 did not put the source-file-specific flags - # after the directory-level flags. Remove optimization flags from the - # CMAKE_CXX_FLAGS* variables so they can be overridden. - IF("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.4) - FOREACH(c "" "_DEBUG" "_RELEASE" "_MINSIZEREL" "_RELWITHDEBINFO") - STRING(REGEX REPLACE - "-O[^ ]*( |$)" "" CMAKE_CXX_FLAGS${c} "${CMAKE_CXX_FLAGS${c}}") - ENDFOREACH(c) - ENDIF("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.4) +IF(UNIX) -ENDIF(CMAKE_COMPILER_IS_GNUCXX) + IF(CMAKE_COMPILER_IS_GNUCXX) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w") + + # CMake versions before 2.4 did not put the source-file-specific flags + # after the directory-level flags. Remove optimization flags from the + # CMAKE_CXX_FLAGS* variables so they can be overridden. + IF("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.4) + FOREACH(c "" "_DEBUG" "_RELEASE" "_MINSIZEREL" "_RELWITHDEBINFO") + STRING(REGEX REPLACE + "-O[^ ]*( |$)" "" CMAKE_CXX_FLAGS${c} "${CMAKE_CXX_FLAGS${c}}") + ENDFOREACH(c) + ENDIF("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.4) + ENDIF(CMAKE_COMPILER_IS_GNUCXX) + + IF(CMAKE_COMPILER_IS_GNUCC) + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w") + + # CMake versions before 2.4 did not put the source-file-specific flags + # after the directory-level flags. Remove optimization flags from the + # CMAKE_C_FLAGS* variables so they can be overridden. + IF("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.4) + FOREACH(c "" "_DEBUG" "_RELEASE" "_MINSIZEREL" "_RELWITHDEBINFO") + STRING(REGEX REPLACE + "-O[^ ]*( |$)" "" CMAKE_C_FLAGS${c} "${CMAKE_C_FLAGS${c}}") + ENDFOREACH(c) + ENDIF("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.4) + ENDIF(CMAKE_COMPILER_IS_GNUCC) + +ENDIF(UNIX) #----------------------------------------------------------------------------- # Find platform-specific differences in the handling of IEEE floating point -- GitLab