diff options
| author | Tom Rondeau <tom@trondeau.com> | 2014-07-28 10:41:10 -0400 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2014-07-28 10:41:10 -0400 |
| commit | 7f847769126c3141aa1db0b24bb82f80b8524e87 (patch) | |
| tree | 0d5fc1b3f36b2597dc58236fc9337b7a79ba4ebf /cmake/Modules | |
| parent | 67ab045e084de7ff0be10944ae4732a6dc630165 (diff) | |
cmake: cmake doesn't have a FIND command for STRING until 2.8.5, so we're just cehcking for that here before using it.
Using cmake < 2.8.5 will not dedup the cflags, but this is non-critical.
Diffstat (limited to 'cmake/Modules')
| -rw-r--r-- | cmake/Modules/GrMiscUtils.cmake | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/cmake/Modules/GrMiscUtils.cmake b/cmake/Modules/GrMiscUtils.cmake index 69eae0e4fd..188c40480b 100644 --- a/cmake/Modules/GrMiscUtils.cmake +++ b/cmake/Modules/GrMiscUtils.cmake @@ -94,11 +94,13 @@ macro(GR_ADD_CXX_COMPILER_FLAG_IF_AVAILABLE flag have) include(CheckCXXCompilerFlag) CHECK_CXX_COMPILER_FLAG(${flag} ${have}) if(${have}) - STRING(FIND "${CMAKE_CXX_FLAGS}" "${flag}" flag_dup) - if(${flag_dup} EQUAL -1) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${flag}") - endif(${flag_dup} EQUAL -1) + if(${CMAKE_VERSION} VERSION_GREATER "2.8.4") + STRING(FIND "${CMAKE_CXX_FLAGS}" "${flag}" flag_dup) + if(${flag_dup} EQUAL -1) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${flag}") + endif(${flag_dup} EQUAL -1) + endif(${CMAKE_VERSION} VERSION_GREATER "2.8.4") endif(${have}) endmacro(GR_ADD_CXX_COMPILER_FLAG_IF_AVAILABLE) |