From bf32c4c40844a648ed0bbd3de618ca64a5d428d1 Mon Sep 17 00:00:00 2001 From: hgdagon Date: Sat, 30 Apr 2022 08:40:48 -0700 Subject: [PATCH] Fixed `ASSIMP_WARNINGS_MAX` reference --- CMakeLists.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 711a05b2b..4ebf53d38 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -150,10 +150,12 @@ IF (WIN32) # Multibyte character set is deprecated since at least MSVC2015 (possibly earlier) ADD_DEFINITIONS( -DUNICODE -D_UNICODE ) ENDIF() + # Link statically against c/c++ lib to avoid missing redistriburable such as # "VCRUNTIME140.dll not found. Try reinstalling the app.", but give users # a choice to opt for the shared runtime if they want. option(USE_STATIC_CRT "Link against the static runtime libraries." OFF) + # The CMAKE_CXX_FLAGS vars can be overriden by some Visual Studio generators, so we use an alternative # global method here: if (${USE_STATIC_CRT}) @@ -328,15 +330,13 @@ ENDIF() IF (ASSIMP_WARNINGS_AS_ERRORS) MESSAGE(STATUS "Treating all warnings as errors (for assimp library only)") - set(ASSIMP_ERROR_MAX ON) + set(ASSIMP_WARNINGS_MAX ON) IF (MSVC) - # TARGET_COMPILE_OPTIONS(assimp PRIVATE /WX) - # TARGET_COMPILE_OPTIONS(assimp_cmd PRIVATE /WX) - ADD_COMPILE_OPTIONS(/WX) + TARGET_COMPILE_OPTIONS(assimp PRIVATE /WX) + # ADD_COMPILE_OPTIONS(/WX) ELSE() - # TARGET_COMPILE_OPTIONS(assimp PRIVATE -Werror) - # TARGET_COMPILE_OPTIONS(assimp_cmd PRIVATE -Werror) - ADD_COMPILE_OPTIONS(-Werror) + TARGET_COMPILE_OPTIONS(assimp PRIVATE -Werror) + # ADD_COMPILE_OPTIONS(-Werror) ENDIF() ENDIF()