diff --git a/3rdParty/CMakeLists.txt b/3rdParty/CMakeLists.txt index 7e5c561..f76cbe2 100644 --- a/3rdParty/CMakeLists.txt +++ b/3rdParty/CMakeLists.txt @@ -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() diff --git a/3rdParty/assimp/CMakeLists.txt b/3rdParty/assimp/CMakeLists.txt index bb42c64..782c75b 100644 --- a/3rdParty/assimp/CMakeLists.txt +++ b/3rdParty/assimp/CMakeLists.txt @@ -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) diff --git a/CMakeLists.txt b/CMakeLists.txt index b99c074..b26832d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/openVulkanoCpp/CMakeLists.txt b/openVulkanoCpp/CMakeLists.txt index 5b7a6d5..ae21b7b 100644 --- a/openVulkanoCpp/CMakeLists.txt +++ b/openVulkanoCpp/CMakeLists.txt @@ -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)