some move

CMakeLists.txt

@@ -237,31 +237,6 @@ endif()
 
 find_package(jsoncpp CONFIG REQUIRED)
 
-# Third-party solver
-## Xpress
-if(XPRESS)
-	message("XPRESS is ${XPRESS}")
-
-	#Default xpress install dir
-	if (NOT XPRESSDIR)
-		if (MSVC)
-			set(XPRESSDIR "C:/xpressmp")
-		elseif(UNIX)
-			set(XPRESSDIR "/opt/xpressmp")
-		endif()
-	endif()
-
-	find_package(XPRESS REQUIRED)
-
-	# Add solver variables for usage in C++ source code
-	# There are already some variables defined by SOLVER, -DUSE_XPRESS, -DUSE_CBC
-	# But they are exclusive, only one can be set to True
-	# We need to keep COIN-OR at least COIN-OR to True while it is required in lpnamer
-	# and we want to allow compilation with several solvers so that the user can switch 
-	# the solver without any compilation phase.
-	# @TODO : I think those parameters should be merged in a future version
-	add_definitions( -DXPRESS=true )
-endif(XPRESS)
 
 
 ## Coin-OR (Clp and CBC solvers)

src/cpp/multisolver_interface/CMakeLists.txt

@@ -16,17 +16,15 @@
 list(APPEND Solver_sources
 	${CMAKE_CURRENT_LIST_DIR}/SolverFactory.cpp
 )
+
 list(APPEND XPRESS_LOAD
 	${CMAKE_CURRENT_LIST_DIR}/environment.cc
-	${CMAKE_CURRENT_LIST_DIR}/environment.h
 )
 
 # XPRESS
 #IF( XPRESS )
 	list(APPEND Solver_sources
 		${CMAKE_CURRENT_LIST_DIR}/SolverXpress.cpp
-		${CMAKE_CURRENT_LIST_DIR}/environment.h
-		${CMAKE_CURRENT_LIST_DIR}/environment.cc
 	)
 #ENDIF( XPRESS )
 

src/cpp/multisolver_interface/SolverFactory.cpp

@@ -1,6 +1,6 @@
 
 #include "SolverXpress.h"
-#include "environment.h"
+#include "multisolver_interface/environment.h"
 
 #ifdef COIN_OR
 #include "SolverCbc.h"

src/cpp/multisolver_interface/SolverXpress.h

@@ -3,8 +3,8 @@
 #include <fstream>
 #include <mutex>
 
-#include "environment.h"
 #include "multisolver_interface/SolverAbstract.h"
+#include "multisolver_interface/environment.h"
 
 /*!
  * \class class SolverXpress

src/cpp/multisolver_interface/environment.cc

@@ -11,7 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "environment.h"
+#include "multisolver_interface/environment.h"
 
 #include <filesystem>
 #include <iostream>

tests/cpp/sensitivity/SensitivityStudyTest.cpp

@@ -1,8 +1,8 @@
 #include "SensitivityFileLogger.h"
 #include "SensitivityStudy.h"
-#include "environment.h"
 #include "gtest/gtest.h"
 #include "multisolver_interface/SolverFactory.h"
+#include "multisolver_interface/environment.h"
 
 class SensitivityStudyTest : public ::testing::Test {
  public: