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/python | |
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/python')
-rw-r--r-- | source/blender/python/bmesh/CMakeLists.txt | 5 | ||||
-rw-r--r-- | source/blender/python/generic/CMakeLists.txt | 5 | ||||
-rw-r--r-- | source/blender/python/gpu/CMakeLists.txt | 5 | ||||
-rw-r--r-- | source/blender/python/intern/CMakeLists.txt | 5 | ||||
-rw-r--r-- | source/blender/python/mathutils/CMakeLists.txt | 5 |
5 files changed, 20 insertions, 5 deletions
diff --git a/source/blender/python/bmesh/CMakeLists.txt b/source/blender/python/bmesh/CMakeLists.txt index c9524634f7e..8e92b43eb46 100644 --- a/source/blender/python/bmesh/CMakeLists.txt +++ b/source/blender/python/bmesh/CMakeLists.txt @@ -51,8 +51,11 @@ set(SRC bmesh_py_utils.h ) +set(LIB +) + if(WITH_FREESTYLE) add_definitions(-DWITH_FREESTYLE) endif() -blender_add_lib(bf_python_bmesh "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_python_bmesh "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/python/generic/CMakeLists.txt b/source/blender/python/generic/CMakeLists.txt index c7b361247ef..3ebd90e5b42 100644 --- a/source/blender/python/generic/CMakeLists.txt +++ b/source/blender/python/generic/CMakeLists.txt @@ -50,6 +50,9 @@ set(SRC python_utildefines.h ) +set(LIB +) + add_definitions(${GL_DEFINITIONS}) -blender_add_lib(bf_python_ext "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_python_ext "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/python/gpu/CMakeLists.txt b/source/blender/python/gpu/CMakeLists.txt index 3c3a9b7e577..aeef81c5fd7 100644 --- a/source/blender/python/gpu/CMakeLists.txt +++ b/source/blender/python/gpu/CMakeLists.txt @@ -54,6 +54,9 @@ set(SRC gpu_py_vertex_format.h ) +set(LIB +) + add_definitions(${GL_DEFINITIONS}) -blender_add_lib(bf_python_gpu "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_python_gpu "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/python/intern/CMakeLists.txt b/source/blender/python/intern/CMakeLists.txt index 89e5e368ced..d517d6a9529 100644 --- a/source/blender/python/intern/CMakeLists.txt +++ b/source/blender/python/intern/CMakeLists.txt @@ -117,6 +117,9 @@ set(SRC ../BPY_extern_clog.h ) +set(LIB +) + # only to check if buildinfo is available if(WITH_BUILDINFO) add_definitions(-DBUILD_DATE) @@ -298,4 +301,4 @@ endif() add_definitions(${GL_DEFINITIONS}) -blender_add_lib(bf_python "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_python "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/python/mathutils/CMakeLists.txt b/source/blender/python/mathutils/CMakeLists.txt index 4a8d69f72fd..b973875977a 100644 --- a/source/blender/python/mathutils/CMakeLists.txt +++ b/source/blender/python/mathutils/CMakeLists.txt @@ -55,5 +55,8 @@ set(SRC mathutils_noise.h ) +set(LIB +) + -blender_add_lib(bf_python_mathutils "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_python_mathutils "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") |