From 5e8a030a08b73a1fbd94ed11dcc51d26f1c27dad Mon Sep 17 00:00:00 2001 From: Ray Molenkamp Date: Mon, 27 Aug 2018 19:37:55 -0600 Subject: cmake: adjustments required for lib-upgrade on windows. --- CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 9e88c89cb0e..697f7345d4b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -167,6 +167,7 @@ option_defaults_init( _init_FFTW3 _init_GAMEENGINE _init_OPENSUBDIV + _init_SYSTEM_OPENJPG ) # customize... @@ -183,11 +184,13 @@ if(UNIX AND NOT APPLE) set(_init_SDL OFF) set(_init_FFTW3 OFF) set(_init_OPENSUBDIV OFF) + set(_init_SYSTEM_OPENJPG OFF) elseif(WIN32) set(_init_JACK OFF) elseif(APPLE) set(_init_JACK OFF) set(_init_OPENSUBDIV OFF) + set(_init_SYSTEM_OPENJPG OFF) endif() @@ -302,7 +305,7 @@ endif() # (unix defaults to System OpenJPEG On) -option(WITH_SYSTEM_OPENJPEG "Use the operating systems OpenJPEG library" OFF) +option(WITH_SYSTEM_OPENJPEG "Use the operating systems OpenJPEG library" ${_init_SYSTEM_OPENJPG}) if(UNIX AND NOT APPLE) option(WITH_SYSTEM_EIGEN3 "Use the systems Eigen3 library" OFF) -- cgit v1.2.3 From 6fa7fa6671c9e7cf9baad54b0f0861755b43f2b1 Mon Sep 17 00:00:00 2001 From: mano-wii Date: Wed, 29 Aug 2018 13:08:00 -0300 Subject: MSVC: Set the warning C4189 from level 4 to level 3 This is a useful warning and there is an equivalent used in `GNUC` and `clang` compilers. Reviewed on IRC by @brecht and @LazyDodo --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index ccc6a1e9d14..7e3b1c79da4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1450,6 +1450,7 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "MSVC") # warning level: "/W3" "/w34062" # switch statement contains 'default' but no 'case' labels + "/w34189" # local variable is initialized but not referenced # disable: "/wd4018" # signed/unsigned mismatch "/wd4146" # unary minus operator applied to unsigned type, result still unsigned -- cgit v1.2.3