sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

CMake: Don't modify global CFlags when enabling/disabling OpenJpeg

Browse Source
This commit is contained in:
Sergey Sharybin 2015-09-16 19:08:26 +05:00
parent 2d16622068
commit 0b959458ff
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -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()

3
extern/libopenjpeg/CMakeLists.txt vendored
View File

@ -31,10 +31,13 @@ set(INC_SYS
)
# TODO(sergey): Handle this via OPENJPEG_DEFINES
if(WIN32)
add_definitions(-DOPJ_STATIC)
endif()
add_definitions(${OPENJPEG_DEFINES})
set(SRC
bio.c
cio.c

2
source/blender/imbuf/CMakeLists.txt
View File

@ -120,7 +120,7 @@ if(WITH_IMAGE_OPENJPEG)
intern/jp2.c
)
add_definitions(-DWITH_OPENJPEG)
add_definitions(-DWITH_OPENJPEG ${OPENJPEG_DEFINES})
endif()
if(WITH_IMAGE_REDCODE)