schtobia/ModernCppStarter
1
0
Fork 0
mirror of https://github.com/TheLartians/ModernCppStarter.git synced 2025-10-31 02:01:33 +01:00
Code Issues Activity

fix cmake-format

Browse source
This commit is contained in:
Michael Unknown 2022-04-12 22:52:25 +02:00
parent d17bae5972
commit c858f9dd23
1 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
standalone/CMakeLists.txt
View file

@ -14,7 +14,8 @@ include(../cmake/tools.cmake)
include(../cmake/CPM.cmake) include(../cmake/CPM.cmake)
# Crow needs Boost 1.64 and does not provide CPM.cmake integration itself, so we have to get Boost first # Crow needs Boost 1.64 and does not provide CPM.cmake integration itself, so we have to get Boost
# first
find_package(Boost 1.64 QUIET) find_package(Boost 1.64 QUIET)
if(NOT Boost_FOUND) if(NOT Boost_FOUND)
# Use CPM.cmake to get Boost from the official repo if not provided as system lib # Use CPM.cmake to get Boost from the official repo if not provided as system lib
@ -25,10 +26,9 @@ if(NOT Boost_FOUND)
GIT_TAG boost-1.78.0 GIT_TAG boost-1.78.0
VERSION 1.78.0 VERSION 1.78.0
) )
# Ugly workaround: # Ugly workaround: Boost cmake support is still experimental, the Boost::boost target is not
# Boost cmake support is still experimental, the Boost::boost target is not provided if downloaded via # provided if downloaded via FetchContent_declare / CPM.cmake. Crow uses it for asio, so we fake
# FetchContent_declare / CPM.cmake # the Boost:boost target as asio
# Crow uses it for asio, so we fake the Boost:boost target as asio
if(NOT TARGET Boost::boost) if(NOT TARGET Boost::boost)
add_library(Boost::boost INTERFACE IMPORTED) add_library(Boost::boost INTERFACE IMPORTED)
target_link_libraries(Boost::boost INTERFACE Boost::asio) target_link_libraries(Boost::boost INTERFACE Boost::asio)
@ -38,17 +38,11 @@ else()
endif() endif()
# add Crow # add Crow
CPMAddPackage( CPMAddPackage(
<<<<<<< HEAD
GITHUB_REPOSITORY jarro2783/cxxopts
VERSION 3.0.0
OPTIONS "CXXOPTS_BUILD_EXAMPLES NO" "CXXOPTS_BUILD_TESTS NO" "CXXOPTS_ENABLE_INSTALL YES"
=======
NAME Crow NAME Crow
GITHUB_REPOSITORY CrowCpp/Crow GITHUB_REPOSITORY CrowCpp/Crow
GIT_TAG v1.0+1 GIT_TAG v1.0+1
VERSION 1.0.1 VERSION 1.0.1
OPTIONS "CROW_INSTALL OFF" OPTIONS "CROW_INSTALL OFF"
>>>>>>> a42d7c5 (add boost, make boost work in docker)
) )
# get the Greeter lib # get the Greeter lib