[Bf-blender-cvs] [3bb6986] master: CMake: minor edits
Campbell Barton
noreply at git.blender.org
Tue Jun 30 14:55:20 CEST 2015
Commit: 3bb698646ad680b9c4f1a463a90b90454c25b76c
Author: Campbell Barton
Date: Tue Jun 30 22:44:27 2015 +1000
Branches: master
https://developer.blender.org/rB3bb698646ad680b9c4f1a463a90b90454c25b76c
CMake: minor edits
===================================================================
M CMakeLists.txt
M build_files/cmake/macros.cmake
M intern/cycles/kernel/CMakeLists.txt
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6216238..f710662 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 c739841..479dd31 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 18d1360..d0279b2 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}")
More information about the Bf-blender-cvs
mailing list