diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-06-18 22:35:15 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-06-18 22:35:15 +0400 |
| commit | 4baa2fdcfe2faabe6acd333926ac957ab8b165d2 (patch) | |
| tree | bd29f15d71a894ca720aa26b74c8f52c147ca8f8 /extern/libmv/bundle.sh | |
| parent | 5138485d43ab1473cdb7b9e84c0ab1bcc999b1c8 (diff) | |
Correction to GTest commit (WITH_GTEST=OFF works now)
Diffstat (limited to 'extern/libmv/bundle.sh')
| -rwxr-xr-x | extern/libmv/bundle.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extern/libmv/bundle.sh b/extern/libmv/bundle.sh index 53858a1e1b6..32f7311ca96 100755 --- a/extern/libmv/bundle.sh +++ b/extern/libmv/bundle.sh @@ -42,7 +42,7 @@ third_glog_headers=`find ./third_party -type f -iname '*.h' | grep glog | grep - third_gflags_sources=`find ./third_party -type f -iname '*.cc' -or -iname '*.cpp' -or -iname '*.c' | grep gflags | grep -v windows | sed -r 's/^\.\//\t\t/' | sort -d` third_gflags_headers=`find ./third_party -type f -iname '*.h' | grep gflags | grep -v windows | sed -r 's/^\.\//\t\t/' | sort -d` -tests=`find ./libmv -type f -iname '*_test.cc' | sort -d | awk ' { name=gensub(".*/([A-Za-z_]+)_test.cc", "\\\\1", $1); printf("\tBLENDER_SRC_GTEST(\"libmv_%s\" \"%s\" \"libmv_test_dataset;extern_libmv;extern_ceres\")\n", name, $1) } '` +tests=`find ./libmv -type f -iname '*_test.cc' | sort -d | awk ' { name=gensub(".*/([A-Za-z_]+)_test.cc", "\\\\1", $1); printf("\t\tBLENDER_SRC_GTEST(\"libmv_%s\" \"%s\" \"libmv_test_dataset;extern_libmv;extern_ceres\")\n", name, $1) } '` src_dir=`find ./libmv -type f -iname '*.cc' -exec dirname {} \; -or -iname '*.cpp' -exec dirname {} \; -or -iname '*.c' -exec dirname {} \; | sed -r 's/^\.\//\t\t/' | sort -d | uniq` src_third_dir=`find ./third_party -type f -iname '*.cc' -exec dirname {} \; -or -iname '*.cpp' -exec dirname {} \; -or -iname '*.c' -exec dirname {} \; | grep -v ceres | sed -r 's/^\.\//\t\t/' | sort -d | uniq` @@ -177,9 +177,9 @@ ${third_headers} if(WITH_GTESTS) blender_add_lib(libmv_test_dataset "./libmv/multiview/test_data_sets.cc" "${INC}" "${INC_SYS}") - endif() ${tests} + endif() else() list(APPEND SRC libmv-capi_stub.cc |