Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2015-09-16 17:08:26 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-09-16 17:10:41 +0300
commit0b959458ffc9d253b088fbb61c1b701152c5f71b (patch)
tree45aac29cafdcd9df8618f09eb99d3d26026db10c /CMakeLists.txt
parent2d16622068d4662a24ab58a08f899b5228d5a81a (diff)
CMake: Don't modify global CFlags when enabling/disabling OpenJpeg
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5b68ef1c26a..01116eec429 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2320,9 +2320,10 @@ endif()
if(WITH_IMAGE_OPENJPEG)
if(WITH_SYSTEM_OPENJPEG)
# dealt with above
+ set(OPENJPEG_DEFINES "")
else()
set(OPENJPEG_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/extern/libopenjpeg")
- add_definitions(-DOPJ_STATIC)
+ set(OPENJPEG_DEFINES "-DOPJ_STATIC")
endif()
endif()