TheCloud/dwarfs
1
0
Fork 0
mirror of https://github.com/mhx/dwarfs.git synced 2025-09-10 04:50:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

build: more CMake cleanups

Browse Source
This commit is contained in:
Marcus Holland-Moritz 2024-05-15 17:33:46 +02:00
parent 8e963e43fa
commit b8936a7ce8
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -504,7 +504,7 @@ add_library(folly_light
set_property(TARGET folly_light PROPERTY CXX_STANDARD 20) set_property(TARGET folly_light PROPERTY CXX_STANDARD 20)
target_include_directories( target_include_directories(
folly_light SYSTEM PRIVATE folly_light SYSTEM PUBLIC
${CMAKE_CURRENT_BINARY_DIR}/folly ${CMAKE_CURRENT_BINARY_DIR}/folly
${CMAKE_CURRENT_SOURCE_DIR}/folly ${CMAKE_CURRENT_SOURCE_DIR}/folly
) )
@ -552,11 +552,6 @@ endif()
add_library(follybenchmark_lite ${FOLLY_BENCHMARK_LITE_SRC}) add_library(follybenchmark_lite ${FOLLY_BENCHMARK_LITE_SRC})
set_property(TARGET follybenchmark_lite PROPERTY CXX_STANDARD 20) set_property(TARGET follybenchmark_lite PROPERTY CXX_STANDARD 20)
target_include_directories(
follybenchmark_lite SYSTEM PRIVATE
${CMAKE_CURRENT_BINARY_DIR}/folly
${CMAKE_CURRENT_SOURCE_DIR}/folly
)
apply_folly_compile_options_to_target(follybenchmark_lite) apply_folly_compile_options_to_target(follybenchmark_lite)
target_link_libraries(follybenchmark_lite folly_light) target_link_libraries(follybenchmark_lite folly_light)
@ -1021,7 +1016,7 @@ add_library(
set_property(TARGET thrift_light PROPERTY CXX_STANDARD 20) set_property(TARGET thrift_light PROPERTY CXX_STANDARD 20)
target_link_libraries(thrift_light folly_light) target_link_libraries(thrift_light folly_light)
target_include_directories(thrift_light SYSTEM PRIVATE target_include_directories(thrift_light SYSTEM PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/fbthrift ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift
${THRIFT_GENERATED_DIR} ${THRIFT_GENERATED_DIR}
) )

2
cmake/thrift_library.cmake
View File

@ -135,9 +135,7 @@ function(add_cpp2_thrift_library idlfile)
add_library(${_THRIFT_TARGET} ${_THRIFT_LIB_SRC}) add_library(${_THRIFT_TARGET} ${_THRIFT_LIB_SRC})
target_include_directories(${_THRIFT_TARGET} PUBLIC target_include_directories(${_THRIFT_TARGET} PUBLIC
${CMAKE_CURRENT_BINARY_DIR}/thrift ${CMAKE_CURRENT_BINARY_DIR}/thrift
${CMAKE_CURRENT_SOURCE_DIR}/fbthrift
${_THRIFT_GENERATED_DIR}/thrift ${_THRIFT_GENERATED_DIR}/thrift
${_THRIFT_GENERATED_DIR}
) )
target_link_libraries(${_THRIFT_TARGET} PUBLIC thrift_light) target_link_libraries(${_THRIFT_TARGET} PUBLIC thrift_light)
if(NOT WIN32) if(NOT WIN32)