Fix date library build in centos7 (#129)

vesoft-inc · Feb 2, 2024 · 8a7c6d9 · 8a7c6d9
1 parent 8972d91
commit 8a7c6d9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/project/CMakeLists.txt b/project/CMakeLists.txt
@@ -140,9 +140,9 @@ set(common_cmake_args
     "-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -fno-omit-frame-pointer -fPIC ${extra_cpp_flags}"
     "-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} -fno-omit-frame-pointer -fPIC"
     "-DCMAKE_EXE_LINKER_FLAGS=${extra_link_libs} -Wl,-rpath=\$ORIGIN/../lib:\$ORIGIN/../lib64"
-    -DCMAKE_SHARED_LINKER_FLAGS=-Wl,-rpath=\$ORIGIN:\$ORIGIN/../3rd
+    -DCMAKE_SHARED_LINKER_FLAGS=-Wl,-rpath=\$ORIGIN:\$ORIGIN/../3rd:\$ORIGIN/../lib64:\$ORIGIN/../lib
     -DCMAKE_INCLUDE_PATH=${CMAKE_INSTALL_PREFIX}/include
-    -DCMAKE_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX}/lib
+    "-DCMAKE_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX}/lib:${CMAKE_INSTALL_PREFIX}/lib64"
     -DBUILD_SHARED_LIBS=ON
 )
 

diff --git a/project/externals/date.cmake b/project/externals/date.cmake
@@ -20,8 +20,7 @@ ExternalProject_Add(
         -DENABLE_DATE_TESTING=OFF
         -DBUILD_SHARED_LIBS=ON
         -DCMAKE_BUILD_TYPE=Release
-        -DCURL_INCLUDE_DIRS=${CMAKE_INSTALL_PREFIX}/include
-        -DCURL_LIBRARIES=${CMAKE_INSTALL_PREFIX}/lib/libcurl.so
+        -DCURL_NO_CURL_CMAKE=ON
     BUILD_IN_SOURCE 1
     BUILD_COMMAND make -s -j${BUILDING_JOBS_NUM}
     INSTALL_COMMAND make -s -j${BUILDING_JOBS_NUM} install

diff --git a/project/externals/libcurl.cmake b/project/externals/libcurl.cmake
@@ -17,6 +17,7 @@ ExternalProject_Add(
     CMAKE_ARGS
         ${common_cmake_args}
         -DCMAKE_BUILD_TYPE=Release
+        -DOPENSSL_ROOT_DIR=${CMAKE_INSTALL_PREFIX}
         -DBUILD_CURL_EXE=OFF
         -DUSE_LIBIDN2=OFF
         -DCURL_DISABLE_LDAP=ON