diff options
Diffstat (limited to 'CMake')
| -rw-r--r-- | CMake/AbseilDll.cmake | 16 | ||||
| -rw-r--r-- | CMake/AbseilHelpers.cmake | 12 |
2 files changed, 22 insertions, 6 deletions
diff --git a/CMake/AbseilDll.cmake b/CMake/AbseilDll.cmake index 8184d500..90c9f1f6 100644 --- a/CMake/AbseilDll.cmake +++ b/CMake/AbseilDll.cmake @@ -16,6 +16,7 @@ set(ABSL_INTERNAL_DLL_FILES "base/internal/cycleclock.h" "base/internal/direct_mmap.h" "base/internal/endian.h" + "base/internal/errno_saver.h" "base/internal/exponential_biased.cc" "base/internal/exponential_biased.h" "base/internal/hide_ptr.h" @@ -108,6 +109,8 @@ set(ABSL_INTERNAL_DLL_FILES "debugging/internal/symbolize.h" "debugging/internal/vdso_support.cc" "debugging/internal/vdso_support.h" + "functional/internal/front_binder.h" + "functional/bind_front.h" "functional/function_ref.h" "functional/internal/function_ref.h" "hash/hash.h" @@ -169,18 +172,23 @@ set(ABSL_INTERNAL_DLL_FILES "random/uniform_int_distribution.h" "random/uniform_real_distribution.h" "random/zipf_distribution.h" + "status/status.h" + "status/status.cc" + "status/status_payload_printer.h" + "status/status_payload_printer.cc" "strings/ascii.cc" "strings/ascii.h" "strings/charconv.cc" "strings/charconv.h" + "strings/cord.cc" + "strings/cord.h" "strings/escaping.cc" "strings/escaping.h" + "strings/internal/cord_internal.h" "strings/internal/charconv_bigint.cc" "strings/internal/charconv_bigint.h" "strings/internal/charconv_parse.cc" "strings/internal/charconv_parse.h" - "strings/internal/escaping.cc" - "strings/internal/escaping.h" "strings/internal/stl_type_traits.h" "strings/match.cc" "strings/match.h" @@ -200,6 +208,8 @@ set(ABSL_INTERNAL_DLL_FILES "strings/substitute.cc" "strings/substitute.h" "strings/internal/char_map.h" + "strings/internal/escaping.h" + "strings/internal/escaping.cc" "strings/internal/memutil.cc" "strings/internal/memutil.h" "strings/internal/ostringstream.cc" @@ -308,6 +318,7 @@ set(ABSL_INTERNAL_DLL_TARGETS "memory" "strings" "strings_internal" + "cord" "str_format" "str_format_internal" "pow10_helper" @@ -377,6 +388,7 @@ set(ABSL_INTERNAL_DLL_TARGETS "random_internal_randen_hwaes" "random_internal_randen_hwaes_impl" "random_internal_uniform_helper" + "status" "time" "civil_time" "time_zone" diff --git a/CMake/AbseilHelpers.cmake b/CMake/AbseilHelpers.cmake index 7571ef1b..86ff9eba 100644 --- a/CMake/AbseilHelpers.cmake +++ b/CMake/AbseilHelpers.cmake @@ -108,14 +108,16 @@ function(absl_cc_library) set(ABSL_CC_LIB_IS_INTERFACE 0) endif() - # Determine this build target's relationship to the DLL. It's one of three things: + # Determine this build target's relationship to the DLL. It's one of four things: # 1. "dll" -- This target is part of the DLL # 2. "dll_dep" -- This target is not part of the DLL, but depends on the DLL. # Note that we assume any target not in the DLL depends on the # DLL. This is not a technical necessity but a convenience # which happens to be true, because nearly every target is # part of the DLL. - # 3. "static" -- This target does not depend on the DLL and should be built + # 3. "shared" -- This is a shared library, perhaps on a non-windows platform + # where DLL doesn't make sense. + # 4. "static" -- This target does not depend on the DLL and should be built # statically. if (${ABSL_BUILD_DLL}) absl_internal_dll_contains(TARGET ${_NAME} OUTPUT _in_dll) @@ -127,6 +129,8 @@ function(absl_cc_library) # Building a DLL, but this target is not part of the DLL set(_build_type "dll_dep") endif() + elseif(BUILD_SHARED_LIBS) + set(_build_type "shared") else() set(_build_type "static") endif() @@ -161,8 +165,8 @@ function(absl_cc_library) "${_gtest_link_define}" ) - elseif(${_build_type} STREQUAL "static") - add_library(${_NAME} STATIC "") + elseif(${_build_type} STREQUAL "static" OR ${_build_type} STREQUAL "shared") + add_library(${_NAME} "") target_sources(${_NAME} PRIVATE ${ABSL_CC_LIB_SRCS} ${ABSL_CC_LIB_HDRS}) target_link_libraries(${_NAME} PUBLIC ${ABSL_CC_LIB_DEPS} |