diff --git a/hphp/third_party/folly/CMakeLists.txt b/hphp/third_party/folly/CMakeLists.txt index 1027e7fd4..1b0c38e93 100644 --- a/hphp/third_party/folly/CMakeLists.txt +++ b/hphp/third_party/folly/CMakeLists.txt @@ -15,4 +15,10 @@ find_package(Boost 1.48.0 COMPONENTS system program_options filesystem regex REQ include_directories(${Boost_INCLUDE_DIRS}) link_directories(${Boost_LIBRARY_DIRS}) -target_link_libraries(folly ${Boost_LIBRARIES}) +find_package(Glog REQUIRED) +include_directories(${LIBGLOG_INCLUDE_DIR}) + +find_package(PThread REQUIRED) +include_directories(${LIBPTHREAD_INCLUDE_DIRS}) + +target_link_libraries(folly ${Boost_LIBRARIES} ${LIBGLOG_LIBRARY} ${LIBPTHREAD_LIBRARIES}) diff --git a/hphp/tools/gen-ext-hhvm/CMakeLists.txt b/hphp/tools/gen-ext-hhvm/CMakeLists.txt index 023cb945d..49bb1d913 100644 --- a/hphp/tools/gen-ext-hhvm/CMakeLists.txt +++ b/hphp/tools/gen-ext-hhvm/CMakeLists.txt @@ -1,5 +1,5 @@ add_executable(gen-ext-hhvm "gen-ext-hhvm.cpp" "idl.cpp") -target_link_libraries(gen-ext-hhvm folly ${LIBGLOG_LIBRARY} double-conversion) +target_link_libraries(gen-ext-hhvm folly ${LIBGLOG_LIBRARY} double-conversion ${LIBPTHREAD_LIBRARIES} ${DL_LIB}) add_executable(gen-infotabs "gen-infotabs.cpp" "idl.cpp") -target_link_libraries(gen-infotabs folly ${LIBGLOG_LIBRARY} double-conversion) +target_link_libraries(gen-infotabs folly ${LIBGLOG_LIBRARY} double-conversion ${LIBPTHREAD_LIBRARIES} ${DL_LIB})