Skip to content

Fix CMake BUILD_SHARED_LIBS=ON support #601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
afrind wants to merge 1 commit into from
+2 −12
Closed

Fix CMake BUILD_SHARED_LIBS=ON support #601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions cmake/ProxygenFunctions.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,6 +434,8 @@ function(proxygen_resolve_deferred_dependencies)
# link to _obj for include path propagation
if(BUILD_SHARED_LIBS AND _target MATCHES "_obj$" AND TARGET ${_dep}_obj)
list(APPEND _valid_deps ${_dep}_obj)
elseif(BUILD_SHARED_LIBS AND _target MATCHES "_obj$")
# No _obj version exists; skip to avoid cycle through monolithic library
elseif(TARGET ${_dep})
list(APPEND _valid_deps ${_dep})
endif()
Expand Down
12 changes: 0 additions & 12 deletions proxygen/lib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,12 +114,6 @@ proxygen_add_library(proxygen_http_http_common_headers
proxygen-generated
Folly::folly_range
)
target_include_directories(proxygen_http_http_common_headers PUBLIC
$<BUILD_INTERFACE:${PROXYGEN_FBCODE_ROOT}>
$<BUILD_INTERFACE:${PROXYGEN_GENERATED_ROOT}>
$<INSTALL_INTERFACE:include/>
)

proxygen_add_library(proxygen_utils_trace_event_types
SRCS
${PROXYGEN_GENERATED_ROOT}/proxygen/lib/utils/TraceEventType.cpp
Expand All @@ -128,12 +122,6 @@ proxygen_add_library(proxygen_utils_trace_event_types
proxygen-generated
Folly::folly_conv
)
target_include_directories(proxygen_utils_trace_event_types PUBLIC
$<BUILD_INTERFACE:${PROXYGEN_FBCODE_ROOT}>
$<BUILD_INTERFACE:${PROXYGEN_GENERATED_ROOT}>
$<INSTALL_INTERFACE:include/>
)

# Granular library for http_parser
proxygen_add_library(proxygen_external_http_parser
SRCS
Expand Down
Loading