diff options
| author | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2016-06-23 00:16:15 +0200 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-06-27 10:37:40 -0400 |
| commit | ea5477e43de4660343897e4669bc5809dc4ddabe (patch) | |
| tree | a368c8573d3b2c24b713e059e87fa1895604eb39 /Source/cmMakefile.h | |
| parent | 68bb74d9e651fd44ddeeb81caa59096dbf1f0605 (diff) | |
| download | cmake-ea5477e43de4660343897e4669bc5809dc4ddabe.tar.gz | |
Make C++ feature checks extensible
Turn the feature check for cxx11_unordered_map into a function such that
we can use it for other features as well. Drop the 11 suffix, as we may
want to check features from other standards.
Diffstat (limited to 'Source/cmMakefile.h')
| -rw-r--r-- | Source/cmMakefile.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index 1680c6aaf0..c68cd1c87b 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -31,7 +31,7 @@ #include <cmsys/RegularExpression.hxx> #include <cmsys/auto_ptr.hxx> #if defined(CMAKE_BUILD_WITH_CMAKE) -#ifdef CMake_HAVE_CXX11_UNORDERED_MAP +#ifdef CMake_HAVE_CXX_UNORDERED_MAP #include <unordered_map> #else #include <cmsys/hash_map.hxx> @@ -796,7 +796,7 @@ protected: // libraries, classes, and executables mutable cmTargets Targets; #if defined(CMAKE_BUILD_WITH_CMAKE) -#ifdef CMake_HAVE_CXX11_UNORDERED_MAP +#ifdef CMake_HAVE_CXX_UNORDERED_MAP typedef std::unordered_map<std::string, cmTarget*> TargetMap; #else typedef cmsys::hash_map<std::string, cmTarget*> TargetMap; @@ -915,7 +915,7 @@ private: // A map for fast output to input look up. #if defined(CMAKE_BUILD_WITH_CMAKE) -#ifdef CMake_HAVE_CXX11_UNORDERED_MAP +#ifdef CMake_HAVE_CXX_UNORDERED_MAP typedef std::unordered_map<std::string, cmSourceFile*> OutputToSourceMap; #else typedef cmsys::hash_map<std::string, cmSourceFile*> OutputToSourceMap; |