diff --git a/modules/find/FindCHAMELEON.cmake b/modules/find/FindCHAMELEON.cmake index 8b22f5b1dc03d97dd6036ec1095fc723a333bf4a..744026f8779415fe5228a73e3b9169bd961a97ff 100644 --- a/modules/find/FindCHAMELEON.cmake +++ b/modules/find/FindCHAMELEON.cmake @@ -312,11 +312,18 @@ if( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT CHAMELEON_FOUN mark_as_advanced(CUDA_SDK_ROOT_DIR) mark_as_advanced(CUDA_TOOLKIT_ROOT_DIR) mark_as_advanced(CUDA_VERBOSE_BUILD) + if(WIN32) + string(REPLACE ":" ";" _lib_env "$ENV{LIB}") + elseif(APPLE) + string(REPLACE ":" ";" _lib_env "$ENV{DYLD_LIBRARY_PATH}") + else() + string(REPLACE ":" ";" _lib_env "$ENV{LD_LIBRARY_PATH}") + endif() string(REGEX REPLACE "-l" "" CUDA_LIBS "${CUDA_LIBRARIES}") set(CUDA_LIBRARIES) foreach(_lib ${CUDA_LIBS}) find_library(CUDA_${_lib}_LIBRARY NAMES ${_lib} - HINTS ${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES} ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) + HINTS $ENV{CUDA_ROOT}/lib64 ${_lib_env} ${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES} ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) if (CUDA_${_lib}_LIBRARY) list(APPEND CUDA_LIBRARIES ${CUDA_${_lib}_LIBRARY}) endif() diff --git a/modules/find/FindMAGMA.cmake b/modules/find/FindMAGMA.cmake index fd20fdc3fa2451d76fd30fc649cc991658635972..96baef25f726b9affeca8bcb6ca5ffed6aa69dce 100644 --- a/modules/find/FindMAGMA.cmake +++ b/modules/find/FindMAGMA.cmake @@ -78,11 +78,18 @@ else() find_package(CUDA) endif() if( CUDA_FOUND ) + if(WIN32) + string(REPLACE ":" ";" _lib_env "$ENV{LIB}") + elseif(APPLE) + string(REPLACE ":" ";" _lib_env "$ENV{DYLD_LIBRARY_PATH}") + else() + string(REPLACE ":" ";" _lib_env "$ENV{LD_LIBRARY_PATH}") + endif() string(REGEX REPLACE "-l" "" CUDA_LIBS "${CUDA_LIBRARIES}") set(CUDA_LIBRARIES) foreach(_lib ${CUDA_LIBS}) find_library(CUDA_${_lib}_LIBRARY NAMES ${_lib} - HINTS ${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES} ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) + HINTS $ENV{CUDA_ROOT}/lib64 ${_lib_env} ${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES} ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) if (CUDA_${_lib}_LIBRARY) list(APPEND CUDA_LIBRARIES ${CUDA_${_lib}_LIBRARY}) endif() diff --git a/modules/find/FindPARSEC.cmake b/modules/find/FindPARSEC.cmake index cbd5762ec57e38694e5fdc0d8c0f3e2c30e299a2..c1e619842a8065ac303330db8fd7154e89128737 100644 --- a/modules/find/FindPARSEC.cmake +++ b/modules/find/FindPARSEC.cmake @@ -215,11 +215,18 @@ if (PARSEC_LOOK_FOR_CUDA) mark_as_advanced(CUDA_SDK_ROOT_DIR) mark_as_advanced(CUDA_TOOLKIT_ROOT_DIR) mark_as_advanced(CUDA_VERBOSE_BUILD) + if(WIN32) + string(REPLACE ":" ";" _lib_env "$ENV{LIB}") + elseif(APPLE) + string(REPLACE ":" ";" _lib_env "$ENV{DYLD_LIBRARY_PATH}") + else() + string(REPLACE ":" ";" _lib_env "$ENV{LD_LIBRARY_PATH}") + endif() string(REGEX REPLACE "-l" "" CUDA_LIBS "${CUDA_LIBRARIES}") set(CUDA_LIBRARIES) foreach(_lib ${CUDA_LIBS}) find_library(CUDA_${_lib}_LIBRARY NAMES ${_lib} - HINTS ${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES} ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) + HINTS $ENV{CUDA_ROOT}/lib64 ${_lib_env} ${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES} ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) if (CUDA_${_lib}_LIBRARY) list(APPEND CUDA_LIBRARIES ${CUDA_${_lib}_LIBRARY}) endif() diff --git a/modules/find/FindSTARPU.cmake b/modules/find/FindSTARPU.cmake index 1afb2096de38222bfe9be1ed647c8c6d113ba33b..87712db370d818032d5caffded135f45bdd50fbc 100644 --- a/modules/find/FindSTARPU.cmake +++ b/modules/find/FindSTARPU.cmake @@ -170,11 +170,18 @@ if (STARPU_LOOK_FOR_CUDA) mark_as_advanced(CUDA_SDK_ROOT_DIR) mark_as_advanced(CUDA_TOOLKIT_ROOT_DIR) mark_as_advanced(CUDA_VERBOSE_BUILD) + if(WIN32) + string(REPLACE ":" ";" _lib_env "$ENV{LIB}") + elseif(APPLE) + string(REPLACE ":" ";" _lib_env "$ENV{DYLD_LIBRARY_PATH}") + else() + string(REPLACE ":" ";" _lib_env "$ENV{LD_LIBRARY_PATH}") + endif() string(REGEX REPLACE "-l" "" CUDA_LIBS "${CUDA_LIBRARIES}") set(CUDA_LIBRARIES) foreach(_lib ${CUDA_LIBS}) find_library(CUDA_${_lib}_LIBRARY NAMES ${_lib} - HINTS ${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES} ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) + HINTS $ENV{CUDA_ROOT}/lib64 ${_lib_env} ${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES} ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) if (CUDA_${_lib}_LIBRARY) list(APPEND CUDA_LIBRARIES ${CUDA_${_lib}_LIBRARY}) endif()