diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-09-17 12:17:00 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-09-17 12:17:00 +0300 |
| commit | a712459603be05fd3c25c12f7153755160259f54 (patch) | |
| tree | c47fcbf9008a23bf8cea594d99ee49683dfabc07 | |
| parent | eca704f579981b5d96f56999a298c0a74c3ef582 (diff) | |
CMake: Attempt to fix compilation error on Windows after recent changes
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | extern/libopenjpeg/CMakeLists.txt | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 01116eec429..deafa90dbb5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2325,6 +2325,10 @@ if(WITH_IMAGE_OPENJPEG) set(OPENJPEG_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/extern/libopenjpeg") set(OPENJPEG_DEFINES "-DOPJ_STATIC") endif() + # Special handling of Windows platform where openjpeg is always static. + if(WIN32) + set(OPENJPEG_DEFINES "-DOPJ_STATIC") + endif() endif() if(WITH_IMAGE_REDCODE) diff --git a/extern/libopenjpeg/CMakeLists.txt b/extern/libopenjpeg/CMakeLists.txt index 82eeb01b4d4..ad49eee25b6 100644 --- a/extern/libopenjpeg/CMakeLists.txt +++ b/extern/libopenjpeg/CMakeLists.txt @@ -31,11 +31,6 @@ set(INC_SYS ) -# TODO(sergey): Handle this via OPENJPEG_DEFINES -if(WIN32) - add_definitions(-DOPJ_STATIC) -endif() - add_definitions(${OPENJPEG_DEFINES}) set(SRC |