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:
Diffstat (limited to 'source/blender/imbuf')
-rw-r--r--source/blender/imbuf/CMakeLists.txt13
-rw-r--r--source/blender/imbuf/intern/oiio/CMakeLists.txt11
-rw-r--r--source/blender/imbuf/intern/openexr/CMakeLists.txt3
3 files changed, 27 insertions, 0 deletions
diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt
index b8d43b8e9c2..7aab644fc12 100644
--- a/source/blender/imbuf/CMakeLists.txt
+++ b/source/blender/imbuf/CMakeLists.txt
@@ -90,6 +90,9 @@ set(LIB
bf_intern_guardedalloc
bf_intern_memutil
bf_intern_opencolorio
+
+ ${PNG_LIBRARIES}
+ ${JPEG_LIBRARIES}
)
if(WITH_IMAGE_OPENEXR)
@@ -110,6 +113,9 @@ if(WITH_IMAGE_TIFF)
list(APPEND SRC
intern/tiff.c
)
+ list(APPEND LIB
+ ${TIFF_LIBRARY}
+ )
add_definitions(-DWITH_TIFF)
endif()
@@ -128,6 +134,9 @@ if(WITH_IMAGE_OPENJPEG)
list(APPEND SRC
intern/jp2.c
)
+ list(APPEND LIB
+ ${OPENJPEG_LIBRARIES}
+ )
add_definitions(-DWITH_OPENJPEG ${OPENJPEG_DEFINES})
endif()
@@ -149,6 +158,10 @@ if(WITH_CODEC_FFMPEG)
list(APPEND INC_SYS
${FFMPEG_INCLUDE_DIRS}
)
+ list(APPEND LIB
+ ${FFMPEG_LIBRARIES}
+ ${OPENJPEG_LIBRARIES}
+ )
add_definitions(-DWITH_FFMPEG)
remove_strict_c_flags_file(
diff --git a/source/blender/imbuf/intern/oiio/CMakeLists.txt b/source/blender/imbuf/intern/oiio/CMakeLists.txt
index 984e62bc75a..211b6a0b40e 100644
--- a/source/blender/imbuf/intern/oiio/CMakeLists.txt
+++ b/source/blender/imbuf/intern/oiio/CMakeLists.txt
@@ -47,11 +47,22 @@ if(WITH_OPENIMAGEIO)
${OPENIMAGEIO_INCLUDE_DIRS}
${BOOST_INCLUDE_DIR}
)
+ list(APPEND LIB
+ ${OPENIMAGEIO_LIBRARIES}
+ )
if(WITH_IMAGE_OPENEXR)
list(APPEND INC_SYS
${OPENEXR_INCLUDE_DIRS}
)
+ list(APPEND LIB
+ ${OPENEXR_LIBRARIES}
+ )
endif()
+
+ list(APPEND LIB
+ ${BOOST_LIBRARIES}
+ )
+
add_definitions(-DWITH_OPENIMAGEIO)
endif()
diff --git a/source/blender/imbuf/intern/openexr/CMakeLists.txt b/source/blender/imbuf/intern/openexr/CMakeLists.txt
index fc584ace81e..a84f31c7025 100644
--- a/source/blender/imbuf/intern/openexr/CMakeLists.txt
+++ b/source/blender/imbuf/intern/openexr/CMakeLists.txt
@@ -47,6 +47,9 @@ if(WITH_IMAGE_OPENEXR)
list(APPEND INC_SYS
${OPENEXR_INCLUDE_DIRS}
)
+ list(APPEND LIB
+ ${OPENEXR_LIBRARIES}
+ )
add_definitions(-DWITH_OPENEXR)
endif()