diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-04-16 07:11:27 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-16 07:15:18 +0300 |
| commit | 813e470eac309a78d1f8cdc4a3abb0314b0ee5f3 (patch) | |
| tree | 65bfb0ea60eb6f595b38fedcf33eb0a59f072cb0 /extern | |
| parent | bb6b7dd4adebcdacfeabdaf26daa5e0d49079f67 (diff) | |
CMake: cleanup, arg rename, add definitions last
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/ceres/CMakeLists.txt | 6 | ||||
| -rwxr-xr-x | extern/ceres/bundle.sh | 10 |
2 files changed, 10 insertions, 6 deletions
diff --git a/extern/ceres/CMakeLists.txt b/extern/ceres/CMakeLists.txt index 0531eb71ba5..fad0734f52f 100644 --- a/extern/ceres/CMakeLists.txt +++ b/extern/ceres/CMakeLists.txt @@ -256,6 +256,10 @@ set(SRC internal/ceres/wall_time.h ) +set(LIB + +) + if(WITH_LIBMV_SCHUR_SPECIALIZATIONS) list(APPEND SRC internal/ceres/generated/partitioned_matrix_view_2_2_2.cc @@ -319,4 +323,4 @@ if(WITH_OPENMP) ) endif() -blender_add_lib(extern_ceres "${SRC}" "${INC}" "${INC_SYS}" "") +blender_add_lib(extern_ceres "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/extern/ceres/bundle.sh b/extern/ceres/bundle.sh index e8212aa1d41..b084eb4a00c 100755 --- a/extern/ceres/bundle.sh +++ b/extern/ceres/bundle.sh @@ -109,10 +109,6 @@ cat > CMakeLists.txt << EOF # # The Original Code is Copyright (C) 2012, Blender Foundation # All rights reserved. -# -# Contributor(s): Blender Foundation, -# Sergey Sharybin -# # ***** END GPL LICENSE BLOCK ***** # NOTE: This file is automatically generated by bundle.sh script @@ -139,6 +135,10 @@ ${sources} ${headers} ) +set(LIB + +) + if(WITH_LIBMV_SCHUR_SPECIALIZATIONS) list(APPEND SRC ${generated_sources} @@ -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}" "\${LIB}") EOF |