diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2018-08-28 04:37:55 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2018-08-28 04:38:31 +0300 |
| commit | 5e8a030a08b73a1fbd94ed11dcc51d26f1c27dad (patch) | |
| tree | e3b803f98ea30bc97a70267fb736cea6d2cbe699 /CMakeLists.txt | |
| parent | 6dd394bf02b121a61fb8bdf153b778330a3d9320 (diff) | |
cmake: adjustments required for lib-upgrade on windows.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 5 |
1 files changed, 4 insertions, 1 deletions
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) |