diff --git a/CMakeLists.txt b/CMakeLists.txt index 409d8c7..efb2033 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,9 +19,11 @@ set (PROJECT_NAME cameradar) project (${PROJECT_NAME}) +message ("Here") + set (${PROJECT_NAME}_VERSION_MAJOR 1) set (${PROJECT_NAME}_VERSION_MINOR 0) -set (${PROJECT_NAME}_VERSION_PATCH 0) +set (${PROJECT_NAME}_VERSION_PATCH 1) set (${PROJECT_NAME}_SUFFIX "-beta") set (${PROJECT_NAME}_VERSION "${${PROJECT_NAME}_VERSION_MAJOR}.${${PROJECT_NAME}_VERSION_MINOR}.${${PROJECT_NAME}_VERSION_PATCH}${${PROJECT_NAME}_SUFFIX}") @@ -103,6 +105,7 @@ set (${CAMERADAR_LIBRARIES} "") #build cache managers add_subdirectory (deps) +message ("Debug") add_subdirectory (cameradar_standalone) add_subdirectory (cache_managers) diff --git a/README.md b/README.md index 6d2bb9d..561caa7 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ## An RTSP surveillance camera access multitool [![cameradar License](https://img.shields.io/badge/license-Apache-blue.svg)](#license) -[![Latest release](https://img.shields.io/badge/release-1.0.0-green.svg)](https://github.com/EtixLabs/cameradar/releases/latest) +[![Latest release](https://img.shields.io/badge/release-1.0.1-green.svg)](https://github.com/EtixLabs/cameradar/releases/latest) #### Cameradar allows you to: @@ -70,6 +70,7 @@ To install Cameradar you will need these packages * git (`git`) * gstreamer1.x (`libgstreamer1.0-dev`) * ffmpeg (`ffmpeg`) +* boost (`libboost-all-dev`) * libcurl (`libcurl4-openssl-dev`) ### Steps diff --git a/cmake/boost.cmake b/cmake/boost.cmake deleted file mode 100644 index e88baae..0000000 --- a/cmake/boost.cmake +++ /dev/null @@ -1,91 +0,0 @@ -## Copyright 2016 Etix Labs -## -## Licensed under the Apache License, Version 2.0 (the "License"); -## you may not use this file except in compliance with the License. -## You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. - -message(STATUS "Configuring deps.boost") - -set(BOOST_VERSION 1.60.0) -# set(BoostSHA1 2fc96c1651ac6fe9859b678b165bd78dc211e881) - -# Set up general b2 (bjam) command line arguments -set(b2Args /b2 - # link=static - threading=multi - runtime-link=shared - --layout=tagged - --build-dir=build - --without-wave - --without-python - stage - -d+2 -) - -if(TARGET_ARCH STREQUAL "x86_64") - list(APPEND b2Args address-model=64) -endif() - -string(REPLACE "." "_" BOOST_VERSION_UNDERSCORE ${BOOST_VERSION}) - -set(BOOST_DIR boost) -set(BOOST_PATH ${DEPS_DIR}/${BOOST_DIR}) - -# Set up build steps -include(ExternalProject) -ExternalProject_Add( - deps.boost - PREFIX ${BOOST_PATH} - URL http://sourceforge.net/projects/boost/files/boost/${BOOST_VERSION}/boost_${BOOST_VERSION_UNDERSCORE}.tar.bz2/download - TIMEOUT 600 - CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory /build - BUILD_COMMAND "${b2Args}" - # BUILD_COMMAND "/b2 address-model=64 threading=multi runtime-link=shared --layout=tagged --build-dir=/build" - BUILD_IN_SOURCE ON - INSTALL_COMMAND "" - # INSTALL_COMMAND /b2 install --prefix=${BOOST_PATH} - LOG_DOWNLOAD ON - LOG_UPDATE ON - LOG_CONFIGURE ON - LOG_BUILD ON - LOG_TEST ON - LOG_INSTALL ON -) - -# Set extra step to build b2 (bjam) -set(b2Bootstrap "./bootstrap.sh") -ExternalProject_Add_Step( - deps.boost - make_b2 - COMMAND ${b2Bootstrap} - COMMENT "Building b2..." - DEPENDEES download - DEPENDERS configure - WORKING_DIRECTORY - LOG ON -) - - -ExternalProject_Get_Property(deps.boost SOURCE_DIR) -set(BOOST_INCLUDE_DIR ${SOURCE_DIR} PARENT_SCOPE) -set(BOOST_LIBRARY_DIR "${SOURCE_DIR}/stage/lib") -set(BOOST_LIBRARY_DIR ${BOOST_LIBRARY_DIR} PARENT_SCOPE) - -# list all the boost libraries .dylib/.so -file(GLOB BOOST_INSTALL_DEPENDENCIES "${BOOST_LIBRARY_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}boost_*${CMAKE_SHARED_LIBRARY_SUFFIX}") -list (APPEND CAMERADAR_INSTALL_DEPENDENCIES ${BOOST_INSTALL_DEPENDENCIES}) -# on linux -if (CMAKE_SYSTEM_NAME STREQUAL "Linux") - file(GLOB BOOST_INSTALL_DEPENDENCIES "${BOOST_LIBRARY_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}boost_*${CMAKE_SHARED_LIBRARY_SUFFIX}.${BOOST_VERSION}") - list (APPEND CAMERADAR_INSTALL_DEPENDENCIES ${BOOST_INSTALL_DEPENDENCIES}) -endif() - -set(CAMERADAR_INSTALL_DEPENDENCIES ${CAMERADAR_INSTALL_DEPENDENCIES} PARENT_SCOPE) diff --git a/deployment/Dockerfile b/deployment/Dockerfile index fe9b000..c459686 100644 --- a/deployment/Dockerfile +++ b/deployment/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:15.10 +FROM ubuntu:16.04 MAINTAINER brendan.leglaunec@etixgroup.com @@ -7,11 +7,12 @@ ENV LD_LIBRARY_PATH="/cameradar/libraries" RUN apt-get update && apt-get install -y \ nmap \ ffmpeg \ + libboost-all-dev \ libgstreamer1.0-dev \ gstreamer1.0-plugins-base \ gstreamer1.0-plugins-good \ libcurl4-openssl-dev \ - libmysqlclient18 \ + libmysqlclient20 \ mysql-client ADD cameradar_*_Release_Linux.tar.gz / diff --git a/deployment/cameradar_1.0.0-beta_Release_Linux.tar.gz b/deployment/cameradar_1.0.0-beta_Release_Linux.tar.gz deleted file mode 100644 index 61915b4..0000000 Binary files a/deployment/cameradar_1.0.0-beta_Release_Linux.tar.gz and /dev/null differ diff --git a/deployment/cameradar_1.0.1-beta_Release_Linux.tar.gz b/deployment/cameradar_1.0.1-beta_Release_Linux.tar.gz new file mode 100644 index 0000000..6eabee3 Binary files /dev/null and b/deployment/cameradar_1.0.1-beta_Release_Linux.tar.gz differ diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index 26f1905..9c4c276 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -17,7 +17,6 @@ cmake_minimum_required (VERSION 2.8.1) # Lib subdirectory include (jsoncpp) -include (boost) include (mysql_connector) set_directory_properties(PROPERTIES CLEAN_NO_CUSTOM ON)