diff --git a/CMake/AbseilDll.cmake b/CMake/AbseilDll.cmake index 240936341bf..32cc28fb31c 100644 --- a/CMake/AbseilDll.cmake +++ b/CMake/AbseilDll.cmake @@ -486,6 +486,7 @@ endif() set(ABSL_INTERNAL_DLL_TARGETS "absl_check" "absl_log" + "absl_vlog_is_on" "algorithm" "algorithm_container" "any" @@ -643,6 +644,7 @@ set(ABSL_INTERNAL_DLL_TARGETS "utility" "variant" "vlog_config_internal" + "vlog_is_on" ) if(NOT MSVC) diff --git a/CMake/AbseilHelpers.cmake b/CMake/AbseilHelpers.cmake index 70a37f115e9..b177e59025e 100644 --- a/CMake/AbseilHelpers.cmake +++ b/CMake/AbseilHelpers.cmake @@ -258,6 +258,13 @@ Cflags: -I\${includedir}${PC_CFLAGS}\n") 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}) + if(APPLE) + set_target_properties(${_NAME} PROPERTIES + INSTALL_RPATH "@loader_path") + elseif(UNIX) + set_target_properties(${_NAME} PROPERTIES + INSTALL_RPATH "$ORIGIN") + endif() target_link_libraries(${_NAME} PUBLIC ${ABSL_CC_LIB_DEPS} PRIVATE