Passthrough generator flags

3rdParty/CMakeLists.txt

@@ -20,4 +20,6 @@ add_subdirectory(libstud-uuid)
 add_subdirectory(rapidyaml)
 add_subdirectory(libarchive)
 add_subdirectory(libjpeg-turbo)
-add_subdirectory(curl)
+if (NOT IOS)
+    add_subdirectory(curl)
+endif()

3rdParty/curl/CMakeLists.txt

@@ -5,7 +5,7 @@ find_package(CURL QUIET)
 if (NOT ${CURL_FOUND})
     file(MAKE_DIRECTORY ${CURL_DEPS_INSTALL})
     execute_process(
-            COMMAND ${CMAKE_COMMAND} -G ${CMAKE_GENERATOR} -DTOOLCHAIN_FILE=${TOOLCHAIN_FILE} ${CMAKE_CURRENT_SOURCE_DIR}/ext -DCURL_REPO=${CURL_REPO} -DOPENSSL_REPO=${OPENSSL_REPO}
+            COMMAND ${CMAKE_COMMAND} -G ${CMAKE_GENERATOR} -DTOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} ${CMAKE_CURRENT_SOURCE_DIR}/ext -DCURL_REPO=${CURL_REPO} -DOPENSSL_REPO=${OPENSSL_REPO} -DPLATFORM=${PLATFORM}
             WORKING_DIRECTORY ${CURL_DEPS_INSTALL}
     )
     execute_process(
@@ -22,10 +22,10 @@ else ()
     set(USING_SYSTEM_CURL ON PARENT_SCOPE)
 endif ()
 
-function(LinkCurl TARGET BINARY_DIR)
+function(LinkCurl TARGET)
     find_package(CURL QUIET)
     if (NOT ${CURL_FOUND})
-        set(CURL_DEPS_INSTALL ${BINARY_DIR}/deps_curl)
+        set(CURL_DEPS_INSTALL ${CMAKE_BINARY_DIR}/deps_curl)
         target_include_directories(${TARGET} PRIVATE ${CURL_DEPS_INSTALL}/INSTALL/include)
         target_link_directories(${TARGET} PRIVATE ${CURL_DEPS_INSTALL}/INSTALL/lib)
         if (MSVC)

3rdParty/curl/ext/CMakeLists.txt

@@ -42,7 +42,10 @@ if (APPLE)
         CMAKE_ARGS
             -DCMAKE_TOOLCHAIN_FILE:FILEPATH=${TOOLCHAIN_FILE}
             -DCMAKE_BUILD_TYPE:STRING=Release
-            -DCURL_USE_OPENSSL:BOOL=ON
+            -DCURL_USE_OPENSSL:BOOL=OFF
+            -DBUILD_SHARED_LIBS:BOOL=OFF
+            -DBUILD_STATIC_LIBS:BOOL=OFF
+            -DBUILD_CURL_EXE:BOOL=OFF
             -DCMAKE_PREFIX_PATH=${CMAKE_BINARY_DIR}/INSTALL
             -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_BINARY_DIR}/INSTALL
         BUILD_COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR}/curl-build --config Release

3rdParty/libarchive/CMakeLists.txt

@@ -8,20 +8,19 @@ if (NOT DEFINED LibArchive_LIBRARIES)
             WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/deps
     )
     execute_process(
-            COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR}/deps
+            COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR}/deps --config Release
             RESULT_VARIABLE build_result
     )
     if (NOT ${build_result} EQUAL "0")
         message(FATAL_ERROR "Failed to build lib archive!")
     endif()
-
-    list(APPEND CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR}/deps/INSTALL)
 else ()
     message("Using system LibArchive")
     set(USING_SYSTEM_LIBARCHIVE ON PARENT_SCOPE)
 endif ()
 
 function(LinkLibArchive TARGET)
+    list(APPEND CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR}/deps/INSTALL)
     find_package(LibArchive REQUIRED)
     set(ZLIB_USE_STATIC_LIBS ON)
     find_package(ZLIB REQUIRED)

3rdParty/libjpeg-turbo/CMakeLists.txt

@@ -6,7 +6,7 @@ if (libjpeg-turbo_FOUND)
 else ()
     file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/deps_ljt)
     execute_process(
-            COMMAND ${CMAKE_COMMAND} -G ${CMAKE_GENERATOR} -DTOOLCHAIN_FILE=${TOOLCHAIN_FILE} ${CMAKE_CURRENT_SOURCE_DIR}/ext -DLIBJPEGTURBO_REPO=${LIBJPEGTURBO_REPO}
+            COMMAND ${CMAKE_COMMAND} -G ${CMAKE_GENERATOR} -DTOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} ${CMAKE_CURRENT_SOURCE_DIR}/ext -DLIBJPEGTURBO_REPO=${LIBJPEGTURBO_REPO}
             WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/deps_ljt
     )
     execute_process(

CMakeLists.txt

@@ -95,7 +95,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)
-LinkCurl(openVulkanoCpp ${CMAKE_BINARY_DIR})
+LinkCurl(openVulkanoCpp)
 
 add_compile_definitions(LIBARCHIVE_STATIC)
 add_compile_definitions(NOMINMAX)