link s2geometry as static library (#120)

* use s2geometry's static library

rdsn @ 915cba58

-Subproject commit d72a91d24f8b25b9d9a7bea2a448ffa93611aafb
+Subproject commit 915cba584db8c83c891ab97fe3be71a3540bfec7

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/

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

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)
 

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

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