diff options
| author | Brad King <brad.king@kitware.com> | 2020-03-05 20:09:09 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-03-05 20:09:09 (GMT) |
| commit | 2de860513ddb71f4c53769bb2979b35337057fa5 (patch) | |
| tree | f3a106c9eb6f94a207a726a60fc5f7ba09105d95 | |
| parent | b7d8c91822101ff9de07075e9b1f02e18c2725da (diff) | |
| parent | 917db8163d645eb1dfe61ee9d74eb373fe0b4b2f (diff) | |
| download | CMake-2de860513ddb71f4c53769bb2979b35337057fa5.zip CMake-2de860513ddb71f4c53769bb2979b35337057fa5.tar.gz CMake-2de860513ddb71f4c53769bb2979b35337057fa5.tar.bz2 | |
Merge branch 'cmstd-IBM-i' into release-3.16
Merge-request: !4430
| -rw-r--r-- | CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index da99a6e..ee736dd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -368,7 +368,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() |