From 976eea2ae0e0fbee942d06500994a572f5880178 Mon Sep 17 00:00:00 2001 From: Vladyslav Baranovskyi Date: Mon, 15 Jul 2024 16:50:38 +0300 Subject: [PATCH 1/3] Boost::regex --- 3rdParty/CMakeLists.txt | 1 + 3rdParty/boost/CMakeLists.txt | 16 ++++++++++++++++ CMakeLists.txt | 2 +- 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 3rdParty/boost/CMakeLists.txt diff --git a/3rdParty/CMakeLists.txt b/3rdParty/CMakeLists.txt index ecaba81..c11e651 100644 --- a/3rdParty/CMakeLists.txt +++ b/3rdParty/CMakeLists.txt @@ -21,6 +21,7 @@ add_subdirectory(libstud-uuid) add_subdirectory(rapidyaml) add_subdirectory(libarchive) add_subdirectory(libjpeg-turbo) +add_subdirectory(boost) if (NOT IOS) add_subdirectory(curl) endif() diff --git a/3rdParty/boost/CMakeLists.txt b/3rdParty/boost/CMakeLists.txt new file mode 100644 index 0000000..b082a7d --- /dev/null +++ b/3rdParty/boost/CMakeLists.txt @@ -0,0 +1,16 @@ +Find_Package(Boost QUIET COMPONENTS regex) +include(FetchContent) + +if(NOT DEFINED OPENCV_REPO) + set(OPENCV_REPO https://github.com/opencv/opencv.git) +endif () + +if (NOT Boost_FOUND) + set(BOOST_INCLUDE_LIBRARIES regex) + set(BOOST_ENABLE_CMAKE ON) + FetchContent_Declare( + Boost + URL https://github.com/boostorg/boost/releases/download/boost-1.84.0/boost-1.84.0.tar.xz + ) + FetchContent_MakeAvailable(Boost) +endif() \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 6de6b78..5039b4b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -100,7 +100,7 @@ endif() list(APPEND CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR}/deps/INSTALL) -target_link_libraries(openVulkanoCpp PRIVATE magic_enum yaml-cpp fmt spdlog glm pugixml stb eigen utf8cpp imgui_internal TracyClient stud-uuid ryml unordered_dense) +target_link_libraries(openVulkanoCpp PRIVATE magic_enum yaml-cpp fmt spdlog glm pugixml stb eigen utf8cpp imgui_internal TracyClient stud-uuid ryml unordered_dense Boost::regex) LinkCurl(openVulkanoCpp) add_compile_definitions(LIBARCHIVE_STATIC) From f96caf2a53469abde3586fb605dd79cbd35a96a5 Mon Sep 17 00:00:00 2001 From: Vladyslav Baranovskyi Date: Tue, 16 Jul 2024 11:50:59 +0300 Subject: [PATCH 2/3] Added include tuple for std::tie --- openVulkanoCpp/Scene/Shader/DescriptorInputDescription.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/openVulkanoCpp/Scene/Shader/DescriptorInputDescription.hpp b/openVulkanoCpp/Scene/Shader/DescriptorInputDescription.hpp index 8d15b4d..b5a23c7 100644 --- a/openVulkanoCpp/Scene/Shader/DescriptorInputDescription.hpp +++ b/openVulkanoCpp/Scene/Shader/DescriptorInputDescription.hpp @@ -7,6 +7,7 @@ #pragma once #include "ShaderProgramType.hpp" +#include namespace OpenVulkano { From 1aac70719958813b99bf6e5a789b3732f1e39e75 Mon Sep 17 00:00:00 2001 From: Vladyslav Baranovskyi Date: Tue, 16 Jul 2024 13:24:08 +0300 Subject: [PATCH 3/3] Setting boost library mirror in a variable --- 3rdParty/boost/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/3rdParty/boost/CMakeLists.txt b/3rdParty/boost/CMakeLists.txt index b082a7d..2a8bdb6 100644 --- a/3rdParty/boost/CMakeLists.txt +++ b/3rdParty/boost/CMakeLists.txt @@ -1,8 +1,8 @@ Find_Package(Boost QUIET COMPONENTS regex) include(FetchContent) -if(NOT DEFINED OPENCV_REPO) - set(OPENCV_REPO https://github.com/opencv/opencv.git) +if(NOT DEFINED BOOST_LIBRARY_MIRROR) + set(BOOST_LIBRARY_MIRROR https://github.com/boostorg/boost/releases/download/boost-1.84.0/boost-1.84.0.tar.xz) endif () if (NOT Boost_FOUND) @@ -10,7 +10,7 @@ if (NOT Boost_FOUND) set(BOOST_ENABLE_CMAKE ON) FetchContent_Declare( Boost - URL https://github.com/boostorg/boost/releases/download/boost-1.84.0/boost-1.84.0.tar.xz + URL ${BOOST_LIBRARY_MIRROR} ) FetchContent_MakeAvailable(Boost) endif() \ No newline at end of file