From dbcef0d7a4131e8c84399ed82b6d6d4c25556bb3 Mon Sep 17 00:00:00 2001 From: Liangliang Nan Date: Wed, 14 Feb 2024 10:13:26 +0100 Subject: [PATCH] clean code --- code/CMakeLists.txt | 3 +++ code/math/linear_program_solver_GUROBI.cpp | 18 ------------------ 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt index 639b48ce..bc6f4c26 100644 --- a/code/CMakeLists.txt +++ b/code/CMakeLists.txt @@ -50,6 +50,9 @@ set(POLYFIT_glew_DIR ${POLYFIT_ROOT}/3rd_glew) ### conditionally compile certain modules depending on libraries found on the system list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake) +if (POLICY CMP0074) + cmake_policy(SET CMP0074 NEW) +endif () find_package(Boost REQUIRED) ################################################################################ diff --git a/code/math/linear_program_solver_GUROBI.cpp b/code/math/linear_program_solver_GUROBI.cpp index 73c5bd06..71c3785e 100644 --- a/code/math/linear_program_solver_GUROBI.cpp +++ b/code/math/linear_program_solver_GUROBI.cpp @@ -26,24 +26,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include -#ifdef WIN32 -#if (_MSC_VER == 1900) // vs 2015 -#pragma comment(lib, "gurobi80.lib") -#ifdef _DEBUG -#pragma comment(lib, "gurobi_c++mdd2015.lib") -#else -#pragma comment(lib, "gurobi_c++md2015.lib") -#endif -#elif (_MSC_VER >= 1910 && _MSC_VER <= 1915) // vs 2017 -#pragma comment(lib, "gurobi81.lib") -#ifdef _DEBUG -#pragma comment(lib, "gurobi_c++mdd2017.lib") -#else -#pragma comment(lib, "gurobi_c++md2017.lib") -#endif -#endif -#endif - bool LinearProgramSolver::_solve_GUROBI(const LinearProgram* program) { try {