[Bf-blender-cvs] [eb997a9d7fc] cycles_path_guiding: Cleanup: code style

Brecht Van Lommel noreply at git.blender.org
Tue Sep 20 21:00:37 CEST 2022


Commit: eb997a9d7fccdd1b70b8dd1381cbce1289b83020
Author: Brecht Van Lommel
Date:   Tue Sep 20 18:03:01 2022 +0200
Branches: cycles_path_guiding
https://developer.blender.org/rBeb997a9d7fccdd1b70b8dd1381cbce1289b83020

Cleanup: code style

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

M	build_files/build_environment/cmake/embree.cmake
M	build_files/build_environment/cmake/openpgl.cmake

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

diff --git a/build_files/build_environment/cmake/embree.cmake b/build_files/build_environment/cmake/embree.cmake
index 9eb4a382b22..8c689cf000b 100644
--- a/build_files/build_environment/cmake/embree.cmake
+++ b/build_files/build_environment/cmake/embree.cmake
@@ -33,8 +33,8 @@ ExternalProject_Add(external_embree
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${EMBREE_HASH_TYPE}=${EMBREE_HASH}
   PREFIX ${BUILD_DIR}/embree
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/embree ${DEFAULT_CMAKE_FLAGS} ${EMBREE_EXTRA_ARGS}
   PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/embree/src/external_embree < ${PATCH_DIR}/embree.diff
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/embree ${DEFAULT_CMAKE_FLAGS} ${EMBREE_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/embree
 )
 
diff --git a/build_files/build_environment/cmake/openpgl.cmake b/build_files/build_environment/cmake/openpgl.cmake
index 13b9d807f31..e6b0cd8eb4a 100644
--- a/build_files/build_environment/cmake/openpgl.cmake
+++ b/build_files/build_environment/cmake/openpgl.cmake
@@ -35,7 +35,6 @@ add_dependencies(
 )
 
 if(WIN32)
-
   if(BUILD_MODE STREQUAL Release)
     ExternalProject_Add_Step(external_openpgl after_install
       COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openpgl ${HARVEST_TARGET}/openpgl



More information about the Bf-blender-cvs mailing list