Fix static linking and adding icu for dynamic linking

kecsap · May 10, 2019 · ff567c5 · ff567c5
1 parent b49510e
commit ff567c5
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/packaging/CMakeLists.txt b/packaging/CMakeLists.txt
@@ -39,9 +39,9 @@ IF (NOT RELEASE_MODE)
   ENDIF ()
 
   IF (${PKG_SUFFIX} STREQUAL "generic" OR ${PKG_SUFFIX} STREQUAL "optimized")
-    SET(EXTRA_LIBS "-ltf_protos_cc -fopenmp -lpng16 -lsqlite3 -lsnappy -lgif -ldouble-conversion -llmdb -lre2 -ljpeg -lz -lfarmhash")
+    SET(EXTRA_LIBS "-ltf_protos_cc -fopenmp -lpng16 -lsqlite3 -lsnappy -lgif -ldouble-conversion -llmdb -lre2 -ljpeg -lz -lfarmhash -licuuc")
     SET(EXTRA_STATIC_LIBS "")
-    SET(EXTRA_DEPS ", libdouble-conversion-dev, libfarmhash-dev, libre2-dev, libgif-dev, libpng-dev, libsqlite3-dev, libsnappy-dev, liblmdb-dev, libjpeg-dev")
+    SET(EXTRA_DEPS ", libdouble-conversion-dev, libfarmhash-dev, libre2-dev, libgif-dev, libpng-dev, libsqlite3-dev, libsnappy-dev, liblmdb-dev, libjpeg-dev, libicu-dev")
   ELSE ()
     SET(EXTRA_LIBS "")
     SET(EXTRA_STATIC_LIBS "${CMAKE_INSTALL_PREFIX}/lib/tensorflow-cpp/libtf_protos_cc-static.a")
@@ -56,7 +56,8 @@ IF (NOT RELEASE_MODE)
       ${EXTRA_LIBS} -Wl,--as-needed -ldl -lpthread)
   SET(TENSORFLOWCPP_STATIC_LIBS -Wl,-rpath=${CMAKE_INSTALL_PREFIX}/lib/tensorflow-cpp -L${CMAKE_INSTALL_PREFIX}/lib/tensorflow-cpp
       -Wl,--whole-archive ${CMAKE_INSTALL_PREFIX}/lib/tensorflow-cpp/libtensorflow-core-static.a ${EXTRA_STATIC_LIBS}
-      ${CMAKE_INSTALL_PREFIX}/lib/tensorflow-cpp/libprotobuf-tf-static.a -Wl,--no-whole-archive ${CMAKE_INSTALL_PREFIX}/lib/tensorflow-cpp/libabsl.a
+      ${CMAKE_INSTALL_PREFIX}/lib/tensorflow-cpp/libprotobuf-tf-static.a -Wl,--no-whole-archive -Wl,--allow-multiple-definition
+      ${CMAKE_INSTALL_PREFIX}/lib/tensorflow-cpp/libabsl.a
       ${CMAKE_INSTALL_PREFIX}/lib/tensorflow-cpp/libnsync-tf.a ${CMAKE_INSTALL_PREFIX}/lib/tensorflow-cpp/libnsync-cpp-tf.a
       ${EXTRA_LIBS} -ldl -lpthread)