[Bf-blender-cvs] [f7a57a5304e] cycles_path_guiding: deps: openpgl updates for windows.

[Ray Molenkamp]

Commit: f7a57a5304ebe8b35f34fbf6ad830ef52837fe65
Author: Ray Molenkamp
Date:   Wed Jun 22 13:07:48 2022 -0600
Branches: cycles_path_guiding
https://developer.blender.org/rBf7a57a5304ebe8b35f34fbf6ad830ef52837fe65

deps: openpgl updates for windows.

- tell the compiler to generate the _d postfix for debug
  libs, rather than renaming the openpgl.lib to openpgl_d.lib
  manually.
- enable the post install phase for windows.
- Small white space clean-up.

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

M	build_files/build_environment/cmake/openpgl.cmake

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

diff --git a/build_files/build_environment/cmake/openpgl.cmake b/build_files/build_environment/cmake/openpgl.cmake
index d83f70e7df0..13b9d807f31 100644
--- a/build_files/build_environment/cmake/openpgl.cmake
+++ b/build_files/build_environment/cmake/openpgl.cmake
@@ -4,11 +4,12 @@
 # library itself does not depend on them, so should give no problems.
 
 set(OPENPGL_EXTRA_ARGS
-    -DOPENPGL_BUILD_PYTHON=OFF  
+    -DOPENPGL_BUILD_PYTHON=OFF
     -DOPENPGL_BUILD_STATIC=ON
     -DOPENPGL_TBB_ROOT=${LIBDIR}/tbb
     -DTBB_ROOT=${LIBDIR}/tbb
     -Dembree_DIR=${LIBDIR}/embree/lib/cmake/embree-${EMBREE_VERSION}
+    -DCMAKE_DEBUG_POSTFIX=_d
 )
 
 if(TBB_STATIC_LIBRARY)
@@ -33,18 +34,17 @@ add_dependencies(
     external_embree
 )
 
-#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
-#      DEPENDEES install
-#    )
-#  else()
-#  ExternalProject_Add_Step(external_openpgl after_install
-#      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openpgl/lib/openpgl.lib ${HARVEST_TARGET}/openpgl/lib/openpgl_d.lib
-#      DEPENDEES install
-#    )
-#  endif()
-
-#endif()
+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
+      DEPENDEES install
+    )
+  else()
+  ExternalProject_Add_Step(external_openpgl after_install
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openpgl/lib/openpgl_d.lib ${HARVEST_TARGET}/openpgl/lib/openpgl_d.lib
+      DEPENDEES install
+    )
+  endif()
+endif()