forked from bartvdbraak/blender
CMake: Don't modify global CFlags when enabling/disabling OpenJpeg
This commit is contained in:
parent
2d16622068
commit
0b959458ff
@ -2320,9 +2320,10 @@ endif()
|
|||||||
if(WITH_IMAGE_OPENJPEG)
|
if(WITH_IMAGE_OPENJPEG)
|
||||||
if(WITH_SYSTEM_OPENJPEG)
|
if(WITH_SYSTEM_OPENJPEG)
|
||||||
# dealt with above
|
# dealt with above
|
||||||
|
set(OPENJPEG_DEFINES "")
|
||||||
else()
|
else()
|
||||||
set(OPENJPEG_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/extern/libopenjpeg")
|
set(OPENJPEG_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/extern/libopenjpeg")
|
||||||
add_definitions(-DOPJ_STATIC)
|
set(OPENJPEG_DEFINES "-DOPJ_STATIC")
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
3
extern/libopenjpeg/CMakeLists.txt
vendored
3
extern/libopenjpeg/CMakeLists.txt
vendored
@ -31,10 +31,13 @@ set(INC_SYS
|
|||||||
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# TODO(sergey): Handle this via OPENJPEG_DEFINES
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
add_definitions(-DOPJ_STATIC)
|
add_definitions(-DOPJ_STATIC)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
add_definitions(${OPENJPEG_DEFINES})
|
||||||
|
|
||||||
set(SRC
|
set(SRC
|
||||||
bio.c
|
bio.c
|
||||||
cio.c
|
cio.c
|
||||||
|
@ -120,7 +120,7 @@ if(WITH_IMAGE_OPENJPEG)
|
|||||||
intern/jp2.c
|
intern/jp2.c
|
||||||
)
|
)
|
||||||
|
|
||||||
add_definitions(-DWITH_OPENJPEG)
|
add_definitions(-DWITH_OPENJPEG ${OPENJPEG_DEFINES})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(WITH_IMAGE_REDCODE)
|
if(WITH_IMAGE_REDCODE)
|
||||||
|
Loading…
Reference in New Issue
Block a user