Author: ericwf
Date: Tue Aug 2 15:21:07 2016
New Revision: 277512
URL: http://llvm.org/viewvc/llvm-project?rev=277512&view=rev
Log:
Pass compilers when configuring Google Benchmark.
Modified:
libcxx/trunk/benchmarks/CMakeLists.txt
Modified: libcxx/trunk/benchmarks/CMakeLists.txt
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/benchmarks/CMakeLists.txt?rev=277512&r1=277511&r2=277512&view=diff
==============================================================================
--- libcxx/trunk/benchmarks/CMakeLists.txt (original)
+++ libcxx/trunk/benchmarks/CMakeLists.txt Tue Aug 2 15:21:07 2016
@@ -26,7 +26,9 @@ ExternalProject_Add(google-benchmark-lib
PREFIX benchmark-libcxx
SOURCE_DIR ${LIBCXX_SOURCE_DIR}/utils/google-benchmark
INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/benchmark-libcxx
- CMAKE_CACHE_DEFAULT_ARGS
+ CMAKE_CACHE_ARGS
+ -DCMAKE_C_COMPILER:STRING=${CMAKE_C_COMPILER}
+ -DCMAKE_CXX_COMPILER:STRING=${CMAKE_CXX_COMPILER}
-DCMAKE_BUILD_TYPE:STRING=RELEASE
-DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
-DCMAKE_CXX_FLAGS:STRING=${BENCHMARK_LIBCXX_COMPILE_FLAGS}
@@ -45,7 +47,9 @@ if (LIBCXX_BUILD_BENCHMARK_NATIVE_STDLIB
INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/benchmark-native
CMAKE_CACHE_ARGS
-DBENCHMARK_ENABLE_TESTING:BOOL=OFF
- CMAKE_CACHE_DEFAULT_ARGS
+ CMAKE_CACHE_ARGS
+ -DCMAKE_C_COMPILER:STRING=${CMAKE_C_COMPILER}
+ -DCMAKE_CXX_COMPILER:STRING=${CMAKE_CXX_COMPILER}
-DCMAKE_BUILD_TYPE:STRING=RELEASE
-DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>)
endif()
@@ -63,6 +67,7 @@ set(BENCHMARK_TEST_COMPILE_FLAGS
)
set(BENCHMARK_TEST_LIBCXX_COMPILE_FLAGS
-nostdinc++
+ -cxx-isystem ${LIBCXX_SOURCE_DIR}/include
${BENCHMARK_TEST_COMPILE_FLAGS}
-Wno-user-defined-literals
)
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
