From bf0c9dccaa739542d1ec25392d044579e755bd1c Mon Sep 17 00:00:00 2001 From: Frank Dellaert Date: Mon, 22 Oct 2018 19:10:52 -0400 Subject: [PATCH] cmake changes --- CMakeLists.txt | 3 +++ gtsam/3rdparty/metis/CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 115c8bb49..b3e038efe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -108,6 +108,7 @@ set(CPACK_GENERATOR "TGZ" CACHE STRING "CPack Default Binary Generator") # If using Boost shared libs, disable auto linking if(MSVC) + set(Boost_USE_STATIC_LIBS ON) # only find static libs # Some libraries, at least Boost Program Options, rely on this to export DLL symbols # Disable autolinking if(NOT Boost_USE_STATIC_LIBS) @@ -319,6 +320,8 @@ include_directories(BEFORE if(MSVC) add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS) add_definitions(/wd4251 /wd4275 /wd4251 /wd4661 /wd4344 /wd4503) # Disable non-DLL-exported base class and other warnings + add_definitions(/wd4244) # Disable loss of precision which is thrown all over our Eigen + add_definitions(/bigobj) # Allow large object files for template-based code endif() # GCC 4.8+ complains about local typedefs which we use for shared_ptr etc. diff --git a/gtsam/3rdparty/metis/CMakeLists.txt b/gtsam/3rdparty/metis/CMakeLists.txt index dd21338a4..f864e02ac 100644 --- a/gtsam/3rdparty/metis/CMakeLists.txt +++ b/gtsam/3rdparty/metis/CMakeLists.txt @@ -23,7 +23,7 @@ set(GKLIB_PATH ${PROJECT_SOURCE_DIR}/GKlib CACHE PATH "path to GKlib") set(METIS_SHARED TRUE CACHE BOOL "build a shared library") if(MSVC) - set(METIS_INSTALL FALSE) + set(METIS_INSTALL TRUE) else() set(METIS_INSTALL FALSE) endif()