Skip to content
Snippets Groups Projects
Commit 275ffd5a authored by Nicolas Pope's avatar Nicolas Pope
Browse files

Remove gcc 7

parent 9cdff063
No related branches found
No related tags found
1 merge request!360Dockerfiles and docker dev environment
......@@ -49,7 +49,7 @@ MACRO( VERSION_STR_TO_INTS major minor patch version )
ENDMACRO( VERSION_STR_TO_INTS )
if (CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_CUDA_HOST_COMPILER gcc-7)
set(CMAKE_CUDA_HOST_COMPILER gcc)
endif()
find_package( OpenCV REQUIRED COMPONENTS core imgproc highgui cudaimgproc calib3d imgcodecs videoio aruco cudaarithm cudastereo cudaoptflow face tracking quality xfeatures2d)
......
......@@ -5,7 +5,7 @@ ARG DEBIAN_FRONTEND=noninteractive
ENV TZ=Europe/London
ENV NVIDIA_DRIVER_CAPABILITIES graphics,compute,utility,video
RUN apt-get update && apt-get upgrade -y &&\
RUN apt-get update &&\
# Install build tools, build dependencies and python
apt-get install --no-install-recommends -y \
build-essential \
......@@ -20,7 +20,6 @@ RUN apt-get update && apt-get upgrade -y &&\
libreadline-dev \
libopus-dev \
libxtst-dev \
g++-7 \
libswscale-dev \
libtbb2 \
libtbb-dev \
......
......@@ -23,7 +23,7 @@ set(CMAKE_USE_RELATIVE_PATHS ON)
set(CMAKE_CXX_FLAGS_RELEASE)
if (CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_CUDA_HOST_COMPILER gcc-7)
set(CMAKE_CUDA_HOST_COMPILER gcc)
set(CMAKE_CUDA_FLAGS "--gpu-architecture=compute_61 -Xcompiler -fPIC -Xcompiler ${OpenMP_CXX_FLAGS} --expt-relaxed-constexpr")
set(CMAKE_CUDA_FLAGS_RELEASE "-O3")
else()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment