Commit b3061cbe authored by Arkady Shapkin's avatar Arkady Shapkin Committed by Facebook Github Bot

Fix static linking gflags and glog

Summary:
gflags and glog require some compile definitions when linking statically
/cc Orvid
Closes https://github.com/facebook/folly/pull/693

Reviewed By: yfeldblum

Differential Revision: D6264382

Pulled By: Orvid

fbshipit-source-id: 60c8af429f10e778d9c313f40227892238829f63
parent d03823c8
...@@ -10,9 +10,23 @@ find_package(Boost 1.55.0 MODULE ...@@ -10,9 +10,23 @@ find_package(Boost 1.55.0 MODULE
thread thread
REQUIRED REQUIRED
) )
find_package(DoubleConversion MODULE REQUIRED) find_package(DoubleConversion MODULE REQUIRED)
find_package(GFlags MODULE REQUIRED)
find_package(GLog MODULE REQUIRED) find_package(gflags CONFIG)
find_package(LibEvent MODULE REQUIRED) if(NOT TARGET gflags)
find_package(GFlags MODULE REQUIRED)
endif()
find_package(glog CONFIG)
if(NOT TARGET glog::glog)
find_package(GLog MODULE REQUIRED)
endif()
find_package(Libevent CONFIG)
if(NOT TARGET event)
find_package(LibEvent MODULE REQUIRED)
endif()
find_package(OpenSSL MODULE REQUIRED) find_package(OpenSSL MODULE REQUIRED)
find_package(PThread MODULE) find_package(PThread MODULE)
...@@ -149,9 +149,36 @@ set(FOLLY_SHINY_DEPENDENCIES ...@@ -149,9 +149,36 @@ set(FOLLY_SHINY_DEPENDENCIES
set(FOLLY_LINK_LIBRARIES set(FOLLY_LINK_LIBRARIES
${DOUBLE_CONVERSION_LIBRARY} ${DOUBLE_CONVERSION_LIBRARY}
${LIBEVENT_LIB} )
${LIBGFLAGS_LIBRARY}
${LIBGLOG_LIBRARY} set(FOLLY_INCLUDE_DIRECTORIES
${DOUBLE_CONVERSION_INCLUDE_DIR}
)
if(TARGET gflags)
set(FOLLY_SHINY_DEPENDENCIES ${FOLLY_SHINY_DEPENDENCIES} gflags)
else()
set(FOLLY_LINK_LIBRARIES ${FOLLY_LINK_LIBRARIES} ${LIBGFLAGS_LIBRARY})
set(FOLLY_INCLUDE_DIRECTORIES ${FOLLY_INCLUDE_DIRECTORIES} ${LIBGFLAGS_INCLUDE_DIR})
endif()
if(TARGET glog::glog)
set(FOLLY_SHINY_DEPENDENCIES ${FOLLY_SHINY_DEPENDENCIES} glog::glog)
else()
set(FOLLY_LINK_LIBRARIES ${FOLLY_LINK_LIBRARIES} ${LIBGLOG_LIBRARY})
set(FOLLY_INCLUDE_DIRECTORIES ${FOLLY_INCLUDE_DIRECTORIES} ${LIBGLOG_INCLUDE_DIR})
endif()
if(TARGET event)
set(FOLLY_SHINY_DEPENDENCIES ${FOLLY_SHINY_DEPENDENCIES} event)
else()
set(FOLLY_LINK_LIBRARIES ${FOLLY_LINK_LIBRARIES} ${LIBEVENT_LIB})
set(FOLLY_INCLUDE_DIRECTORIES ${FOLLY_INCLUDE_DIRECTORIES} ${LIBEVENT_INCLUDE_DIR})
endif()
set(FOLLY_LINK_LIBRARIES
${FOLLY_LINK_LIBRARIES}
Iphlpapi.lib Iphlpapi.lib
Ws2_32.lib Ws2_32.lib
...@@ -160,15 +187,13 @@ set(FOLLY_LINK_LIBRARIES ...@@ -160,15 +187,13 @@ set(FOLLY_LINK_LIBRARIES
target_include_directories(folly_base target_include_directories(folly_base
PUBLIC PUBLIC
${DOUBLE_CONVERSION_INCLUDE_DIR} ${FOLLY_INCLUDE_DIRECTORIES}
${LIBGFLAGS_INCLUDE_DIR}
${LIBGLOG_INCLUDE_DIR}
${LIBEVENT_INCLUDE_DIR}
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
) )
foreach (LIB ${FOLLY_SHINY_DEPENDENCIES}) foreach (LIB ${FOLLY_SHINY_DEPENDENCIES})
target_include_directories(folly_base PUBLIC $<TARGET_PROPERTY:${LIB},INCLUDE_DIRECTORIES>) target_include_directories(folly_base PUBLIC $<TARGET_PROPERTY:${LIB},INCLUDE_DIRECTORIES>)
target_compile_definitions(folly_base PUBLIC $<TARGET_PROPERTY:${LIB},INTERFACE_COMPILE_DEFINITIONS>)
endforeach() endforeach()
if (FOLLY_HAVE_PTHREAD) if (FOLLY_HAVE_PTHREAD)
......
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