cmake build refactor

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

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)