[libcxx-commits] [libcxx] 3ca520f - [libc++][cmake] Improves benchmark build.

[Mark de Wever via libcxx-commits]

Author: Mark de Wever
Date: 2021-11-09T18:57:44+01:00
New Revision: 3ca520f19f430e38ac7fa82591141305a2679234

URL: https://github.com/llvm/llvm-project/commit/3ca520f19f430e38ac7fa82591141305a2679234
DIFF: https://github.com/llvm/llvm-project/commit/3ca520f19f430e38ac7fa82591141305a2679234.diff

LOG: [libc++][cmake] Improves benchmark build.

The CMake dependencies don't properly list the libc++ headers. When a
libc++ header is modified the affected benchmarks aren't rebuild. This
makes testing benchmarks tricky and may cause accidentally not using the
latest modifications during testing. This change causes CMake to
determine the proper dependencies.

This shouldn't affect the CI build.

Reviewed By: #libc, ldionne

Differential Revision: https://reviews.llvm.org/D113419

Added: 
    

Modified: 
    libcxx/benchmarks/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/libcxx/benchmarks/CMakeLists.txt b/libcxx/benchmarks/CMakeLists.txt
index cad880858a785..67e643cf8608a 100644
--- a/libcxx/benchmarks/CMakeLists.txt
+++ b/libcxx/benchmarks/CMakeLists.txt
@@ -82,8 +82,9 @@ set(BENCHMARK_NATIVE_INSTALL ${CMAKE_CURRENT_BINARY_DIR}/benchmark-native)
 
 add_library(               cxx-benchmarks-flags INTERFACE)
 target_compile_features(   cxx-benchmarks-flags INTERFACE cxx_std_20)
-target_compile_options(    cxx-benchmarks-flags INTERFACE -O2 -fsized-deallocation)
-target_include_directories(cxx-benchmarks-flags INTERFACE "${BENCHMARK_LIBCXX_INSTALL}/include"
+target_compile_options(    cxx-benchmarks-flags INTERFACE -O2 -fsized-deallocation -nostdinc++)
+target_include_directories(cxx-benchmarks-flags INTERFACE "${LIBCXX_GENERATED_INCLUDE_DIR}"
+                                                INTERFACE "${BENCHMARK_LIBCXX_INSTALL}/include"
                                                 INTERFACE "${LIBCXX_SOURCE_DIR}/test/support")
 
 add_library(           cxx-benchmarks-flags-native INTERFACE)