[Bf-blender-cvs] [1509d2ba7d1] master: Cleanup: Fix whitespace changes
Ray Molenkamp
noreply at git.blender.org
Sun Sep 13 00:06:30 CEST 2020
Commit: 1509d2ba7d126a7f02f18b89fd2b2647b515ca42
Author: Ray Molenkamp
Date: Sat Sep 12 16:06:24 2020 -0600
Branches: master
https://developer.blender.org/rB1509d2ba7d126a7f02f18b89fd2b2647b515ca42
Cleanup: Fix whitespace changes
Introduced in rB40dcf686f04f7db8110f9c85621eb8a0bd764080
===================================================================
M CMakeLists.txt
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5f1e84dd6df..602616ca286 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -546,14 +546,14 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\LLVM\\LLVM;]/lib/clang/6.0.0/lib/windows
)
elseif(APPLE)
- execute_process(COMMAND ${CMAKE_CXX_COMPILER}
- -print-file-name=lib
+ execute_process(COMMAND ${CMAKE_CXX_COMPILER}
+ -print-file-name=lib
OUTPUT_VARIABLE CLANG_LIB_DIR
)
string(STRIP "${CLANG_LIB_DIR}" CLANG_LIB_DIR)
find_library(
COMPILER_ASAN_LIBRARY NAMES libclang_rt.asan_osx_dynamic.dylib
- PATHS
+ PATHS
"${CLANG_LIB_DIR}/darwin/"
)
unset(CLANG_LIB_DIR)
@@ -1610,7 +1610,7 @@ if(MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++17")
# Make MSVC properly report the value of the __cplusplus preprocessor macro
# Available MSVC 15.7 (1914) and up, without this it reports 199711L regardless
- # of the C++ standard chosen above
+ # of the C++ standard chosen above
if(MSVC_VERSION GREATER 1913)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zc:__cplusplus")
endif()
More information about the Bf-blender-cvs
mailing list