diff options
| author | Brad King <brad.king@kitware.com> | 2020-03-06 14:24:38 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-03-06 14:24:45 (GMT) |
| commit | b7d43ea0da43aa8fcb7cbe846469d555d2877f36 (patch) | |
| tree | 6a17478a5bfdc9f96b84d8542c1baef6b085abc7 /CMakeLists.txt | |
| parent | a1ccbab5a883d6f9d89827b63ffc039f9e4b296b (diff) | |
| parent | 917db8163d645eb1dfe61ee9d74eb373fe0b4b2f (diff) | |
| download | CMake-b7d43ea0da43aa8fcb7cbe846469d555d2877f36.zip CMake-b7d43ea0da43aa8fcb7cbe846469d555d2877f36.tar.gz CMake-b7d43ea0da43aa8fcb7cbe846469d555d2877f36.tar.bz2 | |
Merge topic 'cmstd-IBM-i' into release-3.17
917db8163d cmstd: Remove -isystem option for IBM i (OS400)
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4430
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c7d139b..18b8d7d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -367,7 +367,7 @@ macro (CMAKE_BUILD_UTILITIES) # Setup third-party libraries. # Everything in the tree should be able to include files from the # Utilities directory. - if (CMAKE_SYSTEM_NAME STREQUAL "AIX" AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU") + if ((CMAKE_SYSTEM_NAME STREQUAL "AIX" OR CMAKE_SYSTEM_NAME STREQUAL "OS400") AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU") # using -isystem option generate error "template with C linkage" include_directories("${CMake_SOURCE_DIR}/Utilities/std") else() |