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

diff --git a/CMake/folly-deps.cmake b/CMake/folly-deps.cmake
index 211c6fbfd969292ddb8fa56465a9c3ae68649174..37cd56f55aeec61deaee3be34a6e15e056e5c763 100755 (executable)
--- a/CMake/folly-deps.cmake
+++ b/CMake/folly-deps.cmake
@@ -10,9 +10,23 @@ find_package(Boost 1.55.0 MODULE
     thread\r
   REQUIRED\r
 )\r
     thread\r
   REQUIRED\r
 )\r

+\r

 find_package(DoubleConversion MODULE REQUIRED)\r
 find_package(DoubleConversion MODULE REQUIRED)\r

-find_package(GFlags MODULE REQUIRED)\r
-find_package(GLog MODULE REQUIRED)\r
-find_package(LibEvent MODULE REQUIRED)\r
+\r
+find_package(gflags CONFIG)\r
+if(NOT TARGET gflags)\r
+  find_package(GFlags MODULE REQUIRED)\r
+endif()\r
+\r
+find_package(glog CONFIG)\r
+if(NOT TARGET glog::glog)\r
+  find_package(GLog MODULE REQUIRED)\r
+endif()\r
+\r
+find_package(Libevent CONFIG)\r
+if(NOT TARGET event)\r
+  find_package(LibEvent MODULE REQUIRED)\r
+endif()\r
+\r

 find_package(OpenSSL MODULE REQUIRED)\r
 find_package(PThread MODULE)\r
 find_package(OpenSSL MODULE REQUIRED)\r
 find_package(PThread MODULE)\r

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 371529741739aa888d0abd38d3f02b7efe7d60d2..d390f06183f75e9a1b80b669a7844ecfb837388f 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -149,9 +149,36 @@ set(FOLLY_SHINY_DEPENDENCIES
 
 set(FOLLY_LINK_LIBRARIES
   ${DOUBLE_CONVERSION_LIBRARY}
 
 set(FOLLY_LINK_LIBRARIES
   ${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
   Ws2_32.lib
 
   Iphlpapi.lib
   Ws2_32.lib
 


@@ -160,15 +187,13 @@ set(FOLLY_LINK_LIBRARIES
 
 target_include_directories(folly_base
   PUBLIC
 
 target_include_directories(folly_base
   PUBLIC

-    ${DOUBLE_CONVERSION_INCLUDE_DIR}
-    ${LIBGFLAGS_INCLUDE_DIR}
-    ${LIBGLOG_INCLUDE_DIR}
-    ${LIBEVENT_INCLUDE_DIR}
+    ${FOLLY_INCLUDE_DIRECTORIES}

     $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
 )
 
 foreach (LIB ${FOLLY_SHINY_DEPENDENCIES})
   target_include_directories(folly_base PUBLIC $<TARGET_PROPERTY:${LIB},INCLUDE_DIRECTORIES>)
     $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
 )
 
 foreach (LIB ${FOLLY_SHINY_DEPENDENCIES})
   target_include_directories(folly_base PUBLIC $<TARGET_PROPERTY:${LIB},INCLUDE_DIRECTORIES>)

+  target_compile_definitions(folly_base PUBLIC $<TARGET_PROPERTY:${LIB},INTERFACE_COMPILE_DEFINITIONS>)

 endforeach()
 
 if (FOLLY_HAVE_PTHREAD)
 endforeach()
 
 if (FOLLY_HAVE_PTHREAD)