From 23195e779152c553436c9a444c23efd248369583 Mon Sep 17 00:00:00 2001 From: Keli Li Date: Wed, 25 Sep 2024 10:30:25 -0400 Subject: [PATCH] revert cmake_minimum_required change --- CMakeLists.txt | 2 +- cmake/googletest.cmake | 8 +++++++- doc/build.md | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b7b2c4756e..dbdc901810 100644 --- a/CMakeLists.txt +++ b/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.13...3.30) +cmake_minimum_required(VERSION 3.13...3.17) project(maya-usd) diff --git a/cmake/googletest.cmake b/cmake/googletest.cmake index 3775389e81..16dba6d001 100644 --- a/cmake/googletest.cmake +++ b/cmake/googletest.cmake @@ -26,7 +26,13 @@ macro(fetch_googletest) file(TO_CMAKE_PATH ${CMAKE_MAKE_PROGRAM} CMAKE_MAKE_PROGRAM) # Set some options used when compiling googletest. - set(CMAKE_CXX_STANDARD 11) + + # USD updated to c++17 for USD v23.11 + if(USD_VERSION VERSION_GREATER_EQUAL "0.23.11") + set(CMAKE_CXX_STANDARD 17) + else() + set(CMAKE_CXX_STANDARD 11) + endif() set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_STANDARD_REQUIRED ON) if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") diff --git a/doc/build.md b/doc/build.md index b1152fcdb4..a5661965bc 100644 --- a/doc/build.md +++ b/doc/build.md @@ -12,7 +12,7 @@ Before building the project, consult the following table to ensure you use the r |:---------------------:|:-------------------------:|:------------------------------------------------------------:|:---------------------------:| | Operating System | Windows 10
Windows 11 | High Sierra (10.13)
Mojave (10.14)
Catalina (10.15)
Big Sur (11.2.x) | Rocky Linux 8.6 / Linux® Red Hat® Enterprise 8.6 WS | | Compiler Requirement| Maya 2024 (VS 2022)
Maya 2025 (VS 2022) | Maya 2024 (Xcode 13.4 or higher)
Maya 2025 (Xcode 13.4 or higher) | Maya 2024 (gcc 11.2.1)
Maya 2025 (gcc 11.2.1) | -| CMake Version (min/max) | 3.27.7...3.30 | 3.27.7...3.30 | 3.27.7...3.30 | +| CMake Version (min/max) | 3.13...3.30 | 3.13...3.30 | 3.13...3.30 | | Python | 3.10.8, 3.11.4 | 3.10.8, 3.11.4 | 3.10.8, 3.11.4 | | Python Packages | PyYAML, PySide, PyOpenGL | PyYAML, PySide2, PyOpenGL | PyYAML, PySide, PyOpenGL | | Build generator | Visual Studio, Ninja (Recommended) | XCode, Ninja (Recommended) | Ninja (Recommended) |