Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

CMake: Attempt to fix compilation error on Windows after recent changes

Browse Source
This commit is contained in:
Sergey Sharybin
2015-09-17 14:17:00 +05:00
parent eca704f579
commit a712459603
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -2325,6 +2325,10 @@ if(WITH_IMAGE_OPENJPEG)
set(OPENJPEG_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/extern/libopenjpeg") set(OPENJPEG_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/extern/libopenjpeg")
set(OPENJPEG_DEFINES "-DOPJ_STATIC") set(OPENJPEG_DEFINES "-DOPJ_STATIC")
endif() endif()
# Special handling of Windows platform where openjpeg is always static.
if(WIN32)
set(OPENJPEG_DEFINES "-DOPJ_STATIC")
endif()
endif() endif()
if(WITH_IMAGE_REDCODE) if(WITH_IMAGE_REDCODE)

5
extern/libopenjpeg/CMakeLists.txt vendored
View File

@@ -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}) add_definitions(${OPENJPEG_DEFINES})
set(SRC set(SRC