diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-14 16:18:44 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-14 16:37:24 +0300 |
commit | 47adab4f993e66328bd1ad97abaf6697784ee8a0 (patch) | |
tree | 3eb7046a95b0ce3f2ad707764213df372f22abbd /source/blender/imbuf | |
parent | eee5a880f186fe9e49bd41a9dc7d6d0bdd371c36 (diff) |
CMake: prepare for BLENDER_SORTED_LIBS removal
No functional change, this adds LIB definition and args to cmake files.
Without this it's difficult to migrate away from 'BLENDER_SORTED_LIBS'
since there are many platforms/configurations that could break when
changing linking order.
Manually add and enable WITHOUT_SORTED_LIBS to try building
without sorted libs (currently fails since all variables are empty).
This check will eventually be removed.
See T46725.
Diffstat (limited to 'source/blender/imbuf')
-rw-r--r-- | source/blender/imbuf/CMakeLists.txt | 5 | ||||
-rw-r--r-- | source/blender/imbuf/intern/cineon/CMakeLists.txt | 5 | ||||
-rw-r--r-- | source/blender/imbuf/intern/dds/CMakeLists.txt | 5 | ||||
-rw-r--r-- | source/blender/imbuf/intern/oiio/CMakeLists.txt | 5 | ||||
-rw-r--r-- | source/blender/imbuf/intern/openexr/CMakeLists.txt | 5 |
5 files changed, 20 insertions, 5 deletions
diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt index dd020ffe1f2..87002e5efc0 100644 --- a/source/blender/imbuf/CMakeLists.txt +++ b/source/blender/imbuf/CMakeLists.txt @@ -83,6 +83,9 @@ set(SRC ../../../intern/ffmpeg/ffmpeg_compat.h ) +set(LIB +) + if(WITH_IMAGE_OPENEXR) add_definitions(-DWITH_OPENEXR) else() @@ -172,4 +175,4 @@ set_source_files_properties( PROPERTIES HEADER_FILE_ONLY TRUE ) -blender_add_lib(bf_imbuf "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_imbuf "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/imbuf/intern/cineon/CMakeLists.txt b/source/blender/imbuf/intern/cineon/CMakeLists.txt index 2a592aba860..2f6ca2793e3 100644 --- a/source/blender/imbuf/intern/cineon/CMakeLists.txt +++ b/source/blender/imbuf/intern/cineon/CMakeLists.txt @@ -45,8 +45,11 @@ set(SRC logmemfile.c ) +set(LIB +) + if(WITH_IMAGE_CINEON) add_definitions(-DWITH_CINEON) endif() -blender_add_lib(bf_imbuf_cineon "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_imbuf_cineon "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/imbuf/intern/dds/CMakeLists.txt b/source/blender/imbuf/intern/dds/CMakeLists.txt index 6728dbc758d..c68608f4cff 100644 --- a/source/blender/imbuf/intern/dds/CMakeLists.txt +++ b/source/blender/imbuf/intern/dds/CMakeLists.txt @@ -54,8 +54,11 @@ set(SRC dds_api.cpp ) +set(LIB +) + if(WITH_IMAGE_DDS) add_definitions(-DWITH_DDS) endif() -blender_add_lib(bf_imbuf_dds "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_imbuf_dds "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/imbuf/intern/oiio/CMakeLists.txt b/source/blender/imbuf/intern/oiio/CMakeLists.txt index 73438436abc..3311d3fd9b4 100644 --- a/source/blender/imbuf/intern/oiio/CMakeLists.txt +++ b/source/blender/imbuf/intern/oiio/CMakeLists.txt @@ -39,6 +39,9 @@ set(SRC openimageio_api.cpp ) +set(LIB +) + if(WITH_OPENIMAGEIO) list(APPEND INC_SYS ${OPENIMAGEIO_INCLUDE_DIRS} @@ -52,4 +55,4 @@ if(WITH_OPENIMAGEIO) add_definitions(-DWITH_OPENIMAGEIO) endif() -blender_add_lib(bf_imbuf_openimageio "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_imbuf_openimageio "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/imbuf/intern/openexr/CMakeLists.txt b/source/blender/imbuf/intern/openexr/CMakeLists.txt index 18f68d5b365..c9ede9ff07f 100644 --- a/source/blender/imbuf/intern/openexr/CMakeLists.txt +++ b/source/blender/imbuf/intern/openexr/CMakeLists.txt @@ -40,6 +40,9 @@ set(SRC openexr_api.cpp ) +set(LIB +) + if(WITH_IMAGE_OPENEXR) list(APPEND INC_SYS ${OPENEXR_INCLUDE_DIRS} @@ -47,4 +50,4 @@ if(WITH_IMAGE_OPENEXR) add_definitions(-DWITH_OPENEXR) endif() -blender_add_lib(bf_imbuf_openexr "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_imbuf_openexr "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") |