浏览代码

Merge branch 'cmstd-IBM-i' into release-3.16

Merge-request: !4430
Brad King 5 年之前
父节点
当前提交
2de860513d
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      CMakeLists.txt

+ 1 - 1
CMakeLists.txt

@@ -368,7 +368,7 @@ macro (CMAKE_BUILD_UTILITIES)
   # Setup third-party libraries.
   # Setup third-party libraries.
   # Everything in the tree should be able to include files from the
   # Everything in the tree should be able to include files from the
   # Utilities directory.
   # 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"
     # using -isystem option generate error "template with C linkage"
     include_directories("${CMake_SOURCE_DIR}/Utilities/std")
     include_directories("${CMake_SOURCE_DIR}/Utilities/std")
   else()
   else()