Merge pull request #12242 from dcamper/hpcc-21577-macos-openssl-location

HPCC-21577 CMake: Relocate macOS-specific OpenSSL directory tests

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>

cmake_modules/FindOPENSSL.cmake

@@ -46,20 +46,21 @@ IF (NOT OPENSSL_FOUND)
     ELSE()
       SET (osdir "unknown")
     ENDIF()
-    IF (APPLE)
-      # We want to ignore any libraries provided by the OS
-      FIND_PATH (OPENSSL_INCLUDE_DIR NAMES openssl/ssl.h PATHS /opt/local/include /usr/local/include NO_DEFAULT_PATH)
-      FIND_LIBRARY (OPENSSL_LIBRARIES NAMES ${ssl_lib} PATHS /opt/local/lib /usr/local/lib NO_DEFAULT_PATH)
-    ELSEIF (NOT ("${osdir}" STREQUAL "unknown"))
+    IF (NOT ("${osdir}" STREQUAL "unknown"))
       FIND_PATH (OPENSSL_INCLUDE_DIR NAMES openssl/ssl.h PATHS "${EXTERNALS_DIRECTORY}/openssl/1.1/${osdir}/include" NO_DEFAULT_PATH)
       FIND_LIBRARY (OPENSSL_LIBRARIES NAMES ${ssl_lib} PATHS "${EXTERNALS_DIRECTORY}/openssl/1.1/${osdir}/lib" NO_DEFAULT_PATH)
     ENDIF()
   ENDIF()
 
   if (USE_NATIVE_LIBRARIES)
-    # if we didn't find in externals, look in system include path
-    FIND_PATH (OPENSSL_INCLUDE_DIR NAMES openssl/ssl.h)
-    FIND_LIBRARY (OPENSSL_LIBRARIES NAMES ${ssl_lib})
+    if (APPLE)
+      FIND_PATH (OPENSSL_INCLUDE_DIR NAMES openssl/ssl.h PATHS /opt/local/include /usr/local/include NO_DEFAULT_PATH)
+      FIND_LIBRARY (OPENSSL_LIBRARIES NAMES ${ssl_lib} PATHS /opt/local/lib /usr/local/lib NO_DEFAULT_PATH)
+    else()
+	  # if we didn't find in externals, look in system include path
+	  FIND_PATH (OPENSSL_INCLUDE_DIR NAMES openssl/ssl.h)
+	  FIND_LIBRARY (OPENSSL_LIBRARIES NAMES ${ssl_lib})
+    endif()
   endif()
 
   include(FindPackageHandleStandardArgs)