fix dependencies of debian package

leosac · Dec 22, 2014 · 0305738 · 0305738
1 parent e5016bc
commit 0305738
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -6,7 +6,7 @@
 	url = https://github.com/xaqq/libpifacedigital.git
 [submodule "zmqpp"]
 	path = zmqpp
-	url = https://github.com/xaqq/zmqpp.git
+	url = https://github.com/zeromq/zmqpp.git
 [submodule "spdlog"]
 	path = spdlog
 	url = https://github.com/xaqq/spdlog.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -33,7 +33,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX11_FLAGS}")
 
 #Build Options
 option(LEOSAC_BUILD_MODULES "build-modules" ON)
-option(LEOSAC_BUILD_TESTS   "build-tests" ON)
+option(LEOSAC_BUILD_TESTS   "build-tests" OFF)
 option(LEOSAC_GPROF         "gprof" OFF)
 
 if(LEOSAC_GPROF)
@@ -54,13 +54,13 @@ add_subdirectory(zmqpp)
 add_subdirectory(src)
 add_subdirectory(cfg)
 
-#if(LEOSAC_BUILD_TESTS)
-#    enable_testing()
-#    add_subdirectory(test)
-#endif()
+if(LEOSAC_BUILD_TESTS)
+    enable_testing()
+    add_subdirectory(test)
+endif()
 # IDE hackfix, will always build test.
-enable_testing()
-add_subdirectory(test)
+#enable_testing()
+#add_subdirectory(test)
 
 file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/scripts/build_ipconfig.sh DESTINATION ${LEOSAC_BINARY_DIR})
 file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/scripts/load_ipconfig.sh DESTINATION ${LEOSAC_BINARY_DIR})

diff --git a/pkg/debian/control b/pkg/debian/control
@@ -7,5 +7,5 @@ Build-Depends: debhelper (>= 9), cmake, libtclap-dev, libboost-all-dev, g++ (>=
 
 Package: leosac
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libboost-all-dev, libtclap-dev,
+Depends: ${shlibs:Depends}, ${misc:Depends}, libboost-serialization1.49.0, libtclap-dev
 Description: open source access control
diff --git a/pkg/debian/rules b/pkg/debian/rules
@@ -14,6 +14,7 @@ override_dh_auto_configure:
 	dh_auto_configure -- -DLEOSAC_PLATFORM=None -DCMAKE_BUILD_TYPE=Release \
 	 -DZMQ_BUILD_TESTS=0 -DZMQPP_BUILD_STATIC=0 \
 	-DZMQPP_LIBZMQ_CMAKE=1 \
+	-DZEROMQ_LIB_DIR=`pwd`/libzmq/.libs/ \
         -DZEROMQ_INCLUDE_DIR=`pwd`/libzmq/include
 
 

diff --git a/zmqpp b/zmqpp
+14 −22		.travis.yml
+1 −0		AUTHORS
+12 −3		CMakeLists.txt
+8 −8		Doxyfile
+8 −6		Makefile
+20 −2		README.md
+15 −4		examples/Makefile
+46 −0		examples/grasslands.cpp
+103 −0		examples/ironhouse.cpp
+141 −0		examples/ironhouse2.cpp
+104 −0		examples/stonehouse.cpp
+72 −0		examples/strawhouse.cpp
+82 −0		examples/woodhouse.cpp
+356 −0		src/tests/test_auth.cpp
+1 −1		src/zmqpp/actor.cpp
+361 −0		src/zmqpp/auth.cpp
+160 −0		src/zmqpp/auth.hpp
+1 −0		src/zmqpp/curve.hpp
+8 −2		src/zmqpp/inet.hpp
+6 −6		src/zmqpp/message.cpp
+1 −1		src/zmqpp/socket.cpp
+77 −0		src/zmqpp/zap_request.cpp
+122 −0		src/zmqpp/zap_request.hpp
+2 −0		src/zmqpp/zmqpp.hpp
+45 −0		travis.sh