summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2020-04-15 13:39:48 (GMT)
committerKitware Robot <kwrobot@kitware.com>2020-04-15 13:39:55 (GMT)
commite4aed8b9cdba8913cef61f2b1ec04dc4d08b8b1d (patch)
treec6026d7cb42b380997f9f2d9d6378ed81c477dd4 /Source
parent5fde1af854dfe101df5f64a8824250500f339774 (diff)
parent420e91c9517e5b753b4ae254896059f33ddee7d3 (diff)
downloadCMake-e4aed8b9cdba8913cef61f2b1ec04dc4d08b8b1d.zip
CMake-e4aed8b9cdba8913cef61f2b1ec04dc4d08b8b1d.tar.gz
CMake-e4aed8b9cdba8913cef61f2b1ec04dc4d08b8b1d.tar.bz2
Merge topic 'ibmi-aix-exports' into release-3.17
420e91c951 AIX: Activate symbol export/import IBM i (OS400) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4611
Diffstat (limited to 'Source')
-rw-r--r--Source/cmTarget.cxx7
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 97d7fce..1ad9fd1 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -238,8 +238,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 =