From ca0eacc60ef1f0cf800343a0622d0e9d73291df6 Mon Sep 17 00:00:00 2001
From: Lai Yingchun <405403881@qq.com>
Date: Fri, 13 Jul 2018 15:25:28 +0800
Subject: [PATCH] link s2geometry as static library (#120)

* use s2geometry's static library
---
 rdsn                                       | 2 +-
 scripts/pack_tools.sh                      | 1 -
 src/geo/bench/CMakeLists.txt               | 4 ++--
 src/geo/lib/CMakeLists.txt                 | 1 -
 src/geo/test/CMakeLists.txt                | 2 +-
 src/redis_protocol/proxy_ut/CMakeLists.txt | 1 -
 6 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/rdsn b/rdsn
index d72a91d..915cba5 160000
--- a/rdsn
+++ b/rdsn
@@ -1 +1 @@
-Subproject commit d72a91d24f8b25b9d9a7bea2a448ffa93611aafb
+Subproject commit 915cba584db8c83c891ab97fe3be71a3540bfec7
diff --git a/scripts/pack_tools.sh b/scripts/pack_tools.sh
index ef58f11..38ffd94 100755
--- a/scripts/pack_tools.sh
+++ b/scripts/pack_tools.sh
@@ -101,7 +101,6 @@ mkdir -p ${pack}/DSN_ROOT/lib
 copy_file ./DSN_ROOT/lib/*.so* ${pack}/DSN_ROOT/lib/
 copy_file ./rdsn/thirdparty/output/lib/libPoco*.so.48 ${pack}/DSN_ROOT/lib/
 copy_file ./rdsn/thirdparty/output/lib/libtcmalloc.so.4 ${pack}/DSN_ROOT/lib/
-copy_file ./rdsn/thirdparty/output/lib/libs2.so ${pack}/DSN_ROOT/lib/
 copy_file `get_boost_lib $custom_boost_lib system` ${pack}/DSN_ROOT/lib/
 copy_file `get_boost_lib $custom_boost_lib filesystem` ${pack}/DSN_ROOT/lib/
 copy_file `get_stdcpp_lib $custom_gcc` ${pack}/DSN_ROOT/lib/
diff --git a/src/geo/bench/CMakeLists.txt b/src/geo/bench/CMakeLists.txt
index 6fbede8..2187232 100644
--- a/src/geo/bench/CMakeLists.txt
+++ b/src/geo/bench/CMakeLists.txt
@@ -14,9 +14,9 @@ set(MY_PROJ_INC_PATH "../../../rocksdb")
 set(MY_PROJ_LIB_PATH "../../../rocksdb")
 
 set(MY_PROJ_LIBS
-        s2
-        s2testing
         pegasus_geo_lib
+        s2testing
+        s2
         pegasus_client_static
         fmt
         rocksdb
diff --git a/src/geo/lib/CMakeLists.txt b/src/geo/lib/CMakeLists.txt
index 3139104..ddedb37 100644
--- a/src/geo/lib/CMakeLists.txt
+++ b/src/geo/lib/CMakeLists.txt
@@ -14,7 +14,6 @@ set(MY_PROJ_INC_PATH "../../include")
 
 set(MY_PROJ_LIBS
         s2
-        s2testing
         pegasus_client_static
         fmt)
 
diff --git a/src/geo/test/CMakeLists.txt b/src/geo/test/CMakeLists.txt
index 14b2ceb..80ac7b4 100644
--- a/src/geo/test/CMakeLists.txt
+++ b/src/geo/test/CMakeLists.txt
@@ -11,8 +11,8 @@ set(MY_PROJ_SRC "")
 set(MY_SRC_SEARCH_MODE "GLOB")
 
 set(MY_PROJ_LIBS
-        s2testing
         pegasus_geo_lib
+        s2testing
         s2
         pegasus_client_static
         fmt
diff --git a/src/redis_protocol/proxy_ut/CMakeLists.txt b/src/redis_protocol/proxy_ut/CMakeLists.txt
index ccf0f78..543d538 100644
--- a/src/redis_protocol/proxy_ut/CMakeLists.txt
+++ b/src/redis_protocol/proxy_ut/CMakeLists.txt
@@ -22,7 +22,6 @@ set(MY_BOOST_PACKAGES system filesystem)
 
 set(MY_PROJ_LIBS pegasus.rproxylib
         pegasus.base ${MY_PROJ_LIBS}
-        s2testing
         pegasus_geo_lib
         s2
         pegasus_client_static
-- 
GitLab