[Bf-blender-cvs] [d17cb0f1074] tmp_libs_34: cmake: fix openjpeg version on windows.

Ray Molenkamp noreply at git.blender.org
Wed Oct 19 19:56:20 CEST 2022


Commit: d17cb0f1074e6972016574e21ab212feadea3b8f
Author: Ray Molenkamp
Date:   Wed Oct 19 11:56:13 2022 -0600
Branches: tmp_libs_34
https://developer.blender.org/rBd17cb0f1074e6972016574e21ab212feadea3b8f

cmake: fix openjpeg version on windows.

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

M	build_files/cmake/platform/platform_win32.cmake

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

diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake
index dc112a96ce2..5fb921fc97d 100644
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -683,7 +683,7 @@ if(WITH_IMAGE_OPENJPEG)
   if(NOT EXISTS "${OPENJPEG_INCLUDE_DIRS}")
     # when not found, could be an older lib folder with openjpeg 2.4
     # to ease the transition period, fall back if 2.5 is not found.
-    set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG}/include/openjpeg-2.3)
+    set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG}/include/openjpeg-2.4)
   endif()
   set(OPENJPEG_LIBRARIES ${OPENJPEG}/lib/openjp2.lib)
 endif()



More information about the Bf-blender-cvs mailing list