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..2a8bdb6 --- /dev/null +++ b/3rdParty/boost/CMakeLists.txt @@ -0,0 +1,16 @@ +Find_Package(Boost QUIET COMPONENTS regex) +include(FetchContent) + +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) + set(BOOST_INCLUDE_LIBRARIES regex) + set(BOOST_ENABLE_CMAKE ON) + FetchContent_Declare( + Boost + URL ${BOOST_LIBRARY_MIRROR} + ) + 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) 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 {