Support for the Arch way of configuring nvcc -ccbin

.gitlab-ci.yml

@@ -25,12 +25,7 @@ stages:
 .build_template_def: &build_template
     stage: build
     script:
-        - pwd
         - export MAKEFLAGS=-j$(grep "core id" /proc/cpuinfo | wc -l)
-        # hack to set correct g++ for nvcc on jlk.fjfi.cvut.cz
-        - if [[ "$CI_RUNNER_DESCRIPTION" == "jlk.fjfi.cvut.cz" ]]; then
-                export CUDA_HOST_COMPILER="g++-6";
-          fi
         - mkdir -p "./$BUILD_TYPE"
         - pushd "./$BUILD_TYPE"
         - cmake ..

CMakeLists.txt

@@ -91,8 +91,13 @@ if( WITH_CUDA STREQUAL "yes" )
             message( "-- Setting CUDA_HOST_COMPILER to '$ENV{CUDA_HOST_COMPILER}'" )
             set( CUDA_HOST_COMPILER $ENV{CUDA_HOST_COMPILER} )
         else()
-            message( "-- Setting CUDA_HOST_COMPILER to '${CMAKE_CXX_COMPILER}'" )
-            set( CUDA_HOST_COMPILER ${CMAKE_CXX_COMPILER} )
+            if( EXISTS "${CUDA_TOOLKIT_ROOT_DIR}/bin/g++" )
+               message( "-- Setting CUDA_HOST_COMPILER to '${CUDA_TOOLKIT_ROOT_DIR}/bin/g++'" )
+               set( CUDA_HOST_COMPILER "${CUDA_TOOLKIT_ROOT_DIR}/bin/g++" )
+            else()
+               message( "-- Setting CUDA_HOST_COMPILER to '${CMAKE_CXX_COMPILER}'" )
+               set( CUDA_HOST_COMPILER ${CMAKE_CXX_COMPILER} )
+            endif()
         endif()
         set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} ;-DHAVE_CUDA)
         # disable false compiler warnings