[Bf-blender-cvs] [4fc4005f6b7] master: deps_builder: add missing openpgl config file

Ray Molenkamp noreply at git.blender.org
Tue Oct 11 17:14:16 CEST 2022


Commit: 4fc4005f6b70a428de4538a2cad42ceb292a306a
Author: Ray Molenkamp
Date:   Tue Oct 11 09:14:10 2022 -0600
Branches: master
https://developer.blender.org/rB4fc4005f6b70a428de4538a2cad42ceb292a306a

deps_builder: add missing openpgl config file

harvesting openpgl_Exports-debug.cmake was missing for
windows in the build script, and we manually added it
to svn when openpgl landed when we realized it was
missing.

This fixes the issue at the root of the problem, so
the file will not be missing for future updates.

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

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 e6b0cd8eb4a..18dd5c5399a 100644
--- a/build_files/build_environment/cmake/openpgl.cmake
+++ b/build_files/build_environment/cmake/openpgl.cmake
@@ -43,6 +43,7 @@ if(WIN32)
   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
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openpgl/lib/cmake/openpgl-${OPENPGL_SHORT_VERSION}/openpgl_Exports-debug.cmake ${HARVEST_TARGET}/openpgl/lib/cmake/openpgl-${OPENPGL_SHORT_VERSION}/openpgl_Exports-debug.cmake
       DEPENDEES install
     )
   endif()



More information about the Bf-blender-cvs mailing list