Fix glog vendoring

Author: mszabo-wikia

third-party/fizz/CMakeLists.txt

@@ -68,8 +68,8 @@ ExternalProject_Add(
     "-DBOOST_LIBRARYDIR=${BOOST_LIBRARY_DIR}"
     -DDOUBLE_CONVERSION_INCLUDE_DIR=${DOUBLE_CONVERSION_INCLUDE_DIR}
     -DDOUBLE_CONVERSION_LIBRARY=${DOUBLE_CONVERSION_LIBRARY}
-    -DGLOG_INCLUDE_DIR=${GLOG_INCLUDE_DIR}
-    -DGLOG_LIBRARY=${GLOG_LIBRARY}
+    -DGLOG_INCLUDEDIR=${GLOG_INCLUDE_DIR}
+    -DGLOG_LIBRARYDIR=${GLOG_INSTALL_DIR}/lib
     -DLIBSODIUM_INCLUDEDIR=${LIBSODIUM_INCLUDE_DIR}
     -DLIBSODIUM_LIBRARIES=${LIBSODIUM_LIBRARY}
     -DZSTD_INCLUDE_DIR=${ZSTD_INCLUDE_DIR}

third-party/folly/CMakeLists.txt

@@ -56,8 +56,8 @@ ExternalProject_add(
     -DOPENSSL_CRYPTO_LIBRARY=${OPENSSL_CRYPTO_LIBRARY}
     -DGFLAGS_INCLUDE_DIR=${GFLAGS_INCLUDE_DIR}
     -DGFLAGS_LIBRARY=${GFLAGS_LIBRARY}
-    -DGLOG_INCLUDE_DIR=${GLOG_INCLUDE_DIR}
-    -DGLOG_LIBRARY=glog
+    -DGLOG_INCLUDEDIR=${GLOG_INCLUDE_DIR}
+    -DGLOG_LIBRARYDIR=${GLOG_INSTALL_DIR}/lib
     -DBoost_NO_SYSTEM_PATHS=ON
     -DBoost_NO_BOOST_CMAKE=ON
     -DBoost_USE_STATIC_LIBS=${Boost_USE_STATIC_LIBS}
@@ -68,8 +68,7 @@ ExternalProject_add(
     -DDOUBLE_CONVERSION_LIBRARY=${DOUBLE_CONVERSION_LIBRARY}
     -DFASTFLOAT_INCLUDE_DIR=${FAST_FLOAT_INCLUDE_DIR}
     "-Dfmt_DIR=${fmt_DIR}"
-    -DLIBSODIUM_INCLUDE_DIR=${LIBSODIUM_INCLUDE_DIR}
-    -DLIBSODIUM_LIBRARY=${LIBSODIUM_LIBRARY}
+
     -DZSTD_INCLUDE_DIR=${ZSTD_INCLUDE_DIR}
     -DZSTD_LIBRARY_RELEASE=${ZSTD_LIBRARY}
   BUILD_COMMAND

third-party/thrift/CMakeLists.txt

@@ -48,7 +48,7 @@ ExternalProject_Add(
     -DBoost_INCLUDE_DIR=${BOOST_INCLUDE_DIR}
     "-DBOOST_LIBRARYDIR=${BOOST_LIBRARY_DIR}"
     -DGLOG_INCLUDEDIR=${GLOG_INCLUDE_DIR}
-    -DGLOG_LIBRARYDIR=${GLOG_LIBRARY_DIR}
+    -DGLOG_LIBRARYDIR=${GLOG_INSTALL_DIR}/lib
     "-DZSTD_INCLUDE_DIRS=${ZSTD_INCLUDE_DIR}"
     "-DZSTD_LIBRARIES=${ZSTD_LIBRARY}"
 

third-party/wangle/CMakeLists.txt

@@ -52,8 +52,8 @@ ExternalProject_Add(
     "-DBOOST_LIBRARYDIR=${BOOST_LIBRARY_DIR}"
     -DDOUBLE_CONVERSION_INCLUDE_DIR=${DOUBLE_CONVERSION_INCLUDE_DIR}
     -DDOUBLE_CONVERSION_LIBRARY=${DOUBLE_CONVERSION_LIBRARY}
-    -DGLOG_INCLUDE_DIR=${GLOG_INCLUDE_DIR}
-    -DGLOG_LIBRARY=${GLOG_LIBRARY}
+    -DGLOG_INCLUDEDIR=${GLOG_INCLUDE_DIR}
+    -DGLOG_LIBRARYDIR=${GLOG_INSTALL_DIR}/lib
     -DZSTD_INCLUDE_DIR=${ZSTD_INCLUDE_DIR}
     -DZSTD_LIBRARY_RELEASE=${ZSTD_LIBRARY}
 

third-party/watchman/CMakeLists.txt

@@ -9,6 +9,8 @@ get_target_property(DOUBLE_CONVERSION_INCLUDE_DIR double-conversion INTERFACE_IN
 get_target_property(FMT_INCLUDE_DIR fmt INTERFACE_INCLUDE_DIRECTORIES)
 get_target_property(FOLLY_INCLUDE_DIR folly INTERFACE_INCLUDE_DIRECTORIES)
 get_target_property(JEMALLOC_INCLUDE_DIR jemalloc INTERFACE_INCLUDE_DIRECTORIES)
+get_target_property(GFLAGS_INCLUDE_DIR gflags INTERFACE_INCLUDE_DIRECTORIES)
+get_target_property(GLOG_INCLUDE_DIR glog INTERFACE_INCLUDE_DIRECTORIES)
 
 set(WATCHMAN_DEPS folly boost fmt jemalloc double-conversion)
 
@@ -37,6 +39,7 @@ ExternalProject_Add(
     "-DDOUBLE_CONVERSION_INCLUDE_DIR=${DOUBLE_CONVERSION_INCLUDE_DIR}"
     "-DFMT_INCLUDE_DIR=${FMT_INCLUDE_DIR}"
     "-DFOLLY_INCLUDE_DIR=${FOLLY_INCLUDE_DIR}"
+    "-DGFLAGS_INCLUDE_DIR=${GFLAGS_INCLUDE_DIR}"
     "-DGLOG_INCLUDE_DIR=${GLOG_INCLUDE_DIR}"
     "-DJEMALLOC_INCLUDE_DIR=${JEMALLOC_INCLUDE_DIR}"
     "-DLIBEVENT_INCLUDE_DIR=${LIBEVENT_INCLUDE_DIR}"

third-party/watchman/cppclient-CMakeLists.txt

@@ -29,7 +29,7 @@ add_dependencies(watchmanclient watchmanclient_include_dir_symlink)
 
 target_include_directories(watchmanclient PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/include")
 
-foreach(DEP BOOST DOUBLE_CONVERSION FMT FOLLY GLOG JEMALLOC LIBEVENT OPENSSL)
+foreach(DEP BOOST DOUBLE_CONVERSION FMT FOLLY GFLAGS GLOG JEMALLOC LIBEVENT OPENSSL)
   set("${DEP}_INCLUDE_DIR" "${DEP}_INCLUDE_DIR-notfound" CACHE PATH "Path to ${DEP}'s includes")
   target_include_directories(watchmanclient PRIVATE "${${DEP}_INCLUDE_DIR}")
 endforeach()