Skip to content

Commit 7e5c339

Browse files
authored
Cherry-picks for Release Candidate 2 (#1727)
cmake: Fix RUNPATH when using BUILD_WITH_INSTALL_RPATH=True 2138590 Add absl_vlog_is_on and vlog_is_on to ABSL_INTERNAL_DLL_TARGETS 9a0743a
1 parent ebdba5a commit 7e5c339

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

CMake/AbseilDll.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -486,6 +486,7 @@ endif()
486486
set(ABSL_INTERNAL_DLL_TARGETS
487487
"absl_check"
488488
"absl_log"
489+
"absl_vlog_is_on"
489490
"algorithm"
490491
"algorithm_container"
491492
"any"
@@ -643,6 +644,7 @@ set(ABSL_INTERNAL_DLL_TARGETS
643644
"utility"
644645
"variant"
645646
"vlog_config_internal"
647+
"vlog_is_on"
646648
)
647649

648650
if(NOT MSVC)

CMake/AbseilHelpers.cmake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,13 @@ Cflags: -I\${includedir}${PC_CFLAGS}\n")
258258
elseif(_build_type STREQUAL "static" OR _build_type STREQUAL "shared")
259259
add_library(${_NAME} "")
260260
target_sources(${_NAME} PRIVATE ${ABSL_CC_LIB_SRCS} ${ABSL_CC_LIB_HDRS})
261+
if(APPLE)
262+
set_target_properties(${_NAME} PROPERTIES
263+
INSTALL_RPATH "@loader_path")
264+
elseif(UNIX)
265+
set_target_properties(${_NAME} PROPERTIES
266+
INSTALL_RPATH "$ORIGIN")
267+
endif()
261268
target_link_libraries(${_NAME}
262269
PUBLIC ${ABSL_CC_LIB_DEPS}
263270
PRIVATE

0 commit comments

Comments
 (0)