[Bf-blender-cvs] [672d7d2d9cb] master: Cleanup: indentation

Campbell Barton noreply at git.blender.org
Wed Feb 13 22:49:47 CET 2019


Commit: 672d7d2d9cb74a8c9e1d698246f3600a43ce1345
Author: Campbell Barton
Date:   Thu Feb 14 08:43:44 2019 +1100
Branches: master
https://developer.blender.org/rB672d7d2d9cb74a8c9e1d698246f3600a43ce1345

Cleanup: indentation

===================================================================

M	build_files/cmake/macros.cmake
M	build_files/cmake/platform/platform_apple.cmake

===================================================================

diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index 5b6e3fa0011..9d1baaa24fd 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -1393,7 +1393,7 @@ function(find_python_package
 		   NO_DEFAULT_PATH
 		)
 
-		 if(NOT EXISTS "${PYTHON_${_upper_package}_PATH}")
+		if(NOT EXISTS "${PYTHON_${_upper_package}_PATH}")
 			message(WARNING
 				"Python package '${package}' path could not be found in:\n"
 				"'${PYTHON_LIBPATH}/python${PYTHON_VERSION}/site-packages/${package}', "
diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake
index 2bd9056d1a7..6c0257b10a0 100644
--- a/build_files/cmake/platform/platform_apple.cmake
+++ b/build_files/cmake/platform/platform_apple.cmake
@@ -394,16 +394,15 @@ if(WITH_OPENMP)
 		set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L${LIBDIR}/openmp/lib -lomp")
 
 		# Copy libomp.dylib to allow executables like datatoc to work.
-    if(CMAKE_MAKE_PROGRAM MATCHES "xcodebuild")
-      set(OPENMP_DYLIB_AUX_PATH "${CMAKE_BINARY_DIR}/bin")
-    else()
-      set(OPENMP_DYLIB_AUX_PATH "${CMAKE_BINARY_DIR}")
-    endif()
-
-    execute_process(
-      COMMAND mkdir -p ${OPENMP_DYLIB_AUX_PATH}/Resources/lib
-      COMMAND cp -p ${LIBDIR}/openmp/lib/libomp.dylib ${OPENMP_DYLIB_AUX_PATH}/Resources/lib/libomp.dylib
-      )
+		if(CMAKE_MAKE_PROGRAM MATCHES "xcodebuild")
+			set(OPENMP_DYLIB_AUX_PATH "${CMAKE_BINARY_DIR}/bin")
+		else()
+			set(OPENMP_DYLIB_AUX_PATH "${CMAKE_BINARY_DIR}")
+		endif()
+
+		execute_process(
+				COMMAND mkdir -p ${OPENMP_DYLIB_AUX_PATH}/Resources/lib
+				COMMAND cp -p ${LIBDIR}/openmp/lib/libomp.dylib ${OPENMP_DYLIB_AUX_PATH}/Resources/lib/libomp.dylib)
 	endif()
 endif()



More information about the Bf-blender-cvs mailing list