Update the generated CMake flags to fix a linking problem and generate also compressed archive releases

Author: kecsap

4_generate_generic_x86_64_package.sh

@@ -33,4 +33,8 @@ rm -rf debian/debhelper-build-stamp debian/files
 cmake . -DGIT_TAG=${TAG} -DGIT_COMMIT=${COMMIT} -DGIT_DATE=${DATE} -DPKG_SUFFIX=generic -DCMAKE_INSTALL_PREFIX=/usr -DPKG_ARCH=amd64 -DRELEASE_MODE=OFF
 dpkg-buildpackage -rfakeroot -b -nc
 
+# Make a plain tar file
+tar -C ./debian/tensorflow-cpp-generic/ -cf ../tensorflow-cpp-generic_${TAG}~git${DATE}~${COMMIT}.tar usr/
+pxz -9 ../tensorflow-cpp-generic_${TAG}~git${DATE}~${COMMIT}.tar
+
 echo READY! Generic x86_64 package is generated!

4_generate_optimized_x86_64_package.sh

@@ -33,4 +33,8 @@ rm -rf debian/debhelper-build-stamp debian/files
 cmake . -DGIT_TAG=${TAG} -DGIT_COMMIT=${COMMIT} -DGIT_DATE=${DATE} -DPKG_SUFFIX=optimized -DCMAKE_INSTALL_PREFIX=/usr -DPKG_ARCH=amd64 -DRELEASE_MODE=OFF
 dpkg-buildpackage -rfakeroot -b -nc
 
+# Make a plain tar file
+tar -C ./debian/tensorflow-cpp-optimized/ -cf ../tensorflow-cpp-optimized_${TAG}~git${DATE}~${COMMIT}.tar usr/
+pxz -9 ../tensorflow-cpp-optimized_${TAG}~git${DATE}~${COMMIT}.tar
+
 echo READY! Optimized x86_64 package is generated!

README.md

@@ -43,7 +43,7 @@ sudo apt-get install libdouble-conversion-dev libfarmhash-dev libre2-dev libgif-
 - Install Bazel: https://docs.bazel.build/versions/master/install-ubuntu.html
 - These build dependencies must be installed on **Ubuntu Bionic x86_64**:
 ```
-sudo apt-get install make g++ cmake git dpkg-dev debhelper quilt python3 autogen autoconf libtool fakeroot golang
+sudo apt-get install make g++ cmake git dpkg-dev debhelper quilt python3 autogen autoconf libtool fakeroot golang pxz
 ```
 
 - These build dependencies must be installed on **Raspberry Pi**:

packaging/CMakeLists.txt

@@ -34,9 +34,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 -lfarmhash")
+    SET(EXTRA_LIBS "-ltf_protos_cc -fopenmp -lpng16 -lsqlite3 -lsnappy -lgif -ldouble-conversion -llmdb -lre2 -ljpeg -lz -lfarmhash")
     SET(EXTRA_STATIC_LIBS "")
-    SET(EXTRA_DEPS ", libdouble-conversion-dev, libfarmhash-dev, libre2-dev, libgif-dev, libpng-dev, libsqlite3-dev, libsnappy-dev, liblmdb-dev")
+    SET(EXTRA_DEPS ", libdouble-conversion-dev, libfarmhash-dev, libre2-dev, libgif-dev, libpng-dev, libsqlite3-dev, libsnappy-dev, liblmdb-dev, libjpeg-dev")
   ELSE ()
     SET(EXTRA_LIBS "")
     SET(EXTRA_STATIC_LIBS "${CMAKE_INSTALL_PREFIX}/lib/tensorflow-cpp/libtf_protos_cc-static.a")
@@ -46,8 +46,8 @@ IF (NOT RELEASE_MODE)
   SET(TENSORFLOWCPP_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/include/tensorflow-cpp ${CMAKE_INSTALL_PREFIX}/include/tensorflow-cpp/external/nsync/public)
 
   SET(TENSORFLOWCPP_LIBS -Wl,-rpath=${CMAKE_INSTALL_PREFIX}/lib/tensorflow-cpp -L${CMAKE_INSTALL_PREFIX}/lib/tensorflow-cpp
-      -ltensorflow-core -Wl,--no-as-needed -lprotobuf-tf -Wl,--as-needed ${CMAKE_INSTALL_PREFIX}/lib/tensorflow-cpp/libnsync-tf.a
-      ${EXTRA_LIBS} -ldl -lpthread)
+      -ltensorflow-core -Wl,--no-as-needed -lprotobuf-tf ${CMAKE_INSTALL_PREFIX}/lib/tensorflow-cpp/libnsync-tf.a
+      ${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/libnsync-tf.a