Update options

This commit is contained in:
Georg Hagen
2024-10-13 13:21:08 +02:00
parent 7362857cf3
commit 1a1aabe23c
4 changed files with 7 additions and 4 deletions

View File

@@ -32,7 +32,7 @@ add_subdirectory(boost)
add_subdirectory(units)
add_subdirectory(libjpeg-turbo)
add_subdirectory(msdf)
if (NOT IOS)
if (NOT IOS AND ENABLE_CURL)
add_subdirectory(curl)
endif()

View File

@@ -7,7 +7,7 @@ if (NOT IOS)
endif ()
if (assimp_FOUND OR ASSIMP_FOUND)
message("Using system assimp")
elseif (USE_ASSIMP)
elseif (ENABLE_ASSIMP)
message("Building assimp from sources")
if(NOT DEFINED ASSIMP_REPO)
set(ASSIMP_REPO https://github.com/assimp/assimp.git)

View File

@@ -33,8 +33,9 @@ project (OpenVulkano VERSION 1.0 LANGUAGES C CXX)
SetOptimisationSettings()
# ------------------------- CMAKE OPTIONS -------------------------
option(USE_ASSIMP "If assimp should be used" ON)
option(TRACY_ENABLE "Enable Tracy Profiler" OFF)
option(ENABLE_ASSIMP "If assimp should be used" ON)
option(ENABLE_CURL "If curl should be used" ON)
option(ENABLE_TEST "Enable testing" ON)
option(ENABLE_EXAMPLE "Enable examples" ON)
option(ENABLE_MSDF "Enable msdf library" ON)

View File

@@ -53,7 +53,9 @@ SetShaderDependency(openVulkanoCpp
if (NOT ANDROID AND NOT IOS)
target_link_libraries(openVulkanoCpp PUBLIC glfw pugixml)
target_link_libraries(openVulkanoCpp PUBLIC ftxui::screen ftxui::dom ftxui::component)
LinkCurl(openVulkanoCpp)
if (ENABLE_CURL)
LinkCurl(openVulkanoCpp)
endif()
endif()
target_link_libraries(openVulkanoCpp PUBLIC magic_enum yaml-cpp fmt spdlog glm pugixml stb eigen utf8cpp imgui_internal TracyClient stud-uuid ryml unordered_dense units)