diff --git a/CMakeLists.txt b/CMakeLists.txt index 9d324e29..fac14719 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,16 +44,16 @@ include_directories( include ) -# C++11 support +# C++14 support include(CheckCXXCompilerFlag) -CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11) +CHECK_CXX_COMPILER_FLAG("-std=c++14" COMPILER_SUPPORTS_CXX14) CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X) -if(COMPILER_SUPPORTS_CXX11) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") +if(COMPILER_SUPPORTS_CXX14) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14") elseif(COMPILER_SUPPORTS_CXX0X) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") else() - message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.") + message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++14 support. Please use a different C++ compiler.") endif() set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") diff --git a/Vimba_installation_under_Linux.pdf b/Vimba_installation_under_Linux.pdf old mode 100644 new mode 100755 index dcd66ff3..7dc0e625 Binary files a/Vimba_installation_under_Linux.pdf and b/Vimba_installation_under_Linux.pdf differ diff --git a/Vimba_v3.1_Linux.tgz b/Vimba_v5.0_Linux.tgz old mode 100644 new mode 100755 similarity index 53% rename from Vimba_v3.1_Linux.tgz rename to Vimba_v5.0_Linux.tgz index 250cd331..e753fef1 Binary files a/Vimba_v3.1_Linux.tgz and b/Vimba_v5.0_Linux.tgz differ diff --git a/cfg/AvtVimbaCamera.cfg b/cfg/AvtVimbaCamera.cfg index 5115a16c..b2399564 100755 --- a/cfg/AvtVimbaCamera.cfg +++ b/cfg/AvtVimbaCamera.cfg @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 PACKAGE='avt_vimba_camera' NODE='avt_vimba_camera' diff --git a/cfg/AvtVimbaCameraStereo.cfg b/cfg/AvtVimbaCameraStereo.cfg index 3be23b47..32a9c50d 100755 --- a/cfg/AvtVimbaCameraStereo.cfg +++ b/cfg/AvtVimbaCameraStereo.cfg @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 PACKAGE='avt_vimba_camera' NODE='avt_vimba_camera' diff --git a/docker/checkout.bash b/docker/checkout.bash index fc94822c..5a33389c 100755 --- a/docker/checkout.bash +++ b/docker/checkout.bash @@ -36,8 +36,8 @@ while [[ $# -gt 0 ]]; do done if [[ "$BRANCH" = "develop" ]]; then - git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ~/src/carma-msgs --branch develop --depth 1 - git clone https://github.com/usdot-fhwa-stol/carma-utils.git ~/src/carma-utils --branch develop --depth 1 + git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ~/src/carma-msgs --branch $BRANCH --depth 1 + git clone https://github.com/usdot-fhwa-stol/carma-utils.git ~/src/carma-utils --branch $BRANCH --depth 1 else git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/carma-msgs --branch develop --depth 1 git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/carma-utils --branch develop --depth 1 diff --git a/docker/install.sh b/docker/install.sh index 95f40c45..74b75d0c 100755 --- a/docker/install.sh +++ b/docker/install.sh @@ -14,6 +14,6 @@ # License for the specific language governing permissions and limitations under # the License. -source /opt/ros/kinetic/setup.bash +source /opt/ros/noetic/setup.bash cd ~/ colcon build --cmake-args -DCMAKE_BUILD_TYPE=Release