diff options
author | Nick Lewycky <nicholas@mxc.ca> | 2009-03-09 06:16:26 +0000 |
---|---|---|
committer | Nick Lewycky <nicholas@mxc.ca> | 2009-03-09 06:16:26 +0000 |
commit | 59fad7d9339901f8146f2d77cd7818625f0935b8 (patch) | |
tree | c00634bc55d85ddb82a29bff77d1da0dedc28cd1 /cmake | |
parent | f231c07228deb75b6cd5ae7c9c057bc8303c6998 (diff) | |
download | external_llvm-59fad7d9339901f8146f2d77cd7818625f0935b8.zip external_llvm-59fad7d9339901f8146f2d77cd7818625f0935b8.tar.gz external_llvm-59fad7d9339901f8146f2d77cd7818625f0935b8.tar.bz2 |
Remove configurey-fu to autodetect hash_map and hash_set now that they are
no longer used in LLVM.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@66406 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake')
-rwxr-xr-x | cmake/config-ix.cmake | 17 | ||||
-rwxr-xr-x | cmake/modules/CheckCxxHashmap.cmake | 53 | ||||
-rwxr-xr-x | cmake/modules/CheckCxxHashset.cmake | 52 |
3 files changed, 0 insertions, 122 deletions
diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake index cbe48d8..9e5bcd8 100755 --- a/cmake/config-ix.cmake +++ b/cmake/config-ix.cmake @@ -86,14 +86,6 @@ else( MSVC ) set(LTDL_DLOPEN_DEPLIBS 0) # TODO endif( MSVC ) -if( NOT MSVC ) - # hash_map.h.in and hash_set.h.in contain a special case for MSVC - include(CheckCxxHashmap) - include(CheckCxxHashset) - check_hashmap() - check_hashset() -endif( NOT MSVC ) - # FIXME: Signal handler return type, currently hardcoded to 'void' set(RETSIGTYPE void) @@ -124,12 +116,3 @@ configure_file( ${LLVM_BINARY_DIR}/include/llvm/Support/DataTypes.h ) -configure_file( - ${LLVM_MAIN_INCLUDE_DIR}/llvm/ADT/hash_map.cmake - ${LLVM_BINARY_DIR}/include/llvm/ADT/hash_map.h - ) - -configure_file( - ${LLVM_MAIN_INCLUDE_DIR}/llvm/ADT/hash_set.cmake - ${LLVM_BINARY_DIR}/include/llvm/ADT/hash_set.h - ) diff --git a/cmake/modules/CheckCxxHashmap.cmake b/cmake/modules/CheckCxxHashmap.cmake deleted file mode 100755 index 5f16c0a..0000000 --- a/cmake/modules/CheckCxxHashmap.cmake +++ /dev/null @@ -1,53 +0,0 @@ -# - Check if for hash_map. -# CHECK_HASHMAP () -# - -include(CheckCXXSourceCompiles) - -macro(CHECK_HASHMAP) - message(STATUS "Checking for C++ hash_map implementation...") - check_cxx_source_compiles(" - #include <ext/hash_map> - int main() { - __gnu_cxx::hash_map<int, int> t; - } -" - HAVE_GNU_EXT_HASH_MAP - ) - if(HAVE_GNU_EXT_HASH_MAP) - message(STATUS "C++ hash_map found in 'ext' dir in namespace __gnu_cxx::") - endif(HAVE_GNU_EXT_HASH_MAP) - - check_cxx_source_compiles(" - #include <ext/hash_map> - int main() { - std::hash_map<int, int> t; - } -" - HAVE_STD_EXT_HASH_MAP - ) - if(HAVE_STD_EXT_HASH_MAP) - message(STATUS "C++ hash_map found in 'ext' dir in namespace std::") - endif(HAVE_STD_EXT_HASH_MAP) - - check_cxx_source_compiles(" - #include <hash_map> - int main() { - hash_map<int, int> t; - } -" - HAVE_GLOBAL_HASH_MAP - ) - if(HAVE_GLOBAL_HASH_MAP) - message(STATUS "C++ hash_map found in global namespace") - endif(HAVE_GLOBAL_HASH_MAP) - - if(NOT HAVE_GNU_EXT_HASH_MAP) - if(NOT HAVE_STD_EXT_HASH_MAP) - if(NOT HAVE_GLOBAL_HASH_MAP) - message(STATUS "C++ hash_map not found") - endif(NOT HAVE_GLOBAL_HASH_MAP) - endif(NOT HAVE_STD_EXT_HASH_MAP) - endif(NOT HAVE_GNU_EXT_HASH_MAP) - -endmacro(CHECK_HASHMAP) diff --git a/cmake/modules/CheckCxxHashset.cmake b/cmake/modules/CheckCxxHashset.cmake deleted file mode 100755 index 940c388..0000000 --- a/cmake/modules/CheckCxxHashset.cmake +++ /dev/null @@ -1,52 +0,0 @@ -# - Check if for hash_set. -# CHECK_HASHSET () -# - -include(CheckCXXSourceCompiles) - -macro(CHECK_HASHSET) - message(STATUS "Checking for C++ hash_set implementation...") - check_cxx_source_compiles(" - #include <ext/hash_set> - int main() { - __gnu_cxx::hash_set<int> t; - } -" - HAVE_GNU_EXT_HASH_SET - ) - if(HAVE_GNU_EXT_HASH_SET) - message(STATUS "C++ hash_set found in 'ext' dir in namespace __gnu_cxx::") - endif(HAVE_GNU_EXT_HASH_SET) - - check_cxx_source_compiles(" - #include <ext/hash_set> - int main() { - std::hash_set<int> t; - } -" - HAVE_STD_EXT_HASH_SET - ) - if(HAVE_STD_EXT_HASH_SET) - message(STATUS "C++ hash_set found in 'ext' dir in namespace std::") - endif(HAVE_STD_EXT_HASH_SET) - - check_cxx_source_compiles(" - #include <hash_set> - int main() { - hash_set<int> t; - } -" - HAVE_GLOBAL_HASH_SET - ) - if(HAVE_GLOBAL_HASH_SET) - message(STATUS "C++ hash_set found in global namespace") - endif(HAVE_GLOBAL_HASH_SET) - - if(NOT HAVE_GNU_EXT_HASH_SET) - if(NOT HAVE_STD_EXT_HASH_SET) - if(NOT HAVE_GLOBAL_HASH_SET) - message(STATUS "C++ hash_set not found") - endif(NOT HAVE_GLOBAL_HASH_SET) - endif(NOT HAVE_STD_EXT_HASH_SET) - endif(NOT HAVE_GNU_EXT_HASH_SET) -endmacro(CHECK_HASHSET) |