From c156ae704bc9e1c08c950bf864c173afcb3bd628 Mon Sep 17 00:00:00 2001
From: "Scott E. Graves" <scott.e.graves@protonmail.com>
Date: Sun, 29 Oct 2023 20:21:37 -0500
Subject: [PATCH] cmake build refactor

---
 cmake/curl.cmake    | 10 ++++++++--
 cmake/openssl.cmake | 15 ++++-----------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/cmake/curl.cmake b/cmake/curl.cmake
index 240c920f..d057da5a 100644
--- 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
diff --git a/cmake/openssl.cmake b/cmake/openssl.cmake
index 38461461..857a542f 100644
--- a/cmake/openssl.cmake
+++ b/cmake/openssl.cmake
@@ -28,16 +28,9 @@ ExternalProject_Add(openssl_project
   INSTALL_COMMAND make install
 )
 
-if (MACOS)
-  set(OPENSSL_LIBRARIES
-    ${EXTERNAL_BUILD_ROOT}/lib/libssl.a
-    ${EXTERNAL_BUILD_ROOT}/lib/libcrypto.a
-  )
-else()
-  set(OPENSSL_LIBRARIES
-    libssl.a
-    libcrypto.a
-  )
-endif()
+set(OPENSSL_LIBRARIES
+  ${EXTERNAL_BUILD_ROOT}/lib/libssl.a
+  ${EXTERNAL_BUILD_ROOT}/lib/libcrypto.a
+)
 
 add_dependencies(openssl_project zlib_project)