summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2020-04-14 14:50:11 -0400
committerBrad King <brad.king@kitware.com>2020-04-14 14:50:11 -0400
commit6046baecce6ddc95b73e657fd23aeb2432825194 (patch)
treede204b5df322eb13a5f4e6a7c28d68c15c793c80
parent096958dfce917c1fce81ccb875466793af46fd09 (diff)
parent420e91c9517e5b753b4ae254896059f33ddee7d3 (diff)
downloadcmake-6046baecce6ddc95b73e657fd23aeb2432825194.tar.gz
Merge branch 'ibmi-aix-exports' into release-3.16
Merge-request: !4611
-rw-r--r--Source/cmTarget.cxx7
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 80986fca44..cdfd349836 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -235,8 +235,11 @@ cmTarget::cmTarget(std::string const& name, cmStateEnums::TargetType type,
!impl->Makefile->GetSafeDefinition("CMAKE_IMPORT_LIBRARY_SUFFIX").empty();
// Check whether we are targeting AIX.
- impl->IsAIX =
- (impl->Makefile->GetSafeDefinition("CMAKE_SYSTEM_NAME") == "AIX");
+ {
+ std::string const& systemName =
+ impl->Makefile->GetSafeDefinition("CMAKE_SYSTEM_NAME");
+ impl->IsAIX = (systemName == "AIX" || systemName == "OS400");
+ }
// Check whether we are targeting an Android platform.
impl->IsAndroid =