This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new b874320de5 [INLONG-8728][SDK] Optimize the problem of third-party
openssl library dependency (#8732)
b874320de5 is described below
commit b874320de5dfadf6a5acd766d966e1796af52d89
Author: doleyzi <[email protected]>
AuthorDate: Tue Aug 15 04:54:49 2023 -0700
[INLONG-8728][SDK] Optimize the problem of third-party openssl library
dependency (#8732)
---
.../dataproxy-sdk-cpp/CMakeLists.txt | 8 ++---
.../dataproxy-sdk-cpp/third_party/CMakeLists.txt | 39 ++++++++++++----------
2 files changed, 26 insertions(+), 21 deletions(-)
diff --git a/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-cpp/CMakeLists.txt
b/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-cpp/CMakeLists.txt
index 2ead458d5b..b08af1d45c 100644
--- a/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-cpp/CMakeLists.txt
+++ b/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-cpp/CMakeLists.txt
@@ -24,14 +24,14 @@ project(DataProxySDK)
# compile level -O2
set(CMAKE_CXX_FLAGS "-std=c++11 -O2 -g -Wall -Wsign-compare -Wfloat-equal
-fno-strict-aliasing -fPIC -DASIO_STANDALONE")
-include_directories(${CMAKE_BINARY_DIR}/third_party/include)
-include_directories(${CMAKE_BINARY_DIR}/third_party/rapidjson/src/rapidjson/include)
+include_directories(${PROJECT_SOURCE_DIR}/third_party/include)
+include_directories(${PROJECT_SOURCE_DIR}/third_party/rapidjson/src/rapidjson/include)
include_directories(release/inc)
include_directories(src/base)
include_directories(src/net)
-link_directories(${CMAKE_BINARY_DIR}/third_party/lib)
-link_directories(${CMAKE_BINARY_DIR}/third_party/lib64)
+link_directories(${PROJECT_SOURCE_DIR}/third_party/lib)
+link_directories(${PROJECT_SOURCE_DIR}/third_party/lib64)
add_subdirectory(third_party)
add_subdirectory(src/base)
diff --git
a/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-cpp/third_party/CMakeLists.txt
b/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-cpp/third_party/CMakeLists.txt
index 305c773afd..eadbe8f97f 100644
---
a/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-cpp/third_party/CMakeLists.txt
+++
b/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-cpp/third_party/CMakeLists.txt
@@ -28,30 +28,28 @@ include(ExternalProject)
ExternalProject_Add(
snappy_proj
URL https://github.com/google/snappy/archive/1.1.8.tar.gz
- INSTALL_DIR ${CMAKE_BINARY_DIR}/third_party/
CMAKE_ARGS
- -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
+ -DCMAKE_INSTALL_PREFIX=${PROJECT_SOURCE_DIR}
-DSNAPPY_BUILD_TESTS=OFF
-DHAVE_LIBLZO2=OFF
-DCMAKE_CXX_FLAGS=-fPIC
TEST_BEFORE_INSTALL 0
BUILD_IN_SOURCE 1
- )
+)
ExternalProject_Add(
curl_proj
URL
https://github.com/curl/curl/releases/download/curl-7_78_0/curl-7.78.0.tar.gz
- INSTALL_DIR ${CMAKE_BINARY_DIR}/third_party/
- CONFIGURE_COMMAND ./configure --prefix=<INSTALL_DIR> --without-zlib
--without-ssl --disable-shared --disable-ldap && make install
+ CONFIGURE_COMMAND ./configure --prefix=${PROJECT_SOURCE_DIR}
--without-zlib --without-ssl --disable-shared --disable-ldap && make install
TEST_BEFORE_INSTALL 0
BUILD_IN_SOURCE 1
- )
+)
ExternalProject_Add(
rapidjson
PREFIX "rapidjson"
URL "https://github.com/Tencent/rapidjson/archive/v1.1.0.tar.gz";
- INSTALL_DIR ${CMAKE_BINARY_DIR}/third_party/
+ INSTALL_DIR ${PROJECT_SOURCE_DIR}
CMAKE_ARGS
-DRAPIDJSON_BUILD_TESTS=OFF
-DRAPIDJSON_BUILD_DOC=OFF
@@ -60,15 +58,22 @@ ExternalProject_Add(
BUILD_COMMAND ""
INSTALL_COMMAND ""
UPDATE_COMMAND ""
- )
+)
ExternalProject_Add(
- asio_proj
- URL https://github.com/chriskohlhoff/asio/archive/asio-1-18-0.tar.gz
- INSTALL_DIR ${CMAKE_BINARY_DIR}/third_party/
- CONFIGURE_COMMAND cd ../asio_proj/asio && ./autogen.sh && ./configure
--prefix=<INSTALL_DIR> CFLAGS=-std=c++11 CPPFLAGS=-std=c++11
CXXFLAGS=-std=c++11 && make install
- TEST_BEFORE_INSTALL 0
- BUILD_IN_SOURCE 0
- BUILD_COMMAND ""
- INSTALL_COMMAND ""
- )
+ asio
+ SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/asio
+ BINARY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/asio/asio/
+ URL https://github.com/chriskohlhoff/asio/archive/asio-1-28-0.tar.gz
+ CONFIGURE_COMMAND ./autogen.sh
+ COMMAND ./configure --prefix=${PROJECT_SOURCE_DIR}/ CFLAGS=-std=c++11
CPPFLAGS=-std=c++11 CXXFLAGS=-std=c++11 --with-openssl=${PROJECT_SOURCE_DIR}
+)
+
+ExternalProject_Add(
+ openssl
+ URL https://www.openssl.org/source/openssl-1.1.1q.tar.gz
+ CONFIGURE_COMMAND ./config --prefix=${PROJECT_SOURCE_DIR}
+ BUILD_COMMAND make
+ INSTALL_COMMAND make install
+ BUILD_IN_SOURCE 1
+)
\ No newline at end of file
