forked from bartvdbraak/blender
CMake: Attempt to fix compilation error on Windows after recent changes
This commit is contained in:
parent
eca704f579
commit
a712459603
@ -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)
|
||||
|
5
extern/libopenjpeg/CMakeLists.txt
vendored
5
extern/libopenjpeg/CMakeLists.txt
vendored
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user