Skip to content

Commit 1cdecf7

Browse files
Raise minimum CMake version to 3.16
This changelist raises the minimum CMake version to 3.16, allowing more modern CMake features to be leveraged in future pull requests. CMake 3.16 is the first version that natively supports Objective C++ files, which are an important component of the Metal Shading Language support in MaterialX.
1 parent 273b8a5 commit 1cdecf7

2 files changed

Lines changed: 8 additions & 10 deletions

File tree

CMakeLists.txt

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set(MATERIALX_BUILD_VERSION 9)
55
set(MATERIALX_LIBRARY_VERSION ${MATERIALX_MAJOR_VERSION}.${MATERIALX_MINOR_VERSION}.${MATERIALX_BUILD_VERSION})
66

77
# Cmake setup
8-
cmake_minimum_required(VERSION 3.5)
8+
cmake_minimum_required(VERSION 3.16)
99
set(CMAKE_CXX_STANDARD 14)
1010
set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
1111
set(CMAKE_MACOSX_RPATH ON)
@@ -339,14 +339,12 @@ if(MATERIALX_BUILD_JS)
339339
add_subdirectory(source/JsMaterialX)
340340
endif()
341341
342-
if(${CMAKE_VERSION} VERSION_GREATER "3.6.2")
343-
if(MATERIALX_BUILD_VIEWER)
344-
set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT MaterialXView)
345-
elseif(MATERIALX_BUILD_GRAPH_EDITOR)
346-
set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT MaterialXGraphEditor)
347-
elseif(MATERIALX_BUILD_TESTS)
348-
set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT MaterialXTest)
349-
endif()
342+
if(MATERIALX_BUILD_VIEWER)
343+
set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT MaterialXView)
344+
elseif(MATERIALX_BUILD_GRAPH_EDITOR)
345+
set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT MaterialXGraphEditor)
346+
elseif(MATERIALX_BUILD_TESTS)
347+
set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT MaterialXTest)
350348
endif()
351349
352350
# Install root-level documents

source/MaterialXGraphEditor/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ if (NOT IS_DIRECTORY "${DEAR_IMGUI_PREFIX}/backends")
99
endif()
1010

1111
if(MSVC)
12-
add_compile_options(-wd4100)
12+
add_compile_options(-wd4100 -wd4152 -wd4201 -wd4244 -wd4456)
1313
elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
1414
add_compile_options(-Wno-unused -Wno-deprecated -Wno-comment -Wno-unused-variable)
1515
elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")

0 commit comments

Comments
 (0)