From f70acba7048729cf3306d2b0db1257038845cfe2 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Sun, 7 Aug 2022 20:04:02 -0400 Subject: [PATCH] Added vcpkg --- .gitmodules | 3 +++ 3rdparty/vcpkg | 1 + CMakeLists.txt | 29 ++++++++++++++++++++++------- 3 files changed, 26 insertions(+), 7 deletions(-) create mode 160000 3rdparty/vcpkg diff --git a/.gitmodules b/.gitmodules index e69de29..90e3bc2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "3rdparty/vcpkg"] + path = 3rdparty/vcpkg + url = https://github.com/microsoft/vcpkg diff --git a/3rdparty/vcpkg b/3rdparty/vcpkg new file mode 160000 index 0000000..9b22b40 --- /dev/null +++ b/3rdparty/vcpkg @@ -0,0 +1 @@ +Subproject commit 9b22b40c6c61bf0da2d46346dd44a11e90972cc9 diff --git a/CMakeLists.txt b/CMakeLists.txt index eceaa09..edcd7ff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,20 @@ cmake_minimum_required(VERSION 3.23.3) +set(VCPKG_ROOT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/icarus/3rdparty/vcpkg) + +message("The vcpkg root path ${VCPKG_ROOT_PATH}") + +if(NOT DEFINED CMAKE_TOOLCHAIN_FILE) + set(TOOLCHAIN_PATH ${VCPKG_ROOT_PATH}/scripts/buildsystems/vcpkg.cmake) + + set(CMAKE_TOOLCHAIN_FILE + "${TOOLCHAIN_PATH}" + CACHE STRING "Vcpkg toolchain file") + + message("Using default toolchain file") +endif() + + set(SOFTWARE_DESCRIPTION "A music streaming Web API that provides a way for users to stream their personal music collection") set(SOFTWARE_VERSION @@ -77,18 +92,18 @@ set(IDM_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include") # conan -set(CONAN_BUILDINFO -${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) +# set(CONAN_BUILDINFO +# ${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) -message("conan build info ${CONAN_BUILDINFO}") -include(${CONAN_BUILDINFO}) -conan_basic_setup() +# message("conan build info ${CONAN_BUILDINFO}") +# include(${CONAN_BUILDINFO}) +# conan_basic_setup() -include_directories(${CPR_INCLUDE_DIRS} ${IDM_INCLUDE_DIR}) +# include_directories(${CPR_INCLUDE_DIRS} ${IDM_INCLUDE_DIR}) set(USE_SYSTEM_CURL OFF) set(BUILD_CPR_TESTS OFF) add_executable(icd ${SOURCES}) -target_link_libraries(icd PUBLIC ${CONAN_LIBS}) +# target_link_libraries(icd PUBLIC ${CONAN_LIBS})