diff options
| author | Martin Felke <martin.felke@googlemail.com> | 2018-09-01 00:08:00 +0300 |
|---|---|---|
| committer | Martin Felke <martin.felke@googlemail.com> | 2018-09-01 00:08:00 +0300 |
| commit | 63bf87364c0402e19e10004bdbf7756cbd8e84a2 (patch) | |
| tree | 84e51af0e1954cf00691b54f2c798e537a094247 /CMakeLists.txt | |
| parent | 433fac8f1e85286d008f634f5b18f5d4dc123937 (diff) | |
| parent | ac9e1e692cecc98f3547386cfee5eb7d9df3b8a4 (diff) | |
Merge remote-tracking branch 'origin/blender2.8' into fracture_modifier-2.8
# Conflicts:
# release/scripts/addons
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1c2e9ab69a7..0379dff2db8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -166,6 +166,7 @@ option_defaults_init( _init_SDL _init_FFTW3 _init_OPENSUBDIV + _init_SYSTEM_OPENJPG ) # customize... @@ -182,11 +183,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() @@ -298,7 +301,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) @@ -1448,6 +1451,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 |