Skip to content

Commit

Permalink
Merge pull request #24 from William-Mou/wmou/cmake-dependencies
Browse files Browse the repository at this point in the history
Improve the syntax in CMake file
  • Loading branch information
mcopik authored Mar 25, 2023
2 parents bd27b57 + 3d8a4be commit 23bb980
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

cmake_minimum_required(VERSION 3.11)
cmake_minimum_required(VERSION 3.14)
include(FetchContent)
project(serverless-rdma)
set (CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_CURRENT_SOURCE_DIR}/cmake")
Expand Down
6 changes: 0 additions & 6 deletions cmake/dependencies.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ if(NOT cxxopts_FOUND)
GIT_REPOSITORY https://github.com/jarro2783/cxxopts.git
CMAKE_ARGS -DCXXOPTS_BUILD_EXAMPLES=Off -DCXXOPTS_BUILD_TESTS=Off
)
FetchContent_Populate(cxxopts)
FetchContent_MakeAvailable(cxxopts)
add_subdirectory(${cxxopts_SOURCE_DIR} ${cxxopts_BINARY_DIR})
endif()

###
Expand All @@ -27,9 +25,7 @@ if(NOT spdlog_FOUND)
# default branch is v1.x - for some reason, cmake switches to master
GIT_TAG v1.8.0
)
FetchContent_Populate(spdlog)
FetchContent_MakeAvailable(spdlog)
add_subdirectory(${spdlog_SOURCE_DIR} ${spdlog_BINARY_DIR})
else()
add_custom_target(spdlog)
endif()
Expand All @@ -50,9 +46,7 @@ if(NOT cereal_FOUND)
set(SKIP_PERFORMANCE_COMPARISON ON CACHE INTERNAL "")
set(SKIP_PORTABILITY_TEST ON CACHE INTERNAL "")
set(JUST_INSTALL_CEREAL ON CACHE INTERNAL "")
FetchContent_Populate(cereal)
FetchContent_MakeAvailable(cereal)
add_subdirectory(${cereal_SOURCE_DIR} ${cereal_BINARY_DIR})
endif()

###
Expand Down

0 comments on commit 23bb980

Please sign in to comment.