GeorgH93/OpenVulkano
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update dependencies

Browse Source
This commit is contained in:
GeorgH93
2023-09-28 13:19:11 +02:00
parent 1d8a7d7755
commit 36288bd5b0
5 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
3rdParty/CMakeLists.txt vendored
View File

@@ -6,8 +6,8 @@ endif()
if (NOT LINUX) if (NOT LINUX)
add_subdirectory(spdlog) add_subdirectory(spdlog)
add_subdirectory(assimp) add_subdirectory(assimp)
add_subdirectory(yaml-cpp)
endif() endif()
add_subdirectory(yaml-cpp)
add_subdirectory(magic-enum) add_subdirectory(magic-enum)
add_subdirectory(pugixml) add_subdirectory(pugixml)
add_subdirectory(stb) add_subdirectory(stb)
@@ -15,6 +15,7 @@ add_subdirectory(eigen)
add_subdirectory(utfcpp) add_subdirectory(utfcpp)
add_subdirectory(imgui) add_subdirectory(imgui)
add_subdirectory(tracy) add_subdirectory(tracy)
add_subdirectory(libstud-uuid)
if (NOT LINUX) if (NOT LINUX)
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/deps) file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/deps)

10
3rdParty/libstud-uuid/CMakeLists.txt vendored Normal file
View File

@@ -0,0 +1,10 @@
include(FetchContent)
FetchContent_Declare(
libstud-uuid
EXCLUDE_FROM_ALL
GIT_REPOSITORY https://github.com/GeorgH93/libstud-uuid.git
GIT_SHALLOW TRUE
)
FetchContent_MakeAvailable(libstud-uuid)

2
3rdParty/yaml-cpp/CMakeLists.txt vendored
View File

@@ -4,7 +4,7 @@ FetchContent_Declare(
yaml-cpp yaml-cpp
EXCLUDE_FROM_ALL EXCLUDE_FROM_ALL
GIT_REPOSITORY https://github.com/jbeder/yaml-cpp.git GIT_REPOSITORY https://github.com/jbeder/yaml-cpp.git
GIT_TAG yaml-cpp-0.6.3 GIT_TAG 0.8.0
GIT_SHALLOW TRUE GIT_SHALLOW TRUE
) )
set(YAML_CPP_BUILD_TOOLS OFF) set(YAML_CPP_BUILD_TOOLS OFF)

4
CMakeLists.txt
View File

@@ -137,13 +137,11 @@ endif()
if (NOT ANDROID AND NOT IOS) if (NOT ANDROID AND NOT IOS)
Find_Package(OpenCV) Find_Package(OpenCV)
Find_Package(libjpeg-turbo) Find_Package(libjpeg-turbo)
Find_Package(Open3D)
target_include_directories(openVulkanoCpp PRIVATE ${OpenCV_INCLUDE_DIRS}) target_include_directories(openVulkanoCpp PRIVATE ${OpenCV_INCLUDE_DIRS})
target_link_libraries(openVulkanoCpp PRIVATE glfw ${OpenCV_LIBS} pugixml) target_link_libraries(openVulkanoCpp PRIVATE glfw ${OpenCV_LIBS} pugixml)
if (libjpeg-turbo_FOUND) if (libjpeg-turbo_FOUND)
target_link_libraries(openVulkanoCpp PRIVATE libjpeg-turbo::turbojpeg) target_link_libraries(openVulkanoCpp PRIVATE libjpeg-turbo::turbojpeg)
endif() endif()
target_link_libraries(openVulkanoCpp PRIVATE Open3D::Open3D)
target_link_libraries(openVulkanoCpp PRIVATE assimp) target_link_libraries(openVulkanoCpp PRIVATE assimp)
add_compile_definitions(GLM_FORCE_AVX2) add_compile_definitions(GLM_FORCE_AVX2)
target_link_libraries(openVulkanoCpp PRIVATE ftxui::screen ftxui::dom ftxui::component) target_link_libraries(openVulkanoCpp PRIVATE ftxui::screen ftxui::dom ftxui::component)
@@ -166,7 +164,7 @@ find_package(LibArchive REQUIRED)
set(ZLIB_USE_STATIC_LIBS ON) set(ZLIB_USE_STATIC_LIBS ON)
find_package(ZLIB REQUIRED) find_package(ZLIB REQUIRED)
target_include_directories(openVulkanoCpp PRIVATE ${LibArchive_INCLUDE_DIR}) target_include_directories(openVulkanoCpp PRIVATE ${LibArchive_INCLUDE_DIR})
target_link_libraries(openVulkanoCpp PRIVATE magic_enum yaml-cpp spdlog glm pugixml ${LibArchive_LIBRARIES} ${ZLIB_LIBRARIES} stb eigen utf8cpp imgui_internal TracyClient) target_link_libraries(openVulkanoCpp PRIVATE magic_enum yaml-cpp spdlog glm pugixml ${LibArchive_LIBRARIES} ${ZLIB_LIBRARIES} stb eigen utf8cpp imgui_internal TracyClient stud-uuid)
add_compile_definitions(GLM_FORCE_INTRINSICS) add_compile_definitions(GLM_FORCE_INTRINSICS)
add_compile_definitions(GLM_FORCE_SILENT_WARNINGS) add_compile_definitions(GLM_FORCE_SILENT_WARNINGS)

2
openVulkanoCpp/IO/Archive/MultiPartArchiveWriter.cpp
View File

@@ -28,7 +28,7 @@ namespace openVulkanoCpp
MultiPartArchiveWriter::~MultiPartArchiveWriter() MultiPartArchiveWriter::~MultiPartArchiveWriter()
{ {
bool deleteLast = m_writer->GetTotalWrittenBytes() == 0; bool deleteLast = m_writer && m_writer->GetTotalWrittenBytes() == 0;
m_writer = nullptr; m_writer = nullptr;
if (deleteLast) std::filesystem::remove(m_archives.back()); if (deleteLast) std::filesystem::remove(m_archives.back());
} }