Merge branch 'master' into windows_build_fix

This commit is contained in:
Vladyslav Baranovskyi
2024-05-27 12:17:07 +03:00
17 changed files with 514 additions and 158 deletions

View File

@@ -1,9 +1,13 @@
cmake_minimum_required(VERSION 3.28 FATAL_ERROR)
option(USE_ASSIMP "If assimp should be used" ON)
include(cmake/VarsFromFile.cmake)
include(cmake/SetCompilerSettings.cmake)
include(cmake/SetupVulkan.cmake)
include(cmake/Filter.cmake)
include(ExternalProject)
VarsFromFile("DependencyMirrors.txt") # Load mirror list (for CICD)
set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
@@ -11,6 +15,7 @@ if(LINUX)
find_package(ECM REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
endif()
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
add_subdirectory(3rdParty)
@@ -33,6 +38,7 @@ else()
endif()
FilterPlatformPaths(sources)
SetWarningSettings(openVulkanoCpp)
set_property(TARGET openVulkanoCpp PROPERTY CXX_STANDARD 17)
target_sources(openVulkanoCpp PRIVATE ${sources})
target_include_directories(openVulkanoCpp PUBLIC openVulkanoCpp)
@@ -46,56 +52,17 @@ if(IOS)
set(CMAKE_OSX_DEPLOYMENT_TARGET "14.1") # The used ARKit features are only available starting with iOS 14
target_link_libraries(openVulkanoCpp
PRIVATE "-framework CoreFoundation"
PRIVATE "-framework Foundation"
PRIVATE "-framework CoreImage"
PRIVATE "-framework CoreVideo"
PRIVATE "-framework Metal"
PRIVATE "-framework MetalPerformanceShaders"
PRIVATE "-framework ARKit"
PRIVATE "-lstdc++"
PRIVATE c++
PRIVATE c
)
# Locate system libraries on iOS
find_library(UIKIT UIKit)
find_library(FOUNDATION Foundation)
find_library(MOBILECORESERVICES MobileCoreServices)
find_library(CFNETWORK CFNetwork)
find_library(SYSTEMCONFIGURATION SystemConfiguration)
# link the frameworks located above
target_link_libraries(openVulkanoCpp PRIVATE ${UIKIT})
target_link_libraries(openVulkanoCpp PRIVATE ${FOUNDATION})
target_link_libraries(openVulkanoCpp PRIVATE ${MOBILECORESERVICES})
target_link_libraries(openVulkanoCpp PRIVATE ${CFNETWORK})
target_link_libraries(openVulkanoCpp PRIVATE ${SYSTEMCONFIGURATION})
LinkAppleFrameworks(openVulkanoCpp)
endif ()
#Setup Vulkan
SetupVulkan(openVulkanoCpp)
set_property(TARGET openVulkanoCpp PROPERTY CXX_STANDARD 17)
if (NOT ANDROID AND NOT IOS)
# Libjpeg-turbo
add_dependencies(openVulkanoCpp libjpeg-turbo)
ExternalProject_Get_Property(libjpeg-turbo INSTALL_DIR)
include_directories(${INSTALL_DIR}/include)
link_directories(${INSTALL_DIR}/lib ${INSTALL_DIR}/lib64)
if (WIN32)
target_link_libraries(openVulkanoCpp PRIVATE ${INSTALL_DIR}/lib/turbojpeg.lib)
else()
target_link_libraries(openVulkanoCpp PRIVATE ${INSTALL_DIR}/lib/libturbojpeg.a)
Find_Package(libjpeg-turbo)
target_link_libraries(openVulkanoCpp PRIVATE glfw pugixml)
if (libjpeg-turbo_FOUND)
target_link_libraries(openVulkanoCpp PRIVATE libjpeg-turbo::turbojpeg)
endif()
target_include_directories(openVulkanoCpp PRIVATE ${OpenCV_INCLUDE_DIRS})
target_link_libraries(openVulkanoCpp PRIVATE glfw ${OpenCV_LIBS} pugixml)
target_link_libraries(openVulkanoCpp PRIVATE assimp)
add_compile_definitions(GLM_FORCE_AVX2)
target_link_libraries(openVulkanoCpp PRIVATE ftxui::screen ftxui::dom ftxui::component)
endif()
@@ -105,45 +72,19 @@ if (IOS)
target_include_directories(openVulkanoCpp PRIVATE "/opt/libjpeg-turbo-ios/include")
endif ()
if (LINUX)
find_package(spdlog)
find_package(fmt)
find_package(yaml-cpp)
target_link_libraries(openVulkanoCpp PRIVATE fmt)
endif()
target_link_libraries(openVulkanoCpp PRIVATE magic_enum yaml-cpp fmt spdlog glm pugixml stb eigen utf8cpp imgui_internal TracyClient stud-uuid)
find_package(LibArchive REQUIRED)
set(ZLIB_USE_STATIC_LIBS ON)
find_package(ZLIB REQUIRED)
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 stud-uuid)
if(WIN32)
# lz4
# NOTE(vb): There must be a better way of linking with lz4...
target_link_libraries(openVulkanoCpp PRIVATE ${CMAKE_BINARY_DIR}/deps/lz4-build/Debug/lz4.lib)
# Zstd
find_package(Zstd REQUIRED)
target_include_directories(openVulkanoCpp PRIVATE ${Zstd_INCLUDE_DIR})
target_link_libraries(openVulkanoCpp PRIVATE $<IF:$<TARGET_EXISTS:zstd::libzstd_shared>,zstd::libzstd_shared,zstd::libzstd_static>)
# Ws2_32
target_link_libraries(openVulkanoCpp PRIVATE Ws2_32)
# Copy dlls to the exe directory
add_custom_command(TARGET openVulkanoCpp POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:openVulkanoCpp> $<TARGET_RUNTIME_DLLS:openVulkanoCpp> $<TARGET_FILE_DIR:openVulkanoCpp>
COMMAND_EXPAND_LISTS
)
endif()
add_compile_definitions(GLM_FORCE_INTRINSICS)
add_compile_definitions(GLM_FORCE_SILENT_WARNINGS)
add_compile_definitions(NOMINMAX)
add_compile_definitions(LIBARCHIVE_STATIC)
add_compile_definitions(NOMINMAX)
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
add_compile_definitions(DEBUG)
endif()
SetGlmDefines(openVulkanoCpp)
LinkAssimp(openVulkanoCpp)
LinkLibArchive(openVulkanoCpp)
set(VS_STARTUP_PROJECT openVulkanoCpp)