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 /extern/ceres | |
| 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 'extern/ceres')
| -rw-r--r-- | extern/ceres/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | extern/ceres/bundle.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/extern/ceres/CMakeLists.txt b/extern/ceres/CMakeLists.txt index 3a9ade5510a..0531eb71ba5 100644 --- a/extern/ceres/CMakeLists.txt +++ b/extern/ceres/CMakeLists.txt @@ -319,4 +319,4 @@ if(WITH_OPENMP) ) endif() -blender_add_lib(extern_ceres "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(extern_ceres "${SRC}" "${INC}" "${INC_SYS}" "") diff --git a/extern/ceres/bundle.sh b/extern/ceres/bundle.sh index 1c9a2e729e5..e8212aa1d41 100755 --- a/extern/ceres/bundle.sh +++ b/extern/ceres/bundle.sh @@ -165,5 +165,5 @@ if(WITH_OPENMP) ) endif() -blender_add_lib(extern_ceres "\${SRC}" "\${INC}" "\${INC_SYS}") +blender_add_lib(extern_ceres "\${SRC}" "\${INC}" "\${INC_SYS}" "") EOF |