From dcbfb6f8735a517f7142779ac7c804607f65d7a9 Mon Sep 17 00:00:00 2001 From: Petr Hosek Date: Thu, 29 Apr 2021 10:11:39 -0700 Subject: [PATCH] [libcxx] Use joined format for include flag on Windows Without this, CMake deduplicates the /I flag breaking the build. See https://cmake.org/cmake/help/v3.13/command/target_compile_options.html for more details on why this is needed. Differential Revision: https://reviews.llvm.org/D101550 --- libcxx/include/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libcxx/include/CMakeLists.txt b/libcxx/include/CMakeLists.txt index 18fec97e5185..79981c59b870 100644 --- a/libcxx/include/CMakeLists.txt +++ b/libcxx/include/CMakeLists.txt @@ -231,8 +231,8 @@ add_library(cxx-headers INTERFACE) add_dependencies(cxx-headers generate-cxx-headers ${LIBCXX_CXX_ABI_HEADER_TARGET}) # TODO: Use target_include_directories once we figure out why that breaks the runtimes build if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC" OR "${CMAKE_CXX_SIMULATE_ID}" STREQUAL "MSVC") - target_compile_options(cxx-headers INTERFACE /I "${LIBCXX_GENERATED_INCLUDE_DIR}" - INTERFACE /I "${LIBCXX_GENERATED_INCLUDE_TARGET_DIR}") + target_compile_options(cxx-headers INTERFACE /I${LIBCXX_GENERATED_INCLUDE_DIR} + INTERFACE /I${LIBCXX_GENERATED_INCLUDE_TARGET_DIR}) else() target_compile_options(cxx-headers INTERFACE -I${LIBCXX_GENERATED_INCLUDE_DIR} INTERFACE -I${LIBCXX_GENERATED_INCLUDE_TARGET_DIR})