diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-06-30 15:44:27 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-06-30 15:44:27 +0300 |
| commit | 3bb698646ad680b9c4f1a463a90b90454c25b76c (patch) | |
| tree | 4c6032ffd0c6d6270f42bc4984e4ee92f204075c | |
| parent | c07bba1b05faf4d7ba0b129f1e178e3b2c6a8064 (diff) | |
CMake: minor edits
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | build_files/cmake/macros.cmake | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/CMakeLists.txt | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 62162388b35..f710662ec63 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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. diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index c7398415c59..479dd31b3f8 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -48,7 +48,7 @@ macro(list_insert_before unset(_index) endmacro() -function (list_assert_duplicates +function(list_assert_duplicates list_id ) diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt index 18d1360542c..d0279b27046 100644 --- a/intern/cycles/kernel/CMakeLists.txt +++ b/intern/cycles/kernel/CMakeLists.txt @@ -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}") |