Merge pull request 'Boost::regex dependency, added include in order to compile on linux' (#70) from boost_regex into master

Reviewed-on: https://git.madvoxel.net/OpenVulkano/OpenVulkano/pulls/70
Reviewed-by: Georg Hagen <georg.hagen@madvoxel.com>
This commit is contained in:
Vladyslav_Baranovskyi_EXT
2024-07-16 19:36:06 +02:00
4 changed files with 19 additions and 1 deletions

View File

@@ -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()

16
3rdParty/boost/CMakeLists.txt vendored Normal file
View File

@@ -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()

View File

@@ -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)

View File

@@ -7,6 +7,7 @@
#pragma once
#include "ShaderProgramType.hpp"
#include <tuple>
namespace OpenVulkano
{