Commit 79ff645b authored by Tomáš Oberhuber's avatar Tomáš Oberhuber
Browse files

Merge branch 'develop' of geraldine.fjfi.cvut.cz:/local/projects/tnl/tnl into develop

parents f6a084f9 bae182b2

CMakeLists.txt

+4 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
# Vladimir Klement

# Jakub Klinkovsky



cmake_minimum_required( VERSION 3.0 )

cmake_minimum_required( VERSION 3.4 )



project( tnl )
@@ -111,6 +111,9 @@ if( WITH_CUDA STREQUAL "yes" ) 
        set( CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} ; ${CUDA_ARCH} )

        # TODO: this is necessary only due to a bug in cmake

        set( CUDA_ADD_LIBRARY_OPTIONS -shared )

        # TODO: workaround for a bug in cmake 3.5.0

        set( CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} ; -ccbin "${CMAKE_CXX_COMPILER}" )

        set( CUDA_HOST_COMPILER "" )



        ####

        # Check for cuBLAS