diff options
| author | Lukas Stockner <lukas.stockner@freenet.de> | 2018-05-01 18:03:20 +0300 |
|---|---|---|
| committer | Lukas Stockner <lukas.stockner@freenet.de> | 2018-05-01 18:03:20 +0300 |
| commit | bbfee34e9e2a3d8e8572dd41b3601e783d35a675 (patch) | |
| tree | fbb36728165d9c4ea8b60e0cac340652dbc7e30d /intern/libmv/bundle.sh | |
| parent | ae7b67902191abb7e5aefbdcc20b84f050ec2b08 (diff) | |
| parent | 2e98524b58a53f0d546e5f1e7d549d2f45815055 (diff) | |
Merge remote-tracking branch 'origin/master' into uv_unwrapping_slim_algorithm
Diffstat (limited to 'intern/libmv/bundle.sh')
| -rwxr-xr-x | intern/libmv/bundle.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/intern/libmv/bundle.sh b/intern/libmv/bundle.sh index b1a4be84e53..093095f5f5c 100755 --- a/intern/libmv/bundle.sh +++ b/intern/libmv/bundle.sh @@ -120,10 +120,11 @@ if(WITH_LIBMV) add_definitions(\${GFLAGS_DEFINES}) add_definitions(\${GLOG_DEFINES}) add_definitions(\${CERES_DEFINES}) + add_definitions(-DLIBMV_GFLAGS_NAMESPACE=\${GFLAGS_NAMESPACE}) list(APPEND INC - ../../extern/gflags/src - ../../extern/glog/src + \${GFLAGS_INCLUDE_DIRS} + \${GLOG_INCLUDE_DIRS} ../../extern/ceres/include ../../extern/ceres/config ../guardedalloc |