cmake build refactor

2023-10-29 20:21:37 -05:00
parent a67979ec40
commit c156ae704b
2 changed files with 12 additions and 13 deletions
--- a/cmake/curl.cmake
+++ b/cmake/curl.cmake
@@ -31,14 +31,20 @@ set(CURL_CMAKE_ARGS
  -DUSE_LIBIDN2=OFF
 )

-if (MINGW AND CMAKE_TOOLCHAIN_FILE)
+if (CMAKE_TOOLCHAIN_FILE)
  set(CURL_CMAKE_ARGS
    ${CURL_CMAKE_ARGS}
    -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} 
+  )
+endif()
+
+if (MINGW)
+  set(CURL_CMAKE_ARGS
+    ${CURL_CMAKE_ARGS}
    -DCURL_USE_OPENSSL=OFF
    -DUSE_WIN32_CRYPTO=ON
  )
-elseif(NOT MINGW)
+else()
  set(CURL_CMAKE_ARGS
    ${CURL_CMAKE_ARGS}
    -DCURL_USE_OPENSSL=ON