maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use target_sources and remove one non-existent file

Browse source
This commit is contained in:
Loo Rong Jie 2018-10-11 17:20:05 +08:00
parent f59e0f1d08
commit dadcd56b4b
2 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
CMake/AbseilHelpers.cmake
View file

@ -129,16 +129,15 @@ function(absl_cc_library)
endif() endif()
# Check if this is a header-only library # Check if this is a header-only library
if (ABSL_CC_LIB_SRCS) if ("${ABSL_CC_LIB_SRCS}" STREQUAL "")
set(_SRCS ${ABSL_CC_LIB_SRCS}) set(ABSL_CC_LIB_IS_INTERFACE 1)
list(FILTER _SRCS INCLUDE REGEX "\.cc$")
list(LENGTH _SRCS ABSL_CC_LIB_SRCS_LEN)
else() else()
set(ABSL_CC_LIB_SRCS_LEN 0) set(ABSL_CC_LIB_IS_INTERFACE 0)
endif() endif()
if(ABSL_CC_LIB_SRCS_LEN) if(NOT ABSL_CC_LIB_IS_INTERFACE)
add_library(${_NAME} STATIC ${ABSL_CC_LIB_SRCS} ${ABSL_CC_LIB_HDRS}) add_library(${_NAME} STATIC "")
target_sources(${_NAME} PRIVATE ${ABSL_CC_LIB_SRCS} ${ABSL_CC_LIB_HDRS})
target_include_directories(${_NAME} target_include_directories(${_NAME}
PUBLIC ${ABSL_COMMON_INCLUDE_DIRS}) PUBLIC ${ABSL_COMMON_INCLUDE_DIRS})
# TODO(rongjiecomputer): Revisit ABSL_COMPILE_CXXFLAGS when fixing GH#123 # TODO(rongjiecomputer): Revisit ABSL_COMPILE_CXXFLAGS when fixing GH#123

1
absl/strings/CMakeLists.txt
View file

@ -32,7 +32,6 @@ list(APPEND STRINGS_PUBLIC_HEADERS
list(APPEND STRINGS_INTERNAL_HEADERS list(APPEND STRINGS_INTERNAL_HEADERS
"internal/bits.h"
"internal/char_map.h" "internal/char_map.h"
"internal/charconv_bigint.h" "internal/charconv_bigint.h"
"internal/charconv_parse.h" "internal/charconv_parse.h"