diff options
| author |  Derek Mauro <761129+derekmauro@users.noreply.github.com> | 2024-07-25 15:28:46 -0400 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2024-07-25 15:28:46 -0400 |
| commit | 7e5c339b1aa790ae03cc614a8d7626d5b4831891 (patch) | |
| tree | 80928622c72bbac48c5776a01ca210a1c3c45f61 | |
| parent | ebdba5af75fab91ebe9bc4daa0077f9c57c36692 (diff) | |
Cherry-picks for Release Candidate 2 (#1727)20240722.rc2
cmake: Fix RUNPATH when using BUILD_WITH_INSTALL_RPATH=True
21385900073e3ca2c4aefb13fd05ca2da40d5ff1
Add absl_vlog_is_on and vlog_is_on to ABSL_INTERNAL_DLL_TARGETS
9a0743ac27df5ec018974e605cf61db7652b26c1
| -rw-r--r-- | CMake/AbseilDll.cmake | 2 | ||||
| -rw-r--r-- | CMake/AbseilHelpers.cmake | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/CMake/AbseilDll.cmake b/CMake/AbseilDll.cmake index 24093634..32cc28fb 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 70a37f11..b177e590 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 |