Changeset 1198:2236d00ca778 in lemon-main for CMakeLists.txt
- Timestamp:
- 11/01/18 19:49:51 (5 years ago)
- Branch:
- default
- Parents:
- 1196:959d78f3fe0e (diff), 1197:f179aa1045a4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent. - Phase:
- public
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
CMakeLists.txt
r1185 r1198 153 153 ENDIF() 154 154 155 IF( ( ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") AND 156 ("${CMAKE_CXX_COMPILER_VERSION}" VERSION_GREATER_EQUAL "4.8") ) 157 OR ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") 158 OR ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel") 159 ) 160 SET(LEMON_NO_UNUSED_LOCAL_TYPEDEF_WARNINGS TRUE) 161 ENDIF() 155 162 156 163 IF(DEFINED ENV{LEMON_CXX_WARNING}) 157 164 SET(CXX_WARNING $ENV{LEMON_CXX_WARNING}) 158 165 ELSE() 159 IF(CMAKE_COMPILER_IS_GNUCXX) 166 IF( ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") 167 OR ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") 168 ) 160 169 SET(CXX_WARNING "-Wall -W -Wunused -Wformat=2 -Wctor-dtor-privacy -Wnon-virtual-dtor -Wno-char-subscripts -Wwrite-strings -Wno-char-subscripts -Wreturn-type -Wcast-qual -Wcast-align -Wsign-promo -Woverloaded-virtual -fno-strict-aliasing -Wold-style-cast -Wno-unknown-pragmas") 170 SET(CMAKE_CXX_FLAGS_DEBUG CACHE STRING "-ggdb") 171 SET(CMAKE_C_FLAGS_DEBUG CACHE STRING "-ggdb") 172 ELSEIF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel") 173 SET(CXX_WARNING "-Wall -W -Wunused -Wformat=2 -Wnon-virtual-dtor -Wno-char-subscripts -Wwrite-strings -Wno-char-subscripts -Wreturn-type -Wcast-qual -Wsign-promo -Woverloaded-virtual -fno-strict-aliasing -Wno-unknown-pragmas") 161 174 SET(CMAKE_CXX_FLAGS_DEBUG CACHE STRING "-ggdb") 162 175 SET(CMAKE_C_FLAGS_DEBUG CACHE STRING "-ggdb") -
CMakeLists.txt
r1197 r1198 4 4 CMAKE_POLICY(SET CMP0048 OLD) 5 5 ENDIF(POLICY CMP0048) 6 7 IF(POLICY CMP0043) 8 CMAKE_POLICY(SET CMP0043 OLD) 9 ENDIF(POLICY CMP0043) 6 10 7 11 IF(POLICY CMP0026) … … 247 251 FORCE ) 248 252 253 SET_DIRECTORY_PROPERTIES(PROPERTIES 254 COMPILE_DEFINITIONS_DEBUG "LEMON_ENABLE_DEBUG" 255 COMPILE_DEFINITIONS_MAINTAINER "LEMON_ENABLE_DEBUG" 256 ) 249 257 250 258 INCLUDE(CheckTypeSize) … … 275 283 276 284 ENABLE_TESTING() 285 286 287 INCLUDE(CheckCXXCompilerFlag) 288 CHECK_CXX_COMPILER_FLAG("-std=c++11" LEMON_CXX11) 289 IF(LEMON_CXX11) 290 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") 291 ENDIF() 292 277 293 278 294 IF(${CMAKE_BUILD_TYPE} STREQUAL "Maintainer")
Note: See TracChangeset
for help on using the changeset viewer.