config cmake modified

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1718 331e1502-861f-0410-8da2-ba01fb791d7f
2010-03-25 11:18:35 +00:00 · 2010-03-25 11:18:35 +00:00 · b49f2cdc9f
commit b49f2cdc9f
parent 48020eeb49
51 changed files with 188 additions and 192 deletions
--- a/trunk/paradiseo-old-mo/test/CMakeLists.txt
+++ b/trunk/paradiseo-old-mo/test/CMakeLists.txt
@ -10,7 +10,7 @@
 ######################################################################################

 INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src)
-INCLUDE_DIRECTORIES(${ParadisEO-MO_SOURCE_DIR}/src)
+INCLUDE_DIRECTORIES(${OLDMO_SRC_DIR}/src)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})

 ######################################################################################
@ -20,7 +20,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 ### 2) Specify where CMake can find the libraries
 ######################################################################################

-LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${ParadisEO-MO_BINARY_DIR}/lib)
+LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${OLDMO_BIN_DIR}/lib)

 ######################################################################################

--- a/trunk/paradiseo-old-mo/test/t-moBestImprSelect.cpp
+++ b/trunk/paradiseo-old-mo/test/t-moBestImprSelect.cpp
@ -38,7 +38,7 @@
 //-----------------------------------------------------------------------------

 #include <eo>  // EO
-#include <mo>  // MO
+#include <oldmo>  // MO

 using std::cout;
 using std::endl;
--- a/trunk/paradiseo-old-mo/test/t-moFirstImprSelect.cpp
+++ b/trunk/paradiseo-old-mo/test/t-moFirstImprSelect.cpp
@ -38,7 +38,7 @@
 //-----------------------------------------------------------------------------

 #include <eo>  // EO
-#include <mo>  // MO
+#include <oldmo>  // MO

 using std::cout;
 using std::endl;
--- a/trunk/paradiseo-old-mo/test/t-moFitComparator.cpp
+++ b/trunk/paradiseo-old-mo/test/t-moFitComparator.cpp
@ -38,7 +38,7 @@
 //-----------------------------------------------------------------------------

 #include <eo>  // EO
-#include <mo>  // MO
+#include <oldmo>  // MO

 using std::cout;
 using std::endl;
--- a/trunk/paradiseo-old-mo/test/t-moFitSolContinue.cpp
+++ b/trunk/paradiseo-old-mo/test/t-moFitSolContinue.cpp
@ -38,7 +38,7 @@
 //-----------------------------------------------------------------------------

 #include <eo>  // EO
-#include <mo>  // MO
+#include <oldmo>  // MO

 using std::cout;
 using std::endl;
--- a/trunk/paradiseo-old-mo/test/t-moGenSolContinue.cpp
+++ b/trunk/paradiseo-old-mo/test/t-moGenSolContinue.cpp
@ -38,7 +38,7 @@
 //-----------------------------------------------------------------------------

 #include <eo>  // EO
-#include <mo>  // MO
+#include <oldmo>  // MO

 using std::cout;
 using std::endl;
--- a/trunk/paradiseo-old-mo/test/t-moGeometricCoolingSchedule.cpp
+++ b/trunk/paradiseo-old-mo/test/t-moGeometricCoolingSchedule.cpp
@ -38,7 +38,7 @@
 //-----------------------------------------------------------------------------

 #include <eo>  // EO
-#include <mo>  // MO
+#include <oldmo>  // MO

 using std::cout;
 using std::endl;
--- a/trunk/paradiseo-old-mo/test/t-moHC.cpp
+++ b/trunk/paradiseo-old-mo/test/t-moHC.cpp
@ -38,7 +38,7 @@
 //-----------------------------------------------------------------------------

 #include <eo>  // EO
-#include <mo>  // MO
+#include <oldmo>  // MO

 using std::cout;
 using std::endl;
--- a/trunk/paradiseo-old-mo/test/t-moHCMoveLoopExpl.cpp
+++ b/trunk/paradiseo-old-mo/test/t-moHCMoveLoopExpl.cpp
@ -38,7 +38,7 @@
 //-----------------------------------------------------------------------------

 #include <eo>  // EO
-#include <mo>  // MO
+#include <oldmo>  // MO

 using std::cout;
 using std::endl;
--- a/trunk/paradiseo-old-mo/test/t-moHC_2.cpp
+++ b/trunk/paradiseo-old-mo/test/t-moHC_2.cpp
@ -38,7 +38,7 @@
 //-----------------------------------------------------------------------------

 #include <eo>  // EO
-#include <mo>  // MO
+#include <oldmo>  // MO

 using std::cout;
 using std::endl;
--- a/trunk/paradiseo-old-mo/test/t-moILS.cpp
+++ b/trunk/paradiseo-old-mo/test/t-moILS.cpp
@ -38,7 +38,7 @@
 //-----------------------------------------------------------------------------

 #include <eo>  // EO
-#include <mo>  // MO
+#include <oldmo>  // MO

 using std::cout;
 using std::endl;
--- a/trunk/paradiseo-old-mo/test/t-moILS_HC.cpp
+++ b/trunk/paradiseo-old-mo/test/t-moILS_HC.cpp
@ -38,7 +38,7 @@
 //-----------------------------------------------------------------------------

 #include <eo>  // EO
-#include <mo>  // MO
+#include <oldmo>  // MO

 using std::cout;
 using std::endl;
--- a/trunk/paradiseo-old-mo/test/t-moILS_SA.cpp
+++ b/trunk/paradiseo-old-mo/test/t-moILS_SA.cpp
@ -38,7 +38,7 @@
 //-----------------------------------------------------------------------------

 #include <eo>  // EO
-#include <mo>  // MO
+#include <oldmo>  // MO

 using std::cout;
 using std::endl;
--- a/trunk/paradiseo-old-mo/test/t-moILS_TS.cpp
+++ b/trunk/paradiseo-old-mo/test/t-moILS_TS.cpp
@ -38,7 +38,7 @@
 //-----------------------------------------------------------------------------

 #include <eo>  // EO
-#include <mo>  // MO
+#include <oldmo>  // MO

 using std::cout;
 using std::endl;
--- a/trunk/paradiseo-old-mo/test/t-moImprBestFitAspirCrit.cpp
+++ b/trunk/paradiseo-old-mo/test/t-moImprBestFitAspirCrit.cpp
@ -38,7 +38,7 @@
 //-----------------------------------------------------------------------------

 #include <eo>  // EO
-#include <mo>  // MO
+#include <oldmo>  // MO

 using std::cout;
 using std::endl;
--- a/trunk/paradiseo-old-mo/test/t-moItRandNextMove.cpp
+++ b/trunk/paradiseo-old-mo/test/t-moItRandNextMove.cpp
@ -38,7 +38,7 @@
 //-----------------------------------------------------------------------------

 #include <eo>  // EO
-#include <mo>  // MO
+#include <oldmo>  // MO

 using std::cout;
 using std::endl;
--- a/trunk/paradiseo-old-mo/test/t-moLSCheckPoint.cpp
+++ b/trunk/paradiseo-old-mo/test/t-moLSCheckPoint.cpp
@ -38,7 +38,7 @@
 //-----------------------------------------------------------------------------

 #include <eo>  // EO
-#include <mo>  // MO
+#include <oldmo>  // MO

 using std::cout;
 using std::endl;
--- a/trunk/paradiseo-old-mo/test/t-moLinearCoolingSchedule.cpp
+++ b/trunk/paradiseo-old-mo/test/t-moLinearCoolingSchedule.cpp
@ -38,7 +38,7 @@
 //-----------------------------------------------------------------------------

 #include <eo>  // EO
-#include <mo>  // MO
+#include <oldmo>  // MO

 using std::cout;
 using std::endl;
--- a/trunk/paradiseo-old-mo/test/t-moNoAspirCrit.cpp
+++ b/trunk/paradiseo-old-mo/test/t-moNoAspirCrit.cpp
@ -38,7 +38,7 @@
 //-----------------------------------------------------------------------------

 #include <eo>  // EO
-#include <mo>  // MO
+#include <oldmo>  // MO

 using std::cout;
 using std::endl;
--- a/trunk/paradiseo-old-mo/test/t-moNoFitImprSolContinue.cpp
+++ b/trunk/paradiseo-old-mo/test/t-moNoFitImprSolContinue.cpp
@ -38,7 +38,7 @@
 //-----------------------------------------------------------------------------

 #include <eo>  // EO
-#include <mo>  // MO
+#include <oldmo>  // MO

 using std::cout;
 using std::endl;
--- a/trunk/paradiseo-old-mo/test/t-moRandImprSelect.cpp
+++ b/trunk/paradiseo-old-mo/test/t-moRandImprSelect.cpp
@ -38,7 +38,7 @@
 //-----------------------------------------------------------------------------

 #include <eo>  // EO
-#include <mo>  // MO
+#include <oldmo>  // MO

 using std::cout;
 using std::endl;
--- a/trunk/paradiseo-old-mo/test/t-moSA.cpp
+++ b/trunk/paradiseo-old-mo/test/t-moSA.cpp
@ -38,7 +38,7 @@
 //-----------------------------------------------------------------------------

 #include <eo>  // EO
-#include <mo>  // MO
+#include <oldmo>  // MO

 using std::cout;
 using std::endl;
--- a/trunk/paradiseo-old-mo/test/t-moSimpleMoveTabuList.cpp
+++ b/trunk/paradiseo-old-mo/test/t-moSimpleMoveTabuList.cpp
@ -38,7 +38,7 @@
 //-----------------------------------------------------------------------------

 #include <eo>  // EO
-#include <mo>  // MO
+#include <oldmo>  // MO

 using std::cout;
 using std::endl;
--- a/trunk/paradiseo-old-mo/test/t-moSimpleSolutionTabuList.cpp
+++ b/trunk/paradiseo-old-mo/test/t-moSimpleSolutionTabuList.cpp
@ -38,7 +38,7 @@
 //-----------------------------------------------------------------------------

 #include <eo>  // EO
-#include <mo>  // MO
+#include <oldmo>  // MO

 using std::cout;
 using std::endl;
--- a/trunk/paradiseo-old-mo/test/t-moSteadyFitSolContinue.cpp
+++ b/trunk/paradiseo-old-mo/test/t-moSteadyFitSolContinue.cpp
@ -38,7 +38,7 @@
 //-----------------------------------------------------------------------------

 #include <eo>  // EO
-#include <mo>  // MO
+#include <oldmo>  // MO

 using std::cout;
 using std::endl;
--- a/trunk/paradiseo-old-mo/test/t-moTA.cpp
+++ b/trunk/paradiseo-old-mo/test/t-moTA.cpp
@ -38,7 +38,7 @@
 //-----------------------------------------------------------------------------

 #include <eo>  // EO
-#include <mo>  // MO
+#include <oldmo>  // MO

 using std::cout;
 using std::endl;
--- a/trunk/paradiseo-old-mo/test/t-moTS.cpp
+++ b/trunk/paradiseo-old-mo/test/t-moTS.cpp
@ -38,7 +38,7 @@
 //-----------------------------------------------------------------------------

 #include <eo>  // EO
-#include <mo>  // MO
+#include <oldmo>  // MO

 using std::cout;
 using std::endl;
--- a/trunk/paradiseo-old-mo/test/t-moTSMoveLoopExpl.cpp
+++ b/trunk/paradiseo-old-mo/test/t-moTSMoveLoopExpl.cpp
@ -38,7 +38,7 @@
 //-----------------------------------------------------------------------------

 #include <eo>  // EO
-#include <mo>  // MO
+#include <oldmo>  // MO

 using std::cout;
 using std::endl;
--- a/trunk/paradiseo-old-mo/test/t-moTS_2.cpp
+++ b/trunk/paradiseo-old-mo/test/t-moTS_2.cpp
@ -38,7 +38,7 @@
 //-----------------------------------------------------------------------------

 #include <eo>  // EO
-#include <mo>  // MO
+#include <oldmo>  // MO

 using std::cout;
 using std::endl;
--- a/trunk/paradiseo-old-mo/test/t-moVNS.cpp
+++ b/trunk/paradiseo-old-mo/test/t-moVNS.cpp
@ -39,7 +39,7 @@
 //-----------------------------------------------------------------------------

 #include <eo>  // EO
-#include <mo>  // MO
+#include <oldmo>  // MO
 #include <cassert>

 using std::cout;