remove EXCLUDE_FROM_ALL and use make install for building libv4l2cpp

.circleci/config.yml

@@ -9,8 +9,7 @@ jobs:
       - run: apt-get update; apt-get install -y --no-install-recommends cmake autoconf automake libtool git make g++ liblog4cpp5-dev liblivemedia-dev
       - run: cmake . && make
       - run: cpack .
-      - run: cpack -G TGZ .
-      - run: mkdir -p /distrib && cp *.deb /distrib && cp *.tar.gz /distrib
+      - run: mkdir -p /distrib && cp *.deb /distrib 
       - persist_to_workspace:
           root: /
           paths:
@@ -27,8 +26,7 @@ jobs:
       - run: echo 'export PATH=${CIRCLE_WORKING_DIRECTORY}/rpi_tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin:$PATH' >> $BASH_ENV
       - run: cmake -DCMAKE_TOOLCHAIN_FILE=${CIRCLE_WORKING_DIRECTORY}/raspberry.toolchain . && make
       - run: cpack .
-      - run: cpack -G TGZ .
-      - run: mkdir -p /distrib && cp *.deb /distrib && cp *.tar.gz /distrib
+      - run: mkdir -p /distrib && cp *.deb /distrib 
       - persist_to_workspace:
           root: /
           paths:
@@ -43,8 +41,7 @@ jobs:
       - run: apt-get update; apt-get install -y --no-install-recommends cmake autoconf automake libtool git make g++-mips-linux-gnu
       - run: cmake -DCMAKE_TOOLCHAIN_FILE=${CIRCLE_WORKING_DIRECTORY}/mips.toolchain . && make
       - run: cpack .
-      - run: cpack -G TGZ .
-      - run: mkdir -p /distrib && cp *.deb /distrib && cp *.tar.gz /distrib
+      - run: mkdir -p /distrib && cp *.deb /distrib 
       - persist_to_workspace:
           root: /
           paths:

.travis.yml

@@ -38,21 +38,18 @@ script:
   #build 
   - make 
   - cpack .
-  - cpack -G TGZ .
   #run coverage test
   - if [ "$COVERAGE" != "" ]; then cmake -DCOVERAGE=ON . && make && make test; fi
 after_success:
   - if [ "$COVERAGE" != "" ]; then coveralls --gcov-options '\-lp'; fi
 before_deploy:
   - export RELEASE_DEB_FILE=$(ls *.deb)
-  - export RELEASE_TGZ_FILE=$(ls *.tar.gz)
 deploy:
   provider: releases
   api_key:
     secure: gcQy7QO09vfGtcRMi8D+6VykDfK1tuz1jEZRmJER6eZ0p2gRi4F6mtsMRJWt3QsKkZQWkJpPTvCfv9GyNmWTrZV746y5QVnd+mjPx+6K/LgroK4LWgOgzJ6zQ6qfDKU80GbxJOnNv9/HmIcxSCiactxS50tbvntqpBGCmiIL+4U=
   file: 
     - "${RELEASE_DEB_FILE}"
-    - "${RELEASE_TGZ_FILE}"
   skip_cleanup: true
   on:
     repo: mpromonet/v4l2rtspserver

CMakeLists.txt

@@ -40,11 +40,12 @@ message(STATUS "CMAKE_STAGING_PREFIX=${CMAKE_STAGING_PREFIX}")
 
 # v4l2wrapper
 include_directories("v4l2wrapper/inc")
-find_library(V4L2WRAPPER_LIBRARY libv4l2wrapper.a PATHS "." NO_CMAKE_FIND_ROOT_PATH)
+find_library(V4L2WRAPPER_LIBRARY libv4l2wrapper.a)
 if (NOT V4L2WRAPPER_LIBRARY)
         message(STATUS "Installing v4l2wrapper")
-        EXEC_PROGRAM("git submodule init && git submodule update && make -C v4l2wrapper CC=${CMAKE_C_COMPILER} PREFIX=${CMAKE_STAGING_PREFIX} && cp v4l2wrapper/libv4l2wrapper.a . && make -C v4l2wrapper clean")
-	find_library(V4L2WRAPPER_LIBRARY libv4l2wrapper.a PATHS "." NO_CMAKE_FIND_ROOT_PATH)
+        EXEC_PROGRAM("mkdir -p ${CMAKE_STAGING_PREFIX}/include/libv4l2cpp && mkdir -p ${CMAKE_STAGING_PREFIX}/lib")
+        EXEC_PROGRAM("git submodule init && git submodule update && make -C v4l2wrapper CC=${CMAKE_C_COMPILER} PREFIX=${CMAKE_STAGING_PREFIX} all install")
+	find_library(V4L2WRAPPER_LIBRARY libv4l2wrapper.a)
         message(STATUS "v4l2wrapper built in V4L2WRAPPER_LIBRARY=${V4L2WRAPPER_LIBRARY}")	
 endif (NOT V4L2WRAPPER_LIBRARY)
 target_link_libraries(${PROJECT_NAME} ${V4L2WRAPPER_LIBRARY})
@@ -115,19 +116,18 @@ if (SYSTEMD_FOUND)
 	message(STATUS "SystemD directory '${SYSTEMD_SERVICES_INSTALL_DIR}'")
 
 	configure_file(v4l2rtspserver.service.in ${CMAKE_CURRENT_BINARY_DIR}/v4l2rtspserver.service @ONLY)
-	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/v4l2rtspserver.service DESTINATION ${SYSTEMD_SERVICES_INSTALL_DIR} COMPONENT data EXCLUDE_FROM_ALL)
+        install(FILES ${CMAKE_CURRENT_BINARY_DIR}/v4l2rtspserver.service DESTINATION ${SYSTEMD_SERVICES_INSTALL_DIR} COMPONENT data)
 endif (SYSTEMD_FOUND)
 
 # package
-install (TARGETS ${PROJECT_NAME} DESTINATION bin COMPONENT bin)
+install (TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin COMPONENT bin)
 
 SET(CPACK_GENERATOR "DEB")
 SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "Michel Promonet") 
 SET(CPACK_PACKAGE_CONTACT "michel.promonet@free.fr") 
 SET(CPACK_SYSTEM_NAME ${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR})
 STRING(REGEX REPLACE ",$" "" CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}")
 set(CPACK_DEB_COMPONENT_INSTALL "ON")
-set(CPACK_ARCHIVE_COMPONENT_INSTALL "OFF")
 if(VERSION)
     SET(CPACK_PACKAGE_VERSION "${VERSION}")
 endif()