Skip to content

Commit b8df506

Browse files
wezfacebook-github-bot
authored andcommitted
rsocket: cmake: remove local copy of FindGlog FindGflags
Summary: The shipit config will pull in the shared copy of this logic from `fbcode/opensource/fbcode_builder/CMake` Reviewed By: calebmarchent Differential Revision: D14589667 fbshipit-source-id: 9b34c854d785d83a368662cb5aea6be064f0781b
1 parent 542a550 commit b8df506

File tree

4 files changed

+12
-71
lines changed

4 files changed

+12
-71
lines changed

CMakeLists.txt

+6-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,12 @@ cmake_minimum_required(VERSION 3.2)
33
project(ReactiveSocket)
44

55
# CMake modules.
6-
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/")
6+
set(CMAKE_MODULE_PATH
7+
"${CMAKE_SOURCE_DIR}/cmake/"
8+
# For shipit-transformed builds
9+
"${CMAKE_CURRENT_SOURCE_DIR}/build/fbcode_builder/CMake"
10+
${CMAKE_MODULE_PATH}
11+
)
712

813
# Joins arguments and stores the result in ${var}.
914
function(join var)

cmake/FindGflags.cmake

-35
This file was deleted.

cmake/FindGlog.cmake

-34
This file was deleted.

yarpl/CMakeLists.txt

+6-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@ cmake_minimum_required (VERSION 3.2)
22
project (yarpl)
33

44
# CMake Config
5-
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/)
5+
set(CMAKE_MODULE_PATH
6+
${CMAKE_CURRENT_SOURCE_DIR}/../cmake/
7+
# For shipit-transformed builds
8+
"${CMAKE_CURRENT_SOURCE_DIR}/../build/fbcode_builder/CMake"
9+
${CMAKE_MODULE_PATH}
10+
)
611

712
add_definitions(-std=c++14)
813
option(BUILD_TESTS "BUILD_TESTS" ON)

0 commit comments

Comments
 (0)