diff options
| author | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2016-10-24 20:33:18 (GMT) |
|---|---|---|
| committer | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2016-10-24 20:34:52 (GMT) |
| commit | c15dc1972839e175afaa9011f74376dadf08277f (patch) | |
| tree | f6c1dc85793438cc0337a7870e1bd33a81849077 /Source/cmTargetPropertyComputer.cxx | |
| parent | f660832999e086f02a9f3552c028aed900cd7249 (diff) | |
| download | CMake-c15dc1972839e175afaa9011f74376dadf08277f.zip CMake-c15dc1972839e175afaa9011f74376dadf08277f.tar.gz CMake-c15dc1972839e175afaa9011f74376dadf08277f.tar.bz2 | |
Introduce CM_UNORDERED_SET
Avoid duplicating switch among std::unordered_set, cmsys::hash_set, and
std::set.
Diffstat (limited to 'Source/cmTargetPropertyComputer.cxx')
| -rw-r--r-- | Source/cmTargetPropertyComputer.cxx | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/Source/cmTargetPropertyComputer.cxx b/Source/cmTargetPropertyComputer.cxx index 36d1940..7cf1fd8 100644 --- a/Source/cmTargetPropertyComputer.cxx +++ b/Source/cmTargetPropertyComputer.cxx @@ -10,16 +10,7 @@ #include "cmSourceFile.h" #include "cmSourceFileLocation.h" #include "cmTarget.h" - -#if defined(CMake_HAVE_CXX_UNORDERED_SET) -#include <unordered_set> -#define UNORDERED_SET std::unordered_set -#elif defined(CMAKE_BUILD_WITH_CMAKE) -#include <cmsys/hash_set.hxx> -#define UNORDERED_SET cmsys::hash_set -#else -#define UNORDERED_SET std::set -#endif +#include "cm_unordered_set.hxx" bool cmTargetPropertyComputer::HandleLocationPropertyPolicy( std::string const& tgtName, cmMessenger* messenger, @@ -59,7 +50,7 @@ bool cmTargetPropertyComputer::WhiteListedInterfaceProperty( if (cmHasLiteralPrefix(prop, "INTERFACE_")) { return true; } - static UNORDERED_SET<std::string> builtIns; + static CM_UNORDERED_SET<std::string> builtIns; if (builtIns.empty()) { builtIns.insert("COMPATIBLE_INTERFACE_BOOL"); builtIns.insert("COMPATIBLE_INTERFACE_NUMBER_MAX"); |