Commit ff841386 authored by Caleb Marchent's avatar Caleb Marchent Committed by Facebook Github Bot

Include folly_pic in the opensource installed targets

Summary: Pull Request resolved: https://github.com/facebook/folly/pull/1006

Reviewed By: Orvid

Differential Revision: D13782299

Pulled By: calebmarchent

fbshipit-source-id: 7662c67a18c10a04d8d68e3f729da81c6df38336
parent 6db47e87
...@@ -219,6 +219,8 @@ target_compile_definitions(folly_base ...@@ -219,6 +219,8 @@ target_compile_definitions(folly_base
$<TARGET_PROPERTY:folly_deps,INTERFACE_COMPILE_DEFINITIONS> $<TARGET_PROPERTY:folly_deps,INTERFACE_COMPILE_DEFINITIONS>
) )
set(FOLLY_INSTALL_TARGETS folly folly_deps)
option(PYTHON_EXTENSIONS "Build Python Bindings for Folly, requires Cython" OFF) option(PYTHON_EXTENSIONS "Build Python Bindings for Folly, requires Cython" OFF)
if (PYTHON_EXTENSIONS) if (PYTHON_EXTENSIONS)
# Compile folly such that it can be linked in to a shared library # Compile folly such that it can be linked in to a shared library
...@@ -236,6 +238,7 @@ if (PYTHON_EXTENSIONS) ...@@ -236,6 +238,7 @@ if (PYTHON_EXTENSIONS)
$<TARGET_PROPERTY:folly_deps,INTERFACE_COMPILE_DEFINITIONS> $<TARGET_PROPERTY:folly_deps,INTERFACE_COMPILE_DEFINITIONS>
) )
set_target_properties(folly_pic PROPERTIES POSITION_INDEPENDENT_CODE True) set_target_properties(folly_pic PROPERTIES POSITION_INDEPENDENT_CODE True)
list(APPEND FOLLY_INSTALL_TARGETS folly_pic)
endif () endif ()
add_library(folly add_library(folly
...@@ -245,7 +248,8 @@ apply_folly_compile_options_to_target(folly) ...@@ -245,7 +248,8 @@ apply_folly_compile_options_to_target(folly)
target_link_libraries(folly PUBLIC folly_deps) target_link_libraries(folly PUBLIC folly_deps)
install(TARGETS folly folly_deps
install(TARGETS ${FOLLY_INSTALL_TARGETS}
EXPORT folly EXPORT folly
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
LIBRARY DESTINATION ${LIB_INSTALL_DIR} LIBRARY DESTINATION ${LIB_INSTALL_DIR}
......
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