diff options
| author | Brad King <brad.king@kitware.com> | 2018-07-11 11:21:31 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-07-11 11:21:37 (GMT) |
| commit | 7eb701d98b68768ffefc2f219896602368ea414a (patch) | |
| tree | 9dfad170d19fde48e4ac36544216ccf75a04844d | |
| parent | 0723eada4dcdb4332a63c56e1df6160f19cb9ff5 (diff) | |
| parent | 7c32432a8088298c6c7d8e40fb095fafc1f107c1 (diff) | |
| download | CMake-7eb701d98b68768ffefc2f219896602368ea414a.zip CMake-7eb701d98b68768ffefc2f219896602368ea414a.tar.gz CMake-7eb701d98b68768ffefc2f219896602368ea414a.tar.bz2 | |
Merge topic 'update-kwsys'
7c32432a80 Merge branch 'upstream-KWSys' into update-kwsys
3599b31474 KWSys 2018-07-10 (51982681)
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2200
| -rw-r--r-- | Source/kwsys/CMakeLists.txt | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/Source/kwsys/CMakeLists.txt b/Source/kwsys/CMakeLists.txt index 96088c8..516104b 100644 --- a/Source/kwsys/CMakeLists.txt +++ b/Source/kwsys/CMakeLists.txt @@ -1193,13 +1193,17 @@ IF(KWSYS_STANDALONE OR CMake_SOURCE_DIR) # Some Apple compilers produce bad optimizations in this source. IF(APPLE AND CMAKE_C_COMPILER_ID MATCHES "^(GNU|LLVM)$") SET(testProcess_COMPILE_FLAGS "${testProcess_COMPILE_FLAGS} -O0") - ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "XL" AND - NOT (CMAKE_SYSTEM MATCHES "Linux.*ppc64le" AND - NOT CMAKE_C_COMPILER_VERSION VERSION_LESS "13.1.1")) + ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "XL") # Tell IBM XL not to warn about our test infinite loop - # v13.1.1 and newer on Linux ppc64le is clang based and does not accept - # the -qsuppress option - SET(testProcess_COMPILE_FLAGS "${testProcess_COMPILE_FLAGS} -qsuppress=1500-010") + IF(CMAKE_SYSTEM MATCHES "Linux.*ppc64le" + AND CMAKE_C_COMPILER_VERSION VERSION_LESS "16.1.0" + AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS "13.1.1") + # v13.1.[1-6] on Linux ppc64le is clang based and does not accept + # the -qsuppress option, so just suppress all warnings. + SET(testProcess_COMPILE_FLAGS "${testProcess_COMPILE_FLAGS} -w") + ELSE() + SET(testProcess_COMPILE_FLAGS "${testProcess_COMPILE_FLAGS} -qsuppress=1500-010") + ENDIF() ENDIF() IF(CMAKE_C_FLAGS MATCHES "-fsanitize=") SET(testProcess_COMPILE_FLAGS "${testProcess_COMPILE_FLAGS} -DCRASH_USING_ABORT") |