From eef9c6f5623883b3dfcb48f5aaffe44e98e8f820 Mon Sep 17 00:00:00 2001 From: Brendan LE GLAUNEC Date: Sat, 21 May 2016 00:39:14 +0200 Subject: [PATCH] Deployment / CPack / Docker / Boost / Versionning --- CMakeLists.txt | 1 + .../deps.jsoncpp-build.cmake | 20 ----- .../deps.jsoncpp-configure.cmake | 20 ----- .../deps.jsoncpp-download-err.log | 0 .../deps.jsoncpp-download-out.log | 1 - .../deps.jsoncpp-download.cmake | 20 ----- .../deps.jsoncpp-gitinfo.txt | 3 - .../src/deps.jsoncpp-stamp/deps.jsoncpp-mkdir | 0 deps/jsoncpp/tmp/deps.jsoncpp-cfgcmd.txt | 1 - deps/jsoncpp/tmp/deps.jsoncpp-cfgcmd.txt.in | 1 - deps/jsoncpp/tmp/deps.jsoncpp-gitclone.cmake | 82 ------------------- 11 files changed, 1 insertion(+), 148 deletions(-) delete mode 100644 deps/jsoncpp/src/deps.jsoncpp-stamp/deps.jsoncpp-build.cmake delete mode 100644 deps/jsoncpp/src/deps.jsoncpp-stamp/deps.jsoncpp-configure.cmake delete mode 100644 deps/jsoncpp/src/deps.jsoncpp-stamp/deps.jsoncpp-download-err.log delete mode 100644 deps/jsoncpp/src/deps.jsoncpp-stamp/deps.jsoncpp-download-out.log delete mode 100644 deps/jsoncpp/src/deps.jsoncpp-stamp/deps.jsoncpp-download.cmake delete mode 100644 deps/jsoncpp/src/deps.jsoncpp-stamp/deps.jsoncpp-gitinfo.txt delete mode 100644 deps/jsoncpp/src/deps.jsoncpp-stamp/deps.jsoncpp-mkdir delete mode 100644 deps/jsoncpp/tmp/deps.jsoncpp-cfgcmd.txt delete mode 100644 deps/jsoncpp/tmp/deps.jsoncpp-cfgcmd.txt.in delete mode 100644 deps/jsoncpp/tmp/deps.jsoncpp-gitclone.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 961e449..1d4181c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -86,6 +86,7 @@ configure_file ( include_directories ( "cameradar_standalone/include" "deps/jsoncpp/src/deps.jsoncpp/include" + "deps/boost/src/deps.boost/include" ) #build cache managers diff --git a/deps/jsoncpp/src/deps.jsoncpp-stamp/deps.jsoncpp-build.cmake b/deps/jsoncpp/src/deps.jsoncpp-stamp/deps.jsoncpp-build.cmake deleted file mode 100644 index e9030d5..0000000 --- a/deps/jsoncpp/src/deps.jsoncpp-stamp/deps.jsoncpp-build.cmake +++ /dev/null @@ -1,20 +0,0 @@ - - -set(command "/usr/bin/make") -execute_process( - COMMAND ${command} - RESULT_VARIABLE result - OUTPUT_FILE "/home/ullaakut/Work/cameradar/deps/jsoncpp/src/deps.jsoncpp-stamp/deps.jsoncpp-build-out.log" - ERROR_FILE "/home/ullaakut/Work/cameradar/deps/jsoncpp/src/deps.jsoncpp-stamp/deps.jsoncpp-build-err.log" - ) -if(result) - set(msg "Command failed: ${result}\n") - foreach(arg IN LISTS command) - set(msg "${msg} '${arg}'") - endforeach() - set(msg "${msg}\nSee also\n /home/ullaakut/Work/cameradar/deps/jsoncpp/src/deps.jsoncpp-stamp/deps.jsoncpp-build-*.log") - message(FATAL_ERROR "${msg}") -else() - set(msg "deps.jsoncpp build command succeeded. See also /home/ullaakut/Work/cameradar/deps/jsoncpp/src/deps.jsoncpp-stamp/deps.jsoncpp-build-*.log") - message(STATUS "${msg}") -endif() diff --git a/deps/jsoncpp/src/deps.jsoncpp-stamp/deps.jsoncpp-configure.cmake b/deps/jsoncpp/src/deps.jsoncpp-stamp/deps.jsoncpp-configure.cmake deleted file mode 100644 index 0dc32a8..0000000 --- a/deps/jsoncpp/src/deps.jsoncpp-stamp/deps.jsoncpp-configure.cmake +++ /dev/null @@ -1,20 +0,0 @@ - - -set(command "/usr/bin/cmake;-DCMAKE_INSTALL_PREFIX=/home/ullaakut/Work/cameradar/deps/jsoncpp;-DBUILD_TYPE=Release;-DBUILD_STATIC_LIBS=OFF;-DBUILD_SHARED_LIBS=ON;-DJSONCPP_WITH_TESTS=OFF;-DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF;/home/ullaakut/Work/cameradar/deps/jsoncpp/src/deps.jsoncpp") -execute_process( - COMMAND ${command} - RESULT_VARIABLE result - OUTPUT_FILE "/home/ullaakut/Work/cameradar/deps/jsoncpp/src/deps.jsoncpp-stamp/deps.jsoncpp-configure-out.log" - ERROR_FILE "/home/ullaakut/Work/cameradar/deps/jsoncpp/src/deps.jsoncpp-stamp/deps.jsoncpp-configure-err.log" - ) -if(result) - set(msg "Command failed: ${result}\n") - foreach(arg IN LISTS command) - set(msg "${msg} '${arg}'") - endforeach() - set(msg "${msg}\nSee also\n /home/ullaakut/Work/cameradar/deps/jsoncpp/src/deps.jsoncpp-stamp/deps.jsoncpp-configure-*.log") - message(FATAL_ERROR "${msg}") -else() - set(msg "deps.jsoncpp configure command succeeded. See also /home/ullaakut/Work/cameradar/deps/jsoncpp/src/deps.jsoncpp-stamp/deps.jsoncpp-configure-*.log") - message(STATUS "${msg}") -endif() diff --git a/deps/jsoncpp/src/deps.jsoncpp-stamp/deps.jsoncpp-download-err.log b/deps/jsoncpp/src/deps.jsoncpp-stamp/deps.jsoncpp-download-err.log deleted file mode 100644 index e69de29..0000000 diff --git a/deps/jsoncpp/src/deps.jsoncpp-stamp/deps.jsoncpp-download-out.log b/deps/jsoncpp/src/deps.jsoncpp-stamp/deps.jsoncpp-download-out.log deleted file mode 100644 index 57f217e..0000000 --- a/deps/jsoncpp/src/deps.jsoncpp-stamp/deps.jsoncpp-download-out.log +++ /dev/null @@ -1 +0,0 @@ -Cloning into 'deps.jsoncpp'... diff --git a/deps/jsoncpp/src/deps.jsoncpp-stamp/deps.jsoncpp-download.cmake b/deps/jsoncpp/src/deps.jsoncpp-stamp/deps.jsoncpp-download.cmake deleted file mode 100644 index 237bce4..0000000 --- a/deps/jsoncpp/src/deps.jsoncpp-stamp/deps.jsoncpp-download.cmake +++ /dev/null @@ -1,20 +0,0 @@ - - -set(command "/usr/bin/cmake;-P;/home/ullaakut/Work/cameradar/deps/jsoncpp/tmp/deps.jsoncpp-gitclone.cmake") -execute_process( - COMMAND ${command} - RESULT_VARIABLE result - OUTPUT_FILE "/home/ullaakut/Work/cameradar/deps/jsoncpp/src/deps.jsoncpp-stamp/deps.jsoncpp-download-out.log" - ERROR_FILE "/home/ullaakut/Work/cameradar/deps/jsoncpp/src/deps.jsoncpp-stamp/deps.jsoncpp-download-err.log" - ) -if(result) - set(msg "Command failed: ${result}\n") - foreach(arg IN LISTS command) - set(msg "${msg} '${arg}'") - endforeach() - set(msg "${msg}\nSee also\n /home/ullaakut/Work/cameradar/deps/jsoncpp/src/deps.jsoncpp-stamp/deps.jsoncpp-download-*.log") - message(FATAL_ERROR "${msg}") -else() - set(msg "deps.jsoncpp download command succeeded. See also /home/ullaakut/Work/cameradar/deps/jsoncpp/src/deps.jsoncpp-stamp/deps.jsoncpp-download-*.log") - message(STATUS "${msg}") -endif() diff --git a/deps/jsoncpp/src/deps.jsoncpp-stamp/deps.jsoncpp-gitinfo.txt b/deps/jsoncpp/src/deps.jsoncpp-stamp/deps.jsoncpp-gitinfo.txt deleted file mode 100644 index 1e374c9..0000000 --- a/deps/jsoncpp/src/deps.jsoncpp-stamp/deps.jsoncpp-gitinfo.txt +++ /dev/null @@ -1,3 +0,0 @@ -repository='https://github.com/open-source-parsers/jsoncpp.git' -module='' -tag='' diff --git a/deps/jsoncpp/src/deps.jsoncpp-stamp/deps.jsoncpp-mkdir b/deps/jsoncpp/src/deps.jsoncpp-stamp/deps.jsoncpp-mkdir deleted file mode 100644 index e69de29..0000000 diff --git a/deps/jsoncpp/tmp/deps.jsoncpp-cfgcmd.txt b/deps/jsoncpp/tmp/deps.jsoncpp-cfgcmd.txt deleted file mode 100644 index 31a9b68..0000000 --- a/deps/jsoncpp/tmp/deps.jsoncpp-cfgcmd.txt +++ /dev/null @@ -1 +0,0 @@ -cmd='/usr/bin/cmake;-DCMAKE_INSTALL_PREFIX=/home/ullaakut/Work/cameradar/deps/jsoncpp;-DBUILD_TYPE=Release;-DBUILD_STATIC_LIBS=OFF;-DBUILD_SHARED_LIBS=ON;-DJSONCPP_WITH_TESTS=OFF;-DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF;' diff --git a/deps/jsoncpp/tmp/deps.jsoncpp-cfgcmd.txt.in b/deps/jsoncpp/tmp/deps.jsoncpp-cfgcmd.txt.in deleted file mode 100644 index b3f09ef..0000000 --- a/deps/jsoncpp/tmp/deps.jsoncpp-cfgcmd.txt.in +++ /dev/null @@ -1 +0,0 @@ -cmd='@cmd@' diff --git a/deps/jsoncpp/tmp/deps.jsoncpp-gitclone.cmake b/deps/jsoncpp/tmp/deps.jsoncpp-gitclone.cmake deleted file mode 100644 index 346dc0d..0000000 --- a/deps/jsoncpp/tmp/deps.jsoncpp-gitclone.cmake +++ /dev/null @@ -1,82 +0,0 @@ -if("master" STREQUAL "") - message(FATAL_ERROR "Tag for git checkout should not be empty.") -endif() - -set(run 0) - -if("/home/ullaakut/Work/cameradar/deps/jsoncpp/src/deps.jsoncpp-stamp/deps.jsoncpp-gitinfo.txt" IS_NEWER_THAN "/home/ullaakut/Work/cameradar/deps/jsoncpp/src/deps.jsoncpp-stamp/deps.jsoncpp-gitclone-lastrun.txt") - set(run 1) -endif() - -if(NOT run) - message(STATUS "Avoiding repeated git clone, stamp file is up to date: '/home/ullaakut/Work/cameradar/deps/jsoncpp/src/deps.jsoncpp-stamp/deps.jsoncpp-gitclone-lastrun.txt'") - return() -endif() - -execute_process( - COMMAND ${CMAKE_COMMAND} -E remove_directory "/home/ullaakut/Work/cameradar/deps/jsoncpp/src/deps.jsoncpp" - RESULT_VARIABLE error_code - ) -if(error_code) - message(FATAL_ERROR "Failed to remove directory: '/home/ullaakut/Work/cameradar/deps/jsoncpp/src/deps.jsoncpp'") -endif() - -# try the clone 3 times incase there is an odd git clone issue -set(error_code 1) -set(number_of_tries 0) -while(error_code AND number_of_tries LESS 3) - execute_process( - COMMAND "/usr/bin/git" clone "https://github.com/open-source-parsers/jsoncpp.git" "deps.jsoncpp" - WORKING_DIRECTORY "/home/ullaakut/Work/cameradar/deps/jsoncpp/src" - RESULT_VARIABLE error_code - ) - math(EXPR number_of_tries "${number_of_tries} + 1") -endwhile() -if(number_of_tries GREATER 1) - message(STATUS "Had to git clone more than once: - ${number_of_tries} times.") -endif() -if(error_code) - message(FATAL_ERROR "Failed to clone repository: 'https://github.com/open-source-parsers/jsoncpp.git'") -endif() - -execute_process( - COMMAND "/usr/bin/git" checkout master - WORKING_DIRECTORY "/home/ullaakut/Work/cameradar/deps/jsoncpp/src/deps.jsoncpp" - RESULT_VARIABLE error_code - ) -if(error_code) - message(FATAL_ERROR "Failed to checkout tag: 'master'") -endif() - -execute_process( - COMMAND "/usr/bin/git" submodule init - WORKING_DIRECTORY "/home/ullaakut/Work/cameradar/deps/jsoncpp/src/deps.jsoncpp" - RESULT_VARIABLE error_code - ) -if(error_code) - message(FATAL_ERROR "Failed to init submodules in: '/home/ullaakut/Work/cameradar/deps/jsoncpp/src/deps.jsoncpp'") -endif() - -execute_process( - COMMAND "/usr/bin/git" submodule update --recursive - WORKING_DIRECTORY "/home/ullaakut/Work/cameradar/deps/jsoncpp/src/deps.jsoncpp" - RESULT_VARIABLE error_code - ) -if(error_code) - message(FATAL_ERROR "Failed to update submodules in: '/home/ullaakut/Work/cameradar/deps/jsoncpp/src/deps.jsoncpp'") -endif() - -# Complete success, update the script-last-run stamp file: -# -execute_process( - COMMAND ${CMAKE_COMMAND} -E copy - "/home/ullaakut/Work/cameradar/deps/jsoncpp/src/deps.jsoncpp-stamp/deps.jsoncpp-gitinfo.txt" - "/home/ullaakut/Work/cameradar/deps/jsoncpp/src/deps.jsoncpp-stamp/deps.jsoncpp-gitclone-lastrun.txt" - WORKING_DIRECTORY "/home/ullaakut/Work/cameradar/deps/jsoncpp/src/deps.jsoncpp" - RESULT_VARIABLE error_code - ) -if(error_code) - message(FATAL_ERROR "Failed to copy script-last-run stamp file: '/home/ullaakut/Work/cameradar/deps/jsoncpp/src/deps.jsoncpp-stamp/deps.jsoncpp-gitclone-lastrun.txt'") -endif() -