VCPKG changes

lindkvis · Jun 11, 2024 · d4c33aa · d4c33aa
1 parent 003321e
commit d4c33aa
Show file tree

Hide file tree

Showing 11 changed files with 43 additions and 24 deletions.
diff --git a/.github/workflows/AppFwkUnitTestWin.yml b/.github/workflows/AppFwkUnitTestWin.yml
@@ -11,6 +11,9 @@ jobs:
         include:
           - os: windows-latest
             triplet: x64-windows
+    env:
+      VCPKG_ROOT: ${{ github.workspace }}/ThirdParty/vcpkg
+      VCPKG_DEFAULT_TRIPLET: ${{ matrix.triplet }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4

diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "ThirdParty/json"]
-	path = ThirdParty/json
-	url = https://github.com/nlohmann/json.git
 [submodule "ThirdParty/stduuid"]
 	path = ThirdParty/stduuid
 	url = https://github.com/mariusbancila/stduuid.git
@@ -17,3 +14,6 @@
 [submodule "ThirdParty/gtest"]
 	path = ThirdParty/gtest
 	url = https://github.com/google/googletest.git
+[submodule "ThirdParty/vcpkg"]
+	path = ThirdParty/vcpkg
+	url = https://github.com/microsoft/vcpkg.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -16,7 +16,7 @@ set(CMAKE_CXX_STANDARD 20)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/scripts")
 
-option(CAFFA_REST_INTERFACE "Enable the REST API interface to the Project Data Model" OFF)
+option(CAFFA_REST_INTERFACE "Enable the REST API interface to the Project Data Model" ON)
 option(CAFFA_BUILD_EXAMPLES "Build examples" OFF)
 option(CAFFA_BUILD_UNIT_TESTS "Build unit tests" ON)
 option(CAFFA_BUILD_DOCS "Build Doxygen documentation" OFF)
@@ -46,30 +46,13 @@ else()
 endif()
 
 add_definitions(-DGTEST_HAS_STD_WSTRING=0)
-# Third Party libraries
-set(JSON_BuildTests
-    OFF
-    CACHE INTERNAL "Build Json library with unit tests")
-set(JSON_Coverage
-    OFF
-    CACHE INTERNAL "Build Json library with coverage tests")
-set(JSON_Install
-    OFF
-    CACHE INTERNAL "Add install step to json library")
-set(JSON_ImplicitConversions
-    ON
-    CACHE INTERNAL "Do implicit data type conversions")
-set(JSON_MultipleHeaders
-    OFF
-    CACHE INTERNAL "Split in multiple headers")
 set(UUID_USING_CXX20_SPAN
     ON
     CACHE INTERNAL "Use CXX20 span")
 set(UUID_BUILD_TESTS
     OFF
     CACHE INTERNAL "Build stduuid tests")
 
-add_subdirectory(ThirdParty/json)
 add_subdirectory(ThirdParty/gtest)
 add_subdirectory(ThirdParty/stduuid)
 add_subdirectory(ThirdParty/caffa-base)
@@ -98,6 +81,10 @@ if(CAFFA_BUILD_UNIT_TESTS)
   add_test(caffaCore_UnitTests ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/caffaCore_UnitTests)
   add_test(caffaIoCore_UnitTests ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/caffaIoCore_UnitTests)
   add_test(caffaProjectDataModel_UnitTests ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/caffaProjectDataModel_UnitTests)
+
+  if(CAFFA_REST_INTERFACE)
+    add_test(caffaRestInterface_UnitTests ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/caffaRestInterface_UnitTests)
+  endif()
 endif()
 
 # Organize sub-projects into folders on Visual Studio Turn on using solution folders

diff --git a/CMakePresets.json b/CMakePresets.json
@@ -19,7 +19,7 @@
             "description": "Configure with vcpkg toolchain and generate Ninja project files for all configurations",
             "binaryDir": "${sourceDir}/builds/${presetName}",
             "generator": "Ninja Multi-Config",
-            "toolchainFile": "${sourceDir}/vcpkg/scripts/buildsystems/vcpkg.cmake"
+            "toolchainFile": "${sourceDir}/ThirdParty/vcpkg/scripts/buildsystems/vcpkg.cmake"
         }
     ],
     "buildPresets": [

diff --git a/Core/CMakeLists.txt b/Core/CMakeLists.txt
@@ -92,6 +92,9 @@ endif()
 
 target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
+find_package(nlohmann_json CONFIG REQUIRED)
+find_package(stduuid CONFIG REQUIRED)
+
 target_link_libraries(
   ${PROJECT_NAME}
   PUBLIC caffaBase nlohmann_json::nlohmann_json

diff --git a/Core/IoCore_UnitTests/CMakeLists.txt b/Core/IoCore_UnitTests/CMakeLists.txt
@@ -5,6 +5,8 @@ project(caffaIoCore_UnitTests)
 # add the executable
 add_executable(${PROJECT_NAME} cafIo_UnitTests.cpp cafIoBasicTest.cpp cafAdvancedTemplateTest.cpp cafIoNumberTest.cpp cafReadmeObjects.cpp)
 
+find_package(nlohmann_json CONFIG REQUIRED)
+
 target_link_libraries(${PROJECT_NAME} caffaCore ${THREAD_LIBRARY} nlohmann_json::nlohmann_json gtest)
 
 target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})

diff --git a/Core/ProjectDataModel_UnitTests/CMakeLists.txt b/Core/ProjectDataModel_UnitTests/CMakeLists.txt
@@ -9,6 +9,8 @@ set(PROJECT_FILES cafBasicTest.cpp cafProjectDataModel_UnitTests.cpp Child.cpp P
 # add the executable
 add_executable(${PROJECT_NAME} ${PROJECT_FILES})
 
+find_package(nlohmann_json CONFIG REQUIRED)
+
 target_link_libraries(${PROJECT_NAME} PRIVATE caffaCore gtest ${THREAD_LIBRARY} nlohmann_json::nlohmann_json)
 
 source_group("" FILES ${PROJECT_FILES})

diff --git a/RestInterface/CMakeLists.txt b/RestInterface/CMakeLists.txt
@@ -54,7 +54,17 @@ target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
 find_package(Boost 1.71.0 REQUIRED COMPONENTS system)
 find_package(OpenSSL REQUIRED)
-target_link_libraries(${PROJECT_NAME} PUBLIC caffaBase caffaCore caffaRpcBase nlohmann_json::nlohmann_json OpenSSL::SSL OpenSSL::Crypto Boost::system)
+find_package(nlohmann_json CONFIG REQUIRED)
+
+target_link_libraries(
+  ${PROJECT_NAME}
+  PUBLIC caffaBase
+         caffaCore
+         caffaRpcBase
+         nlohmann_json::nlohmann_json
+         OpenSSL::SSL
+         OpenSSL::Crypto
+         Boost::system)
 
 install(
   TARGETS ${PROJECT_NAME}

diff --git a/ThirdParty/json b/ThirdParty/json
diff --git a/ThirdParty/vcpkg b/ThirdParty/vcpkg
diff --git a/vcpkg.json b/vcpkg.json
@@ -0,0 +1,12 @@
+{
+  "name": "main",
+  "version-string": "latest",
+  "dependencies": [
+    "nlohmann-json",
+    "gtest",
+    {
+      "name": "boost-system",
+      "platform": "windows"
+    }
+  ]
+}