Commit 7e5c339b by Derek Mauro Committed by GitHub

Cherry-picks for Release Candidate 2 (#1727)

cmake: Fix RUNPATH when using BUILD_WITH_INSTALL_RPATH=True
21385900

Add absl_vlog_is_on and vlog_is_on to ABSL_INTERNAL_DLL_TARGETS
9a0743ac
parent ebdba5af
...@@ -486,6 +486,7 @@ endif() ...@@ -486,6 +486,7 @@ endif()
set(ABSL_INTERNAL_DLL_TARGETS set(ABSL_INTERNAL_DLL_TARGETS
"absl_check" "absl_check"
"absl_log" "absl_log"
"absl_vlog_is_on"
"algorithm" "algorithm"
"algorithm_container" "algorithm_container"
"any" "any"
...@@ -643,6 +644,7 @@ set(ABSL_INTERNAL_DLL_TARGETS ...@@ -643,6 +644,7 @@ set(ABSL_INTERNAL_DLL_TARGETS
"utility" "utility"
"variant" "variant"
"vlog_config_internal" "vlog_config_internal"
"vlog_is_on"
) )
if(NOT MSVC) if(NOT MSVC)
......
...@@ -258,6 +258,13 @@ Cflags: -I\${includedir}${PC_CFLAGS}\n") ...@@ -258,6 +258,13 @@ Cflags: -I\${includedir}${PC_CFLAGS}\n")
elseif(_build_type STREQUAL "static" OR _build_type STREQUAL "shared") elseif(_build_type STREQUAL "static" OR _build_type STREQUAL "shared")
add_library(${_NAME} "") add_library(${_NAME} "")
target_sources(${_NAME} PRIVATE ${ABSL_CC_LIB_SRCS} ${ABSL_CC_LIB_HDRS}) 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} target_link_libraries(${_NAME}
PUBLIC ${ABSL_CC_LIB_DEPS} PUBLIC ${ABSL_CC_LIB_DEPS}
PRIVATE PRIVATE
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment