OpenSSL now builds as an external library and plugin (#1101).

opencor · Dec 1, 2016 · afee018 · afee018
1 parent a250c91
commit afee018
Showing 1 changed file with 10 additions and 11 deletions.
diff --git a/src/plugins/thirdParty/OpenSSL/CMakeLists.txt b/src/plugins/thirdParty/OpenSSL/CMakeLists.txt
@@ -1,8 +1,5 @@
 PROJECT(OpenSSLPlugin)
 
-## Override main CMakeLists.txt
-SET(USE_PREBUILT_OPENSSL_PLUGIN OFF)
-
 # Specify the version of OpenSSL we want to build
 
 SET(OPENSSL_VERSION "1.0.0")
@@ -44,7 +41,7 @@ SET(FULL_INSTALL_DIR ${PROJECT_SOURCE_DIR}/${RELATIVE_INSTALL_DIR})
 # Specify the files that will have their SHA1 checked when packaged
 
 SET(CHECKED_FILES lib/${CRYPTO_LIBRARY})
-SET(CHECKED_FILES lib/${OPENSSL_LIBRARY})
+LIST(APPEND CHECKED_FILES lib/${OPENSSL_LIBRARY})
 IF(WIN32)
     LIST(APPEND CHECKED_FILES lib/${CRYPTO_GENERATED_LIBRARY})
     LIST(APPEND CHECKED_FILES lib/${OPENSSL_GENERATED_LIBRARY})
@@ -56,6 +53,9 @@ IF(USE_PREBUILT_OPENSSL_PLUGIN)
 
     # Retrieve the plugin's file(s)
 
+    STRING(REPLACE "${${CMAKE_PROJECT_NAME}_SOURCE_DIR}/" ""
+           RELATIVE_PROJECT_SOURCE_DIR "${FULL_INSTALL_DIR}")
+
     IF(WIN32)
         IF(RELEASE_MODE)
             RETRIEVE_PACKAGE_FILE(${RELATIVE_ROOT_DIR}
@@ -70,12 +70,12 @@ IF(USE_PREBUILT_OPENSSL_PLUGIN)
             RETRIEVE_PACKAGE_FILE(${RELATIVE_ROOT_DIR} Sample sha...)
         ENDIF()
     ELSEIF(APPLE)
-        RETRIEVE_PACKAGE_FILE(${RELATIVE_ROOT_DIR}
-            OpenSSL ${OPENSSL_VERSION} 0e7337e56ed9d6580c1437ce0fdd3963641d74e3
+        RETRIEVE_PACKAGE_FILE(${RELATIVE_PROJECT_SOURCE_DIR}
+            OpenSSL ${OPENSSL_VERSION} fc098fbd37b9c43e37cd39693d0b6275d82984f3
             CHECKED_FILES ${CHECKED_FILES}
-            SHA1_VALUES e6db7d7e402091527ef72f7825a16a35566ebad5
-                8fe62552e8ebd8e430ff8051e3e6e2ec3430aab1
-            )
+            SHA1_VALUES e408b768774141487cec72e4537df1fbd7ace703
+                        2415193789e779995ca82cd8adb8b1b238c8350b
+        )
     ELSE()
         RETRIEVE_PACKAGE_FILE(${RELATIVE_ROOT_DIR} Sample sha...)
     ENDIF()
@@ -122,7 +122,6 @@ ELSE()
         ENDIF()
         SET(MAKE_EXECUTABLE make)
         SET(MAKEFILE Makefile)
-        SET(BUILD_TARGET build_libs)
         SET(INSTALL_TARGET install_sw)
     ENDIF()
 
@@ -138,7 +137,7 @@ ELSE()
         GIT_TAG ${OPENSSL_GIT_TAG}
         UPDATE_COMMAND ""
         CONFIGURE_COMMAND ${PERL_EXECUTABLE} ./Configure ${PLATFORM} ${CONFIG_OPTIONS}
-        BUILD_COMMAND ${MAKE_EXECUTABLE} -f ${MAKEFILE} --quiet ${BUILD_TARGET}
+        BUILD_COMMAND ${MAKE_EXECUTABLE} -f ${MAKEFILE} --quiet
         INSTALL_COMMAND ${MAKE_EXECUTABLE} -f ${MAKEFILE} --quiet ${INSTALL_TARGET}
         BUILD_BYPRODUCTS
             <INSTALL_DIR>/lib/${CRYPTO_GENERATED_LIBRARY}