diff --git a/gtsam/3rdparty/metis-5.1.0/CMakeLists.txt b/gtsam/3rdparty/metis-5.1.0/CMakeLists.txt index 4c4e2c03f..93c546be8 100644 --- a/gtsam/3rdparty/metis-5.1.0/CMakeLists.txt +++ b/gtsam/3rdparty/metis-5.1.0/CMakeLists.txt @@ -9,7 +9,9 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") endif() endif() -add_definitions(-Wno-unknown-pragmas) +if(NOT ("${CMAKE_C_COMPILER_ID}" MATCHES "MSVC" OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "MSVC")) + #add_definitions(-Wno-unknown-pragmas) +endif() if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.6 OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 4.6) diff --git a/gtsam/3rdparty/metis-5.1.0/GKlib/gk_arch.h b/gtsam/3rdparty/metis-5.1.0/GKlib/gk_arch.h index 2cb80ccf2..5a21274f3 100644 --- a/gtsam/3rdparty/metis-5.1.0/GKlib/gk_arch.h +++ b/gtsam/3rdparty/metis-5.1.0/GKlib/gk_arch.h @@ -59,9 +59,10 @@ typedef ptrdiff_t ssize_t; #endif #ifdef __MSC__ +#if(_MSC_VER < 1700) /* MSC does not have rint() function */ #define rint(x) ((int)((x)+0.5)) - +#endif /* MSC does not have INFINITY defined */ #ifndef INFINITY #define INFINITY FLT_MAX