Replace the _OPENSSL_LIBDIR with OPENSSL_ROOT_DIR (#130)

* Update OPENSSL root directory cmake args * Remove the SOURCE_PREFIX variable * Fix exec linker flags of fbthrift
vesoft-inc · Feb 4, 2024 · 90b9672 · 90b9672
1 parent 4abe695
commit 90b9672
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/build.sh b/build.sh
@@ -187,7 +187,6 @@ echo "Starting building third-party libraries"
 
 $cmake_cmd  -DDOWNLOAD_DIR=$download_dir              \
             -DCMAKE_INSTALL_PREFIX=$install_dir       \
-            -DSOURCE_PREFIX=$source_dir               \
             ${C_COMPILER_ARG} ${CXX_COMPILER_ARG}     \
             ${DISABLE_CXX11_ABI}                      \
             $source_dir |& tee $logfile

diff --git a/project/externals/fbthrift.cmake b/project/externals/fbthrift.cmake
@@ -22,7 +22,7 @@ ExternalProject_Add(
         -DCMAKE_BUILD_TYPE=Release
         -DBoost_NO_BOOST_CMAKE=ON
         -Denable_tests=OFF
-        -D_OPENSSL_LIBDIR=${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}
+        -DOPENSSL_ROOT_DIR=${CMAKE_INSTALL_PREFIX}
     BUILD_COMMAND make -s -j${BUILDING_JOBS_NUM}
     BUILD_IN_SOURCE 1
     INSTALL_COMMAND make -s -j${BUILDING_JOBS_NUM} install

diff --git a/project/externals/fizz.cmake b/project/externals/fizz.cmake
@@ -22,7 +22,7 @@ ExternalProject_Add(
         -DBoost_NO_BOOST_CMAKE=ON
         -DBUILD_EXAMPLES=OFF
         -DCMAKE_BUILD_TYPE=Release
-        -D_OPENSSL_LIBDIR=${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}
+        -DOPENSSL_ROOT_DIR=${CMAKE_INSTALL_PREFIX}
     BUILD_COMMAND make -s -j${BUILDING_JOBS_NUM}
     BUILD_IN_SOURCE 1
     INSTALL_COMMAND make -s -j${BUILDING_JOBS_NUM} install

diff --git a/project/externals/wangle.cmake b/project/externals/wangle.cmake
@@ -33,7 +33,7 @@ ExternalProject_Add_Step(${name} mannual-configure
         -DCMAKE_BUILD_TYPE=Release
         -DBUILD_TESTS=OFF
         -DCMAKE_EXE_LINKER_FLAGS=-latomic
-        -D_OPENSSL_LIBDIR=${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}
+        -DOPENSSL_ROOT_DIR=${CMAKE_INSTALL_PREFIX}
         .
     WORKING_DIRECTORY <SOURCE_DIR>/wangle
 )