Fix openssl build error (OpenAtomFoundation#369)

clearocean621 · Jul 2, 2024 · 4b125ad · 4b125ad
1 parent 1df26be
commit 4b125ad
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/cmake/braft.cmake b/cmake/braft.cmake
@@ -31,6 +31,7 @@ ExternalProject_Add(
         -DCMAKE_BUILD_TYPE=${THIRD_PARTY_BUILD_TYPE}
         -DCMAKE_PREFIX_PATH=${prefix_path}
         -DBRPC_WITH_GLOG=OFF
+        -DOPENSSL_ROOT_DIR=${THIRD_PARTY_PATH}/install/openssl
         ${EXTERNAL_OPTIONAL_ARGS}
         LIST_SEPARATOR |
         CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${BRAFT_INSTALL_DIR}

diff --git a/cmake/openssl.cmake b/cmake/openssl.cmake
@@ -22,20 +22,14 @@ ExternalProject_Add(
         ${OPENSSL_CONFIGURE_COMMAND}
         --prefix=${OPENSSL_INSTALL_DIR}
         --openssldir=${OPENSSL_INSTALL_DIR}
+        --libdir=${OPENSSL_INSTALL_DIR}/lib
         BUILD_COMMAND make
         TEST_COMMAND ""
         INSTALL_COMMAND make install
         INSTALL_DIR ${OPENSSL_INSTALL_DIR}
 )
 
-IF (CMAKE_SYSTEM_NAME MATCHES "Darwin")
-    SET(OPENSSL_LIB "lib")
-ELSEIF (CMAKE_SYSTEM_NAME MATCHES "Linux")
-    SET(OPENSSL_LIB "lib64")
-ELSE ()
-    MESSAGE(FATAL_ERROR "only support linux or macOS")
-ENDIF ()
-
+SET(OPENSSL_LIB "lib")
 ADD_LIBRARY(ssl STATIC IMPORTED GLOBAL)
 SET_PROPERTY(TARGET ssl PROPERTY IMPORTED_LOCATION ${OPENSSL_INSTALL_DIR}/${OPENSSL_LIB}/libssl.a)
 SET_PROPERTY(TARGET ssl PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${OPENSSL_INCLUDE_DIR})