CMake: minor edits
This commit is contained in:
parent
c07bba1b05
commit
3bb698646a
|
@ -1115,12 +1115,12 @@ if(UNIX AND NOT APPLE)
|
|||
execute_process(
|
||||
COMMAND ${CMAKE_C_COMPILER} -fuse-ld=gold -Wl,--version
|
||||
ERROR_QUIET OUTPUT_VARIABLE LD_VERSION)
|
||||
if ("${LD_VERSION}" MATCHES "GNU gold")
|
||||
if("${LD_VERSION}" MATCHES "GNU gold")
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fuse-ld=gold")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fuse-ld=gold")
|
||||
else ()
|
||||
message(INFO "GNU gold linker isn't available, using the default system linker.")
|
||||
endif ()
|
||||
else()
|
||||
message(STATUS "GNU gold linker isn't available, using the default system linker.")
|
||||
endif()
|
||||
unset(LD_VERSION)
|
||||
|
||||
# CLang is the same as GCC for now.
|
||||
|
|
|
@ -48,7 +48,7 @@ macro(list_insert_before
|
|||
unset(_index)
|
||||
endmacro()
|
||||
|
||||
function (list_assert_duplicates
|
||||
function(list_assert_duplicates
|
||||
list_id
|
||||
)
|
||||
|
||||
|
|
|
@ -188,7 +188,7 @@ if(WITH_CYCLES_CUDA_BINARIES)
|
|||
endif()
|
||||
|
||||
# CUDA version
|
||||
execute_process (COMMAND ${CUDA_NVCC_EXECUTABLE} "--version" OUTPUT_VARIABLE NVCC_OUT)
|
||||
execute_process(COMMAND ${CUDA_NVCC_EXECUTABLE} "--version" OUTPUT_VARIABLE NVCC_OUT)
|
||||
string(REGEX REPLACE ".*release ([0-9]+)\\.([0-9]+).*" "\\1" CUDA_VERSION_MAJOR ${NVCC_OUT})
|
||||
string(REGEX REPLACE ".*release ([0-9]+)\\.([0-9]+).*" "\\2" CUDA_VERSION_MINOR ${NVCC_OUT})
|
||||
set(CUDA_VERSION "${CUDA_VERSION_MAJOR}${CUDA_VERSION_MINOR}")
|
||||
|
|
Loading…
Reference in New Issue