Commit e84c7e35 authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Support for the Arch way of configuring nvcc -ccbin

parent 96197d55

.gitlab-ci.yml

+0 −5
Original line number Diff line number Diff line
@@ -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

+7 −2
Original line number Diff line number Diff line
@@ -90,10 +90,15 @@ if( WITH_CUDA STREQUAL "yes" ) 
        if( NOT $ENV{CUDA_HOST_COMPILER} STREQUAL "" )

            message( "-- Setting CUDA_HOST_COMPILER to '$ENV{CUDA_HOST_COMPILER}'" )

            set( CUDA_HOST_COMPILER $ENV{CUDA_HOST_COMPILER} )

        else()

            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

        #   reference for the -Xcudafe flag: http://stackoverflow.com/questions/14831051/how-to-disable-compiler-warnings-with-nvcc/17095910#17095910