diff options
author | Lazydodo <github@lazydodo.com> | 2019-08-21 19:38:33 +0300 |
---|---|---|
committer | Lazydodo <github@lazydodo.com> | 2019-08-21 19:38:33 +0300 |
commit | 6086a6d9399e42c3e88b39e5658af9a2ed06cac5 (patch) | |
tree | 805918ccc528fb73b8917b73e5c28314970f8dea /intern | |
parent | 34921e9e5671df4f8932ba671ee5703ca4739ecb (diff) |
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.
Diffstat (limited to 'intern')
-rw-r--r-- | intern/iksolver/CMakeLists.txt | 4 | ||||
-rw-r--r-- | intern/libmv/CMakeLists.txt | 3 | ||||
-rw-r--r-- | intern/libmv/libmv/tracking/track_region.cc | 3 | ||||
-rw-r--r-- | intern/libmv/libmv/tracking/track_region.h | 3 |
4 files changed, 7 insertions, 6 deletions
diff --git a/intern/iksolver/CMakeLists.txt b/intern/iksolver/CMakeLists.txt index 5e12cdbcc2f..a7a346ccddd 100644 --- a/intern/iksolver/CMakeLists.txt +++ b/intern/iksolver/CMakeLists.txt @@ -27,6 +27,10 @@ set(INC_SYS ${EIGEN3_INCLUDE_DIRS} ) +if(WIN32) + add_definitions(-D_USE_MATH_DEFINES) +endif() + set(SRC intern/IK_QJacobian.cpp intern/IK_QJacobianSolver.cpp 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 <Eigen/SVD> 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" |