Skip to content

Commit

Permalink
Update third-party for mcrouter
Browse files Browse the repository at this point in the history
Summary: MCRouter has a nice shiny new thing it uses.

Reviewed By: aorenste

Differential Revision: D3759578

fbshipit-source-id: 3a53cccbb6be04605cbb9ba7154bb44fda3d1147
  • Loading branch information
Orvid authored and Hhvm Bot committed Aug 24, 2016
1 parent 27397ee commit 5b6022f
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
12 changes: 6 additions & 6 deletions CMake/HHVMExtensionConfig.cmake
Expand Up @@ -908,15 +908,15 @@ function (HHVM_EXTENSION_INTERNAL_HANDLE_LIBRARY_DEPENDENCY extensionID dependen
/usr/lib
/usr/local/lib
)
IF (PGSQL_INCLUDE_DIR AND PGSQL_LIBRARY)
if(${addPaths})
include_directories(${PGSQL_INCLUDE_DIR})
link_libraries(${PGSQL_LIBRARY})
endif()
else()
IF (NOT PGSQL_INCLUDE_DIR OR NOT PGSQL_LIBRARY)
HHVM_EXTENSION_INTERNAL_SET_FAILED_DEPENDENCY(${extensionID} ${dependencyName})
return()
endif()

if(${addPaths})
include_directories(${PGSQL_INCLUDE_DIR})
link_libraries(${PGSQL_LIBRARY})
endif()
elseif (${libraryName} STREQUAL "png")
find_package(LibPng ${requiredVersion})
if (NOT LIBPNG_INCLUDE_DIRS OR NOT LIBPNG_LIBRARIES)
Expand Down
1 change: 1 addition & 0 deletions hphp/CMakeLists.txt
Expand Up @@ -20,6 +20,7 @@ if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/facebook")
# of hphp/, so we need to pull that one in first if it exists
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.7 FATAL_ERROR)
get_filename_component(HPHP_HOME "${CMAKE_CURRENT_SOURCE_DIR}/.." ABSOLUTE)
set(ENABLE_EXTENSION_PGSQL OFF CACHE INTERNAL "" FORCE)

This comment has been minimized.

Copy link
@simonwelsh

simonwelsh Aug 30, 2016

Contributor

You're missing out :p

This comment has been minimized.

Copy link
@Orvid

Orvid Aug 30, 2016

Author Contributor

We have an ancient version of PGSQL on some of our dev machines, and it gets detected, but can't be built against, because it's so ancient :( This codepath is only ever hit on an in-tree OSS build, which isn't what any of the contbuild systems use. (the contbuild systems all have it forcefully enabled)

set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/facebook/CMake"
"${CMAKE_CURRENT_SOURCE_DIR}/public_tld/CMake"
${CMAKE_MODULE_PATH})
Expand Down
2 changes: 1 addition & 1 deletion third-party
Submodule third-party updated 1 files
+1 −1 mcrouter/src

0 comments on commit 5b6022f

Please sign in to comment.