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 /intern/libmv | |
| parent | bb6b7dd4adebcdacfeabdaf26daa5e0d49079f67 (diff) | |
CMake: cleanup, arg rename, add definitions last
Diffstat (limited to 'intern/libmv')
| -rw-r--r-- | intern/libmv/CMakeLists.txt | 6 | ||||
| -rwxr-xr-x | intern/libmv/bundle.sh | 10 |
2 files changed, 10 insertions, 6 deletions
diff --git a/intern/libmv/CMakeLists.txt b/intern/libmv/CMakeLists.txt index 5adfdbea1af..91e638c9c45 100644 --- a/intern/libmv/CMakeLists.txt +++ b/intern/libmv/CMakeLists.txt @@ -33,6 +33,10 @@ set(SRC libmv-capi.h ) +set(LIB + +) + if(WITH_LIBMV) add_definitions(${GFLAGS_DEFINES}) add_definitions(${GLOG_DEFINES}) @@ -232,4 +236,4 @@ else() ) endif() -blender_add_lib(bf_intern_libmv "${SRC}" "${INC}" "${INC_SYS}" "") +blender_add_lib(bf_intern_libmv "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/intern/libmv/bundle.sh b/intern/libmv/bundle.sh index 98a1e364634..27fc0e886a1 100755 --- a/intern/libmv/bundle.sh +++ b/intern/libmv/bundle.sh @@ -95,10 +95,6 @@ cat > CMakeLists.txt << EOF # # The Original Code is Copyright (C) 2011, 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 @@ -116,6 +112,10 @@ set(SRC libmv-capi.h ) +set(LIB + +) + if(WITH_LIBMV) add_definitions(\${GFLAGS_DEFINES}) add_definitions(\${GLOG_DEFINES}) @@ -184,5 +184,5 @@ else() ) endif() -blender_add_lib(bf_intern_libmv "\${SRC}" "\${INC}" "\${INC_SYS}" "") +blender_add_lib(bf_intern_libmv "\${SRC}" "\${INC}" "\${INC_SYS}" "\${LIB}") EOF |