mirror of
https://github.com/Kitware/CMake.git
synced 2026-05-07 22:59:56 -05:00
Merge topic 'aix-id-var' into release-4.0
ff03db6657 AIX: Add platform id variables 'AIX' and 'CMAKE_HOST_AIX'
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10304
This commit is contained in:
@@ -323,6 +323,7 @@ Variables that Describe the System
|
|||||||
.. toctree::
|
.. toctree::
|
||||||
:maxdepth: 1
|
:maxdepth: 1
|
||||||
|
|
||||||
|
/variable/AIX
|
||||||
/variable/ANDROID
|
/variable/ANDROID
|
||||||
/variable/APPLE
|
/variable/APPLE
|
||||||
/variable/BORLAND
|
/variable/BORLAND
|
||||||
@@ -331,6 +332,7 @@ Variables that Describe the System
|
|||||||
/variable/CMAKE_CL_64
|
/variable/CMAKE_CL_64
|
||||||
/variable/CMAKE_COMPILER_2005
|
/variable/CMAKE_COMPILER_2005
|
||||||
/variable/CMAKE_HOST_APPLE
|
/variable/CMAKE_HOST_APPLE
|
||||||
|
/variable/CMAKE_HOST_AIX
|
||||||
/variable/CMAKE_HOST_BSD
|
/variable/CMAKE_HOST_BSD
|
||||||
/variable/CMAKE_HOST_EXECUTABLE_SUFFIX
|
/variable/CMAKE_HOST_EXECUTABLE_SUFFIX
|
||||||
/variable/CMAKE_HOST_LINUX
|
/variable/CMAKE_HOST_LINUX
|
||||||
|
|||||||
@@ -41,6 +41,9 @@ Commands
|
|||||||
Variables
|
Variables
|
||||||
---------
|
---------
|
||||||
|
|
||||||
|
* The :variable:`AIX` and :variable:`CMAKE_HOST_AIX` variables are
|
||||||
|
now set to true when the target or host system is AIX, respectively.
|
||||||
|
|
||||||
* Linker flag variables learned to support the ``LINKER:`` prefix:
|
* Linker flag variables learned to support the ``LINKER:`` prefix:
|
||||||
|
|
||||||
* :variable:`CMAKE_EXE_LINKER_FLAGS`
|
* :variable:`CMAKE_EXE_LINKER_FLAGS`
|
||||||
|
|||||||
@@ -0,0 +1,6 @@
|
|||||||
|
AIX
|
||||||
|
---
|
||||||
|
|
||||||
|
.. versionadded:: 4.0
|
||||||
|
|
||||||
|
Set to true when the target system is AIX.
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
CMAKE_HOST_AIX
|
||||||
|
--------------
|
||||||
|
|
||||||
|
.. versionadded:: 4.0
|
||||||
|
|
||||||
|
Set to true when the host system is AIX.
|
||||||
@@ -17,6 +17,7 @@ unset(MSYS)
|
|||||||
unset(WIN32)
|
unset(WIN32)
|
||||||
unset(BSD)
|
unset(BSD)
|
||||||
unset(LINUX)
|
unset(LINUX)
|
||||||
|
unset(AIX)
|
||||||
|
|
||||||
# The CMAKE_EFFECTIVE_SYSTEM_NAME is used to load compiler and compiler
|
# The CMAKE_EFFECTIVE_SYSTEM_NAME is used to load compiler and compiler
|
||||||
# wrapper configuration files. By default it equals to CMAKE_SYSTEM_NAME
|
# wrapper configuration files. By default it equals to CMAKE_SYSTEM_NAME
|
||||||
|
|||||||
@@ -1 +1,2 @@
|
|||||||
|
set(AIX 1)
|
||||||
set(UNIX 1)
|
set(UNIX 1)
|
||||||
|
|||||||
@@ -325,6 +325,11 @@ void cmStateSnapshot::SetDefaultDefinitions()
|
|||||||
this->SetDefinition("CMAKE_HOST_LINUX", "1");
|
this->SetDefinition("CMAKE_HOST_LINUX", "1");
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined(_AIX)
|
||||||
|
this->SetDefinition("AIX", "1");
|
||||||
|
this->SetDefinition("CMAKE_HOST_AIX", "1");
|
||||||
|
#endif
|
||||||
|
|
||||||
this->SetDefinition("CMAKE_MAJOR_VERSION",
|
this->SetDefinition("CMAKE_MAJOR_VERSION",
|
||||||
std::to_string(cmVersion::GetMajorVersion()));
|
std::to_string(cmVersion::GetMajorVersion()));
|
||||||
this->SetDefinition("CMAKE_MINOR_VERSION",
|
this->SetDefinition("CMAKE_MINOR_VERSION",
|
||||||
|
|||||||
Reference in New Issue
Block a user