From 7d1679f1d3c209233edcff383530d6ee94b89ba0 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Sun, 8 Apr 2018 09:57:36 +0800 Subject: [PATCH] cmake: define HAVE_STDLIB_MAP_SPLICING for both libstdc++ and libc++ Signed-off-by: Kefu Chai --- src/CMakeLists.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index be1ebaf2d5c1a..2bf655c7d1ef4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -167,9 +167,8 @@ else() set(C_STANDARD_REQUIRED ON) endif() -if(CXX_STDLIB STREQUAL "libc++") - include(CheckCXXSourceCompiles) - CHECK_CXX_SOURCE_COMPILES(" +include(CheckCXXSourceCompiles) +CHECK_CXX_SOURCE_COMPILES(" #include using Map = std::map; int main() { @@ -177,7 +176,6 @@ int main() { m.merge(Map{}); } " HAVE_STDLIB_MAP_SPLICING) -endif() if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.1)