From 6086a6d9399e42c3e88b39e5658af9a2ed06cac5 Mon Sep 17 00:00:00 2001 From: Lazydodo Date: Wed, 21 Aug 2019 10:38:33 -0600 Subject: Cleanup: Fix build error with MSVC Previously eigens internal include order somehow implicitly provided M_PI and friends. The recent eigen version bump broke this implicit behaviour, better to be explicit that we need the math defines for MSVC. --- intern/libmv/CMakeLists.txt | 3 +++ intern/libmv/libmv/tracking/track_region.cc | 3 --- intern/libmv/libmv/tracking/track_region.h | 3 --- 3 files changed, 3 insertions(+), 6 deletions(-) (limited to 'intern/libmv') diff --git a/intern/libmv/CMakeLists.txt b/intern/libmv/CMakeLists.txt index 019364d84df..e16e27368d0 100644 --- a/intern/libmv/CMakeLists.txt +++ b/intern/libmv/CMakeLists.txt @@ -38,6 +38,9 @@ set(LIB ) if(WITH_LIBMV) + if(WIN32) + add_definitions(-D_USE_MATH_DEFINES) + endif() add_definitions(${GFLAGS_DEFINES}) add_definitions(${GLOG_DEFINES}) add_definitions(${CERES_DEFINES}) diff --git a/intern/libmv/libmv/tracking/track_region.cc b/intern/libmv/libmv/tracking/track_region.cc index ef6dac65236..895c9a1e23d 100644 --- a/intern/libmv/libmv/tracking/track_region.cc +++ b/intern/libmv/libmv/tracking/track_region.cc @@ -25,9 +25,6 @@ // smart coder went through the TODO's and made the suggested performance // enhancements. -// Necessary for M_E when building with MSVC. -#define _USE_MATH_DEFINES - #include "libmv/tracking/track_region.h" #include diff --git a/intern/libmv/libmv/tracking/track_region.h b/intern/libmv/libmv/tracking/track_region.h index be1d8ef3e03..61dce22bcb8 100644 --- a/intern/libmv/libmv/tracking/track_region.h +++ b/intern/libmv/libmv/tracking/track_region.h @@ -20,9 +20,6 @@ #ifndef LIBMV_TRACKING_TRACK_REGION_H_ -// Necessary for M_E when building with MSVC. -#define _USE_MATH_DEFINES - #include "libmv/image/image.h" #include "libmv/image/sample.h" #include "libmv/numeric/numeric.h" -- cgit v1.2.3