Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat cmake: add download_userver() #80

Open
wants to merge 6 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ jobs:

- name: Install packages
run: |
(cd third_party && git clone -b develop --single-branch --depth 1 https://github.com/userver-framework/userver.git)
make cmake-debug || :
sudo apt update
sudo apt install --allow-downgrades -y $(cat third_party/userver/scripts/docs/en/deps/${{matrix.os}}.md | tr '\n' ' ')
sudo apt install --allow-downgrades -y $(cat build_debug/_deps/userver-src/scripts/docs/en/deps/${{matrix.os}}.md | tr '\n' ' ')
python3 -m pip install -r requirements.txt

- name: Setup ccache
Expand Down
18 changes: 5 additions & 13 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,21 +1,13 @@
cmake_minimum_required(VERSION 3.12)
project(service_template CXX)

list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
include(DownloadUserver)

# Adding userver dependency
find_package(userver COMPONENTS core postgresql QUIET)
if(NOT userver_FOUND) # Fallback to subdirectory usage
# Compatibility mode: some systems don't support these features
set(USERVER_FEATURE_CRYPTOPP_BLAKE2 OFF CACHE BOOL "" FORCE)
set(USERVER_FEATURE_GRPC_CHANNELZ OFF CACHE BOOL "" FORCE)
set(USERVER_FEATURE_REDIS_HI_MALLOC ON CACHE BOOL "" FORCE)

if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/userver)
message(STATUS "Using userver framework from third_party/userver")
add_subdirectory(third_party/userver)
else()
message(FATAL_ERROR "Either install the userver or provide a path to it")
endif()
if(NOT userver_FOUND)
# download_userver() tries TRY_DIR first, fallbacks to downloading userver from github
download_userver(TRY_DIR third_party/userver)
endif()

userver_setup_environment()
Expand Down
50 changes: 50 additions & 0 deletions cmake/DownloadUserver.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
# Copied from get_cpm.cmake
set(CPM_DOWNLOAD_VERSION 0.39.0)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

current version is 0.40.2

set(CPM_HASH_SUM "66639bcac9dd2907b2918de466783554c1334446b9874e90d38e3778d404c2ef")
set(CPM_DOWNLOAD_LOCATION "${CMAKE_BINARY_DIR}/cmake/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
file(DOWNLOAD
https://github.com/cpm-cmake/CPM.cmake/releases/download/v${CPM_DOWNLOAD_VERSION}/CPM.cmake
${CPM_DOWNLOAD_LOCATION} EXPECTED_HASH SHA256=${CPM_HASH_SUM}
)
include(${CPM_DOWNLOAD_LOCATION})


function(download_userver)
set(OPTIONS)
set(ONE_VALUE_ARGS VERSION TRY_DIR)
set(MULTI_VALUE_ARGS FEATURES FEATURES_OFF)
cmake_parse_arguments(
ARG "${OPTIONS}" "${ONE_VALUE_ARGS}" "${MULTI_VALUE_ARGS}" ${ARGN}
)
if(NOT ARG_VERSION)
set(ARG_VERSION develop)
endif()

if(ARG_TRY_DIR AND EXISTS ${ARG_TRY_DIR})
foreach(FEATURE ${ARG_FEATURES})
set(USERVER_FEATURE_${FEATURE} ON CACHE BOOL "" FORCE)
endforeach()
foreach(FEATURE ${ARG_FEATURES_OFF})
set(USERVER_FEATURE_${FEATURE} OFF CACHE BOOL "" FORCE)
endforeach()

message(STATUS "Using userver from ${ARG_TRY_DIR}")
add_subdirectory(${ARG_TRY_DIR})
return()
endif()

set(CMAKE_OPTIONS "USERVER_IS_THE_ROOT_PROJECT OFF")
foreach(FEATURE ${ARG_FEATURES})
list(APPEND CMAKE_OPTIONS "USERVER_FEATURE_${FEATURE} ON")
endforeach()
foreach(FEATURE ${ARG_FEATURES_OFF})
list(APPEND CMAKE_OPTIONS "USERVER_FEATURE_${FEATURE} OFF")
endforeach()

CPMAddPackage(
NAME userver
GITHUB_REPOSITORY userver-framework/userver
GIT_TAG ${ARG_VERSION}
OPTIONS ${CMAKE_OPTIONS}
)
endfunction()
11 changes: 0 additions & 11 deletions third_party/Readme.md

This file was deleted.