wdt now explictly need linking with double-conversion (folly change)

Summary: wdt now explictly need linking with double-conversion (folly change)

Reviewed By: ddrcoder

Differential Revision: D3164303

fb-gh-sync-id: dde86dfe8ac2ad398ce7ddfe37846e0f64b0c219
fbshipit-source-id: dde86dfe8ac2ad398ce7ddfe37846e0f64b0c219

Author: ldemailly

CMakeLists.txt

@@ -118,6 +118,10 @@ include_directories(${Boost_INCLUDE_DIRS})
 # We use std:: threads
 find_package(Threads) # this will set ${CMAKE_THREAD_LIBS_INIT} (ie pthreads)
 
+
+# double-conversion
+find_path(DOUBLECONV_INCLUDE_DIR double-conversion/double-conversion.h)
+find_library(DOUBLECONV_LIBRARY double-conversion)
 # Glog
 find_path(GLOG_INCLUDE_DIR glog/logging.h)
 find_library(GLOG_LIBRARY glog)
@@ -134,6 +138,7 @@ target_link_libraries(wdt_min
   ${GLOG_LIBRARY}
   ${GFLAGS_LIBRARY}
   ${Boost_LIBRARIES}
+  ${DOUBLECONV_LIBRARY}
   ${OPENSSL_CRYPTO_LIBRARY}
   ${CMAKE_THREAD_LIBS_INIT} # Must be last to avoid link errors
 )
@@ -195,12 +200,13 @@ if (NOT FOLLY_HAVE_BITS_FUNCTEXCEPT_H)
 endif()
 
 add_library(folly4wdt ${FOLLY_CPP_SRC})
-target_link_libraries(folly4wdt ${GLOG_LIBRARY})
+target_link_libraries(folly4wdt ${GLOG_LIBRARY} ${DOUBLECONV_LIBRARY})
 
 # Order is important - inside fb we want the above
 # folly-config.h to be picked up instead of the fbcode one
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${FOLLY_SOURCE_DIR})
+include_directories(${DOUBLECONV_INCLUDE_DIR})
 include_directories(${GLOG_INCLUDE_DIR})
 include_directories(${GFLAGS_INCLUDE_DIR})
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)

build/BUILD.md

@@ -56,7 +56,7 @@ and avoid linking errors later or getting a wdt without flags working*
 git clone https://github.com/schuhschuh/gflags.git
 mkdir gflags/build
 cd gflags/build
-cmake -D GFLAGS_NAMESPACE=google -D BUILD_SHARED_LIBS=on ..
+cmake -DGFLAGS_NAMESPACE=google -DBUILD_SHARED_LIBS=on ..
 make -j && sudo make install
 ```
 
@@ -71,7 +71,8 @@ make -j && sudo make install
 *If double-conversion isn't available via apt-get:*
 ```
 git clone https://github.com/floitsch/double-conversion.git
-cd double-conversion; cmake . ; make -j && sudo make install
+cd double-conversion; cmake . -DBUILD_SHARED_LIBS=on
+make -j && sudo make install
 ```
 
 

build/travis_linux.sh

@@ -1,5 +1,6 @@
 #! /bin/bash
-
+# Script to setup the travis build env - changes here are likely needed
+# in wdt_cont_build_setup*.sh too
 set -x
 set -e
 
@@ -32,9 +33,9 @@ $HOME/bin/openssl version
 ldd $HOME/bin/openssl
 export OPENSSL_ROOT_DIR=$HOME
 git clone https://github.com/floitsch/double-conversion.git
-(cd double-conversion; cmake -DCMAKE_INSTALL_PREFIX=$HOME .; make -j 4 && make install)
+(cd double-conversion; cmake -DBUILD_SHARED_LIBS=on -DCMAKE_INSTALL_PREFIX=$HOME .; make -j 4 && make install)
 git clone https://github.com/schuhschuh/gflags.git
-(mkdir gflags/build; cd gflags/build; cmake -DCMAKE_INSTALL_PREFIX=$HOME -D GFLAGS_NAMESPACE=google -D BUILD_SHARED_LIBS=on .. && make -j 4 && make install)
+(mkdir gflags/build; cd gflags/build; cmake -DCMAKE_INSTALL_PREFIX=$HOME -DGFLAGS_NAMESPACE=google -DBUILD_SHARED_LIBS=on .. && make -j 4 && make install)
 svn checkout http://google-glog.googlecode.com/svn/trunk/ glog
 ( cd glog && ./configure --with-gflags=$HOME --prefix=$HOME && make -j 4 && make install )
 git clone https://github.com/facebook/folly.git

build/travis_osx.sh

@@ -1,9 +1,9 @@
 #! /bin/bash
-
+# Sets up MacOS build environment (for travis but can be used on other mac too)
 set -x
 #set -e
 
-date 
+date
 uname -a
 echo $HOSTNAME
 mkdir $HOME/bin || true
@@ -22,13 +22,13 @@ which cmake
 cmake --version
 git clone https://github.com/floitsch/double-conversion.git
 mkdir double-conversion-build
-(cd double-conversion-build; cmake -DCMAKE_INSTALL_PREFIX=$HOME ../double-conversion; make -j 4 && make install)
+(cd double-conversion-build; cmake -DBUILD_SHARED_LIBS=on -DCMAKE_INSTALL_PREFIX=$HOME ../double-conversion; make -j 4 && make install)
 git clone https://github.com/schuhschuh/gflags.git
-(mkdir gflags-build; cd gflags-build; cmake -DCMAKE_INSTALL_PREFIX=$HOME -D GFLAGS_NAMESPACE=google -D BUILD_SHARED_LIBS=on ../gflags && make -j 4 && make install)
+(mkdir gflags-build; cd gflags-build; cmake -DCMAKE_INSTALL_PREFIX=$HOME -DGFLAGS_NAMESPACE=google -DBUILD_SHARED_LIBS=on ../gflags && make -j 4 && make install)
 svn checkout http://google-glog.googlecode.com/svn/trunk/ glog
 ( cd glog && ./configure --with-gflags=$HOME --prefix=$HOME && make -j 4 && make install )
-git clone https://github.com/facebook/folly.git 
-pwd ; ls -l  
+git clone https://github.com/facebook/folly.git
+pwd ; ls -l
 cd wdt
 # to avoid svn clone errors of gmock later:
 ( echo p | svn list https://googlemock.googlecode.com ) || true

build/wdt_cont_build_setup.sh

@@ -1,6 +1,6 @@
 #! /bin/bash
 # A lot of this is facebook specific but can give an idea of how
-# to setup custom tests for WDT
+# to setup custom tests for WDT - Very similar to travis_linux.sh
 # run this once and then _run will run a loop and email results
 set -x
 while sh -c "g++ --version | fgrep 4.4." ; do
@@ -40,9 +40,9 @@ ls -l $BINDIR/cmake
 
 # similar as travis_linux.sh
 git clone https://github.com/floitsch/double-conversion.git
-(cd double-conversion; cmake -DCMAKE_INSTALL_PREFIX=$CDIR .; make -j 16 && make install)
+(cd double-conversion; cmake -DBUILD_SHARED_LIBS=on -DCMAKE_INSTALL_PREFIX=$CDIR .; make -j 16 && make install)
 git clone https://github.com/schuhschuh/gflags.git
-(mkdir gflags/build; cd gflags/build; cmake -DCMAKE_INSTALL_PREFIX=$CDIR -D GFLAGS_NAMESPACE=google -D BUILD_SHARED_LIBS=on .. && make -j 16 && make install)
+(mkdir gflags/build; cd gflags/build; cmake -DCMAKE_INSTALL_PREFIX=$CDIR -DGFLAGS_NAMESPACE=google -DBUILD_SHARED_LIBS=on .. && make -j 16 && make install)
 svn checkout http://google-glog.googlecode.com/svn/trunk/ glog
 ( cd glog && ./configure --with-gflags=$CDIR --prefix=$CDIR && make -j 16 && make install )
 OPENSSL_VERSION=openssl-1.0.1q

build/wdt_cont_build_setup_opensource.sh

@@ -1,4 +1,5 @@
 #! /bin/sh
+# Mac version of wdt_cont_build_setup.sh
 set -x
 set -e
 CDIR=/data/users/${USER}_wdt_contbuild