config cmake modified

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1718 331e1502-861f-0410-8da2-ba01fb791d7f

trunk/paradiseo-old-mo/CMakeLists.txt

@@ -14,11 +14,11 @@ INCLUDE(mo-conf.cmake OPTIONAL)
 ##########################################################################################################################################
 
 # set the project name
-PROJECT(ParadisEO-MO)
+PROJECT(ParadisEO-OLD-MO)
 
 SET(PACKAGE_BUGREPORT "paradiseo-help@lists.gforge.inria.fr" CACHE STRING "Package bug report" FORCE)
-SET(PACKAGE_NAME "ParadisEO-MO - Moving Objects" CACHE STRING "Package name" FORCE)
+SET(PACKAGE_NAME "ParadisEO-OLD-MO - Moving Objects" CACHE STRING "Package name" FORCE)
-SET(PACKAGE_STRING "ParadisEO-MO 1.2" CACHE STRING "MO Package string full name" FORCE)
+SET(PACKAGE_STRING "ParadisEO-OLD-MO 1.2" CACHE STRING "MO Package string full name" FORCE)
 SET(PACKAGE_VERSION "1.2" CACHE STRING "Package version" FORCE)
 SET(GLOBAL_VERSION "1.2" CACHE STRING "Global version" FORCE)
 SET(VERSION "1.2" CACHE STRING "Version" FORCE)

trunk/paradiseo-old-mo/doc/CMakeLists.txt

@@ -1,4 +1,3 @@
-
 ##########################################################################################
 ### MO Doc generation using Doxygen
 ##########################################################################################
@@ -6,18 +5,18 @@
 IF (DOXYGEN_FOUND)
 
 	SET(DOC_DIR ${CMAKE_BINARY_DIR}/doc CACHE PATH "MO documentation directory")
-	SET(MO_DOC_CONFIG_FILE "mo.doxyfile" CACHE PATH "MO documentation configuration file")
+	SET(OLDMO_DOC_CONFIG_FILE "mo.doxyfile" CACHE PATH "MO documentation configuration file")
 		# define the doc target
 	IF (DOXYGEN_EXECUTABLE)
 	    	ADD_CUSTOM_TARGET(doc
-	        COMMAND ${DOXYGEN_EXECUTABLE} ${MO_DOC_CONFIG_FILE}
+	        COMMAND ${DOXYGEN_EXECUTABLE} ${OLDMO_DOC_CONFIG_FILE}
 	        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
 	    )
 	ENDIF (DOXYGEN_EXECUTABLE)
 	
 	# configure doxyfile file
-	CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/doc/${MO_DOC_CONFIG_FILE}.cmake"
+	CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/doc/${OLDMO_DOC_CONFIG_FILE}.cmake"
-	               "${CMAKE_BINARY_DIR}/doc/${MO_DOC_CONFIG_FILE}")
+	               "${CMAKE_BINARY_DIR}/doc/${OLDMO_DOC_CONFIG_FILE}")
 
 ELSE (DOXYGEN_FOUND)
 	MESSAGE(STATUS "Unable to generate the documentation, Doxygen package not found")	

trunk/paradiseo-old-mo/src/CMakeLists.txt

@@ -1,4 +1,3 @@
-
 ###############################################################
 # This is a dummy file
 ###############################################################

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)
 
 ######################################################################################
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;