OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

[libc++] Improve CMake include directory search. 

This patch has been tested in D70631, but it should be reviewed
separately.

Reviewed By: ldionne, #libc

Differential Revision: https://reviews.llvm.org/D114248
This commit is contained in:
Mark de Wever 2021-11-19 16:43:27 +01:00
parent ffc32efd1c
commit cc9fdedba7
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libcxx/src/CMakeLists.txt
View File

@ -197,6 +197,7 @@ split_list(LIBCXX_LINK_FLAGS)
# Build the shared library. # Build the shared library.
if (LIBCXX_ENABLE_SHARED) if (LIBCXX_ENABLE_SHARED)
add_library(cxx_shared SHARED ${exclude_from_all} ${LIBCXX_SOURCES} ${LIBCXX_HEADERS}) add_library(cxx_shared SHARED ${exclude_from_all} ${LIBCXX_SOURCES} ${LIBCXX_HEADERS})
target_include_directories(cxx_shared PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries(cxx_shared PUBLIC cxx-headers target_link_libraries(cxx_shared PUBLIC cxx-headers
PRIVATE ${LIBCXX_LIBRARIES}) PRIVATE ${LIBCXX_LIBRARIES})
set_target_properties(cxx_shared set_target_properties(cxx_shared
@ -275,6 +276,7 @@ set(CMAKE_STATIC_LIBRARY_PREFIX "lib")
# Build the static library. # Build the static library.
if (LIBCXX_ENABLE_STATIC) if (LIBCXX_ENABLE_STATIC)
add_library(cxx_static STATIC ${exclude_from_all} ${LIBCXX_SOURCES} ${LIBCXX_HEADERS}) add_library(cxx_static STATIC ${exclude_from_all} ${LIBCXX_SOURCES} ${LIBCXX_HEADERS})
target_include_directories(cxx_static PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries(cxx_static PUBLIC cxx-headers target_link_libraries(cxx_static PUBLIC cxx-headers
PRIVATE ${LIBCXX_LIBRARIES}) PRIVATE ${LIBCXX_LIBRARIES})
set_target_properties(cxx_static set_target_properties(cxx_static