Adsk contrib - Fix issues when building OCIO with MS Visual Studio 2022

share/cmake/modules/FindExtPackages.cmake

@@ -100,7 +100,8 @@ if(OCIO_BUILD_PYTHON OR OCIO_BUILD_DOCS)
     if(OCIO_BUILD_PYTHON)
         # pybind11
         # https://github.com/pybind/pybind11
-        find_package(pybind11 2.6.1 REQUIRED)
+        # pybind11 2.9 fixes issues with MS Visual Studio 2022 (Debug).
+        find_package(pybind11 2.9.2 REQUIRED)
     endif()
 endif()
 

share/cmake/utils/CheckSupportGL.cmake

@@ -6,6 +6,7 @@
 # Define variables around the GL support.
 
 include(PackageUtils)
+include(SelectLibraryConfigurations)
 
 if((OCIO_BUILD_TESTS AND OCIO_BUILD_GPU_TESTS) OR OCIO_BUILD_APPS)
     set(OCIO_GL_ENABLED ON)
@@ -30,11 +31,40 @@ if((OCIO_BUILD_TESTS AND OCIO_BUILD_GPU_TESTS) OR OCIO_BUILD_APPS)
             endif()
         else()
             # Expected variables GLEW_LIBRARIES and GLEW_INCLUDE_DIRS are missing so create
-            # the mandatory one. Note that the cmake bug is now fixed (issue 19662).
+            # the mandatory one.
             if(NOT GLEW_LIBRARIES)
                 set(GLEW_LIBRARIES GLEW::GLEW)
             endif()
         endif()
+
+        # Cmake has a bug with FindGLEW. It fails to defined GLEW_INCLUDE_DIRS in some situation.
+        # See https://gitlab.kitware.com/cmake/cmake/-/issues/19662
+        # See a closed duplicate of 19662: https://gitlab.kitware.com/cmake/cmake/-/issues/20699
+        # Ported from vcpkg Glew package - https://github.com/microsoft/vcpkg/blob/master/ports/glew/vcpkg-cmake-wrapper.cmake
+        # The following code make sure that GLEW_INCLUDE_DIRS is set correctly.
+        if(MSVC AND GLEW_FOUND AND TARGET GLEW::GLEW AND NOT DEFINED GLEW_INCLUDE_DIRS)
+            get_target_property(GLEW_INCLUDE_DIRS GLEW::GLEW INTERFACE_INCLUDE_DIRECTORIES)
+            set(GLEW_INCLUDE_DIR ${GLEW_INCLUDE_DIRS})
+            get_target_property(_GLEW_DEFS GLEW::GLEW INTERFACE_COMPILE_DEFINITIONS)
+            if("${_GLEW_DEFS}" MATCHES "GLEW_STATIC")
+                get_target_property(GLEW_LIBRARY_DEBUG GLEW::GLEW IMPORTED_LOCATION_DEBUG)
+                get_target_property(GLEW_LIBRARY_RELEASE GLEW::GLEW IMPORTED_LOCATION_RELEASE)
+            else()
+                get_target_property(GLEW_LIBRARY_DEBUG GLEW::GLEW IMPORTED_IMPLIB_DEBUG)
+                get_target_property(GLEW_LIBRARY_RELEASE GLEW::GLEW IMPORTED_IMPLIB_RELEASE)
+            endif()
+            get_target_property(_GLEW_LINK_INTERFACE GLEW::GLEW IMPORTED_LINK_INTERFACE_LIBRARIES_RELEASE) # same for debug and release
+            list(APPEND GLEW_LIBRARIES ${_GLEW_LINK_INTERFACE})
+            list(APPEND GLEW_LIBRARY ${_GLEW_LINK_INTERFACE})
+            select_library_configurations(GLEW)
+            if("${_GLEW_DEFS}" MATCHES "GLEW_STATIC")
+                set(GLEW_STATIC_LIBRARIES ${GLEW_LIBRARIES})
+            else()
+                set(GLEW_SHARED_LIBRARIES ${GLEW_LIBRARIES})
+            endif()
+            unset(_GLEW_DEFS)
+            unset(_GLEW_LINK_INTERFACE)
+        endif()
     endif()
 
     find_package(GLUT)

src/apps/ocioconvert/CMakeLists.txt

@@ -17,6 +17,13 @@ add_executable(ocioconvert ${SOURCES})
 set_target_properties(ocioconvert PROPERTIES 
     COMPILE_FLAGS "${PLATFORM_COMPILE_FLAGS}")
 
+if (USE_MSVC)
+	# Temporary until fixed in OpenImageIO: Mute some warnings from OpenImageIO farmhash.h
+	# C4267 (level 3)	    'var' : conversion from 'size_t' to 'type', possible loss of data
+	# C4244	(level 3 & 4)	'conversion' conversion from 'type1' to 'type2', possible loss of data
+    target_compile_options(ocioconvert PRIVATE /wd4267 /wd4244)
+endif()
+
 target_link_libraries(ocioconvert
     PRIVATE
         apputils

src/apps/ociodisplay/CMakeLists.txt

@@ -21,6 +21,13 @@ endif()
 set_target_properties(ociodisplay PROPERTIES 
 	COMPILE_FLAGS "${CUSTOM_COMPILE_FLAGS}")
 
+if (USE_MSVC)
+	# Temporary until fixed in OpenImageIO: Mute some warnings from OpenImageIO farmhash.h
+	# C4267 (level 3)	    'var' : conversion from 'size_t' to 'type', possible loss of data
+	# C4244	(level 3 & 4)	'conversion' conversion from 'type1' to 'type2', possible loss of data
+	target_compile_options(ociodisplay PRIVATE /wd4267 /wd4244)
+endif()
+
 target_include_directories(ociodisplay 
 	SYSTEM
 	PRIVATE

src/apps/ociolutimage/CMakeLists.txt

@@ -10,6 +10,13 @@ add_executable(ociolutimage ${SOURCES})
 set_target_properties(ociolutimage PROPERTIES
 	COMPILE_FLAGS "${PLATFORM_COMPILE_FLAGS}")
 
+if (USE_MSVC)
+	# Temporary until fixed in OpenImageIO: Mute some warnings from OpenImageIO farmhash.h
+	# C4267 (level 3)	    'var' : conversion from 'size_t' to 'type', possible loss of data
+	# C4244	(level 3 & 4)	'conversion' conversion from 'type1' to 'type2', possible loss of data
+	target_compile_options(ociolutimage PRIVATE /wd4267 /wd4244)
+endif()
+
 target_link_libraries(ociolutimage
 	PRIVATE
 		apputils

src/libutils/oiiohelpers/CMakeLists.txt

@@ -20,6 +20,13 @@ set_target_properties(oiiohelpers PROPERTIES
     COMPILE_FLAGS "${PLATFORM_COMPILE_FLAGS}"
 )
 
+if (USE_MSVC)
+	# Temporary until fixed in OpenImageIO: Mute some warnings from OpenImageIO farmhash.h
+	# C4267 (level 3)	    'var' : conversion from 'size_t' to 'type', possible loss of data
+	# C4244	(level 3 & 4)	'conversion' conversion from 'type1' to 'type2', possible loss of data
+	target_compile_options(oiiohelpers PRIVATE /wd4267 /wd4244)
+endif()
+
 target_include_directories(oiiohelpers
     PUBLIC
         ${CMAKE_CURRENT_SOURCE_DIR}