diff options
| author | Brad King <brad.king@kitware.com> | 2017-03-09 16:08:06 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-03-09 16:08:11 (GMT) |
| commit | c4f9d104269938d8111030a05268b19a0f493098 (patch) | |
| tree | 155bdfc09b1ee0312206fc30f72d21834b2d9c36 /Source/cmMakefile.cxx | |
| parent | 31f3531856ab8ee0cdeaf427224b51abd7714ccc (diff) | |
| parent | d9bdcf34efa79dcdea4ded8e90b80a55db69fbf6 (diff) | |
| download | CMake-c4f9d104269938d8111030a05268b19a0f493098.zip CMake-c4f9d104269938d8111030a05268b19a0f493098.tar.gz CMake-c4f9d104269938d8111030a05268b19a0f493098.tar.bz2 | |
Merge topic 'master'
d9bdcf34 Tests: Add x32 tests to test suite
5b6d354f Help: Add notes for topic 'x32-abi'
bed9c73d Modules: Add x32-abi support to hard-coded paths
462cf254 Add support for x32-abi
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !532
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 204fd8f..c4a488f 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -2150,6 +2150,12 @@ bool cmMakefile::IsSet(const std::string& name) const bool cmMakefile::PlatformIs32Bit() const { + if (const char* plat_abi = + this->GetDefinition("CMAKE_INTERNAL_PLATFORM_ABI")) { + if (strcmp(plat_abi, "ELF X32") == 0) { + return false; + } + } if (const char* sizeof_dptr = this->GetDefinition("CMAKE_SIZEOF_VOID_P")) { return atoi(sizeof_dptr) == 4; } @@ -2164,6 +2170,17 @@ bool cmMakefile::PlatformIs64Bit() const return false; } +bool cmMakefile::PlatformIsx32() const +{ + if (const char* plat_abi = + this->GetDefinition("CMAKE_INTERNAL_PLATFORM_ABI")) { + if (strcmp(plat_abi, "ELF X32") == 0) { + return true; + } + } + return false; +} + bool cmMakefile::PlatformIsAppleIos() const { std::string sdkRoot; |