- Add policy support for CMake 4.0

- Fix Compiler errors on Visual Studio 2022

Author: hsabri-SMS

CMakeLists.txt

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-cmake_minimum_required(VERSION 3.21..3.30)
+cmake_minimum_required(VERSION 3.21...4.0)
 
 project(maya-hydra)
 

cmake/googletest_download.txt.in

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.12.0)
+cmake_minimum_required(VERSION 3.5...4.0)
 
 project(googletest-download NONE)
 
@@ -23,6 +23,7 @@ ExternalProject_Add(googletest
                     "-DBUILD_GMOCK=OFF"
                     "-DBUILD_SHARED_LIBS=ON"
                     "-DCMAKE_MACOSX_RPATH=ON"
+                    "-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
                     "-DCMAKE_POSITION_INDEPENDENT_CODE=ON"
                     "-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}"
                     "-DCMAKE_CXX_EXTENSIONS=${CMAKE_CXX_EXTENSIONS}"

cmake/googletest_src.txt.in

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.12.0)
+cmake_minimum_required(VERSION 3.5...4.0)
 
 project(googletest-download NONE)
 
@@ -20,6 +20,7 @@ ExternalProject_Add(googletest
                     "-DBUILD_GMOCK=OFF"
                     "-DBUILD_SHARED_LIBS=ON"
                     "-DCMAKE_MACOSX_RPATH=ON"
+                    "-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
                     "-DCMAKE_POSITION_INDEPENDENT_CODE=ON"
                     "-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}"
                     "-DCMAKE_CXX_EXTENSIONS=${CMAKE_CXX_EXTENSIONS}"

lib/flowViewport/sceneIndex/fvpDisplayStyleOverrideSceneIndex.h

@@ -22,6 +22,7 @@
 #include "pxr/imaging/hd/filteringSceneIndex.h"
 
 #include <set>
+#include <optional>
 
 namespace FVP_NS_DEF {
 

lib/mayaHydra/hydraExtensions/sceneIndex/mayaHydraMayaDataProducerSceneIndexData.h

@@ -27,6 +27,8 @@
 #include <ufe/sceneNotification.h>
 #include <ufe/transform3d.h>
 
+#include <optional>
+
 PXR_NAMESPACE_OPEN_SCOPE
 
 class MayaDataProducerSceneIndexData;

lib/mayaHydra/hydraExtensions/sceneIndex/mayaHydraMayaFilteringSceneIndexData.h

@@ -28,6 +28,8 @@
 #include <ufe/scene.h>
 #include <ufe/sceneNotification.h>
 
+#include <optional>
+
 PXR_NAMESPACE_OPEN_SCOPE
 
 class MayaFilteringSceneIndexData;

lib/mayaHydra/hydraExtensions/sceneIndex/mhMayaUsdProxyShapeSceneIndex.cpp

@@ -33,6 +33,8 @@
 #include <pxr/imaging/hd/instancerTopologySchema.h>
 #include <pxr/usdImaging/usdImaging/usdPrimInfoSchema.h>
 
+#include <optional>
+
 PXR_NAMESPACE_USING_DIRECTIVE
 
 namespace {