From a4f6668c814094989bf253889b98a77e0d6e30d5 Mon Sep 17 00:00:00 2001
From: jhumeau <jhumeau@331e1502-861f-0410-8da2-ba01fb791d7f>
Date: Fri, 15 Jan 2010 15:09:53 +0000
Subject: [PATCH] Config pour les tests unitaires

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1646 331e1502-861f-0410-8da2-ba01fb791d7f
---
 branches/newMo/CMakeLists.txt                 |  2 +-
 .../src/comparator/moNeighborComparator.h     |  2 +-
 branches/newMo/test/CMakeLists.txt            | 25 ++++++-------------
 3 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/branches/newMo/CMakeLists.txt b/branches/newMo/CMakeLists.txt
index 868b0a8cd..7fcb7ebdd 100644
--- a/branches/newMo/CMakeLists.txt
+++ b/branches/newMo/CMakeLists.txt
@@ -8,7 +8,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 PROJECT(NEWMO)
 
 # Here define the name and the version of your package
-SET(PACKAGE_NAME "VRP" CACHE STRING "Package name" FORCE)
+SET(PACKAGE_NAME "NEWMO" CACHE STRING "Package name" FORCE)
 SET(PACKAGE_VERSION "0" CACHE STRING "Package version" FORCE)
 
 
diff --git a/branches/newMo/src/comparator/moNeighborComparator.h b/branches/newMo/src/comparator/moNeighborComparator.h
index a7ae4f69b..c65c6400c 100644
--- a/branches/newMo/src/comparator/moNeighborComparator.h
+++ b/branches/newMo/src/comparator/moNeighborComparator.h
@@ -12,7 +12,7 @@ public:
     * true if the neighbor1 is better than neighbor2
     */
     virtual bool operator()(const Neigh & neighbor1, const Neigh & neighbor2) {
-	return (neighbor1.fitness() > neighbor2.fitness()); 
+    	return (neighbor1.fitness() > neighbor2.fitness());
     }
 
     /** Return the class id.
diff --git a/branches/newMo/test/CMakeLists.txt b/branches/newMo/test/CMakeLists.txt
index 84ee8fb78..9c9802334 100644
--- a/branches/newMo/test/CMakeLists.txt
+++ b/branches/newMo/test/CMakeLists.txt
@@ -9,8 +9,8 @@
 ### 1) Include the sources
 ######################################################################################
 
-INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src)
-INCLUDE_DIRECTORIES(${ParadisEO-MO_SOURCE_DIR}/src)
+INCLUDE_DIRECTORIES(${PARADISEO_EO_SRC_DIR}/src)
+INCLUDE_DIRECTORIES(${NEWMO_SOURCE_DIR}/src)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
 ######################################################################################
@@ -20,33 +20,22 @@ 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(${PARADISEO_EO_BIN_DIR}/lib)
 
 ######################################################################################
 
-
-
 ######################################################################################
 ### 3) Define your targets and link the librairies
 ######################################################################################
 
-SET (TEST_LIST 
-    	    	)
+SET (TEST_LIST t-moNeighbor)
 				
 FOREACH (test ${TEST_LIST})
 	  SET ("T_${test}_SOURCES" "${test}.cpp")
 ENDFOREACH (test)
 
 
-IF(ENABLE_MINIMAL_CMAKE_TESTING)
-    SET (MIN_TEST_LIST t-moHC)				
-    FOREACH (mintest ${MIN_TEST_LIST})
-    	  SET ("T_${mintest}_SOURCES" "${mintest}.cpp")
-    	  ADD_EXECUTABLE(${mintest} ${T_${mintest}_SOURCES}) 
-		  ADD_TEST(${mintest} ${mintest}) 
-    ENDFOREACH (mintest)
-   
-ELSEIF(ENABLE_CMAKE_TESTING)
+IF(ENABLE_CMAKE_TESTING)
 	
 	# Add the tests
 	FOREACH (test ${TEST_LIST})
@@ -56,10 +45,10 @@ ELSEIF(ENABLE_CMAKE_TESTING)
 	
 	# Link the librairies
 	FOREACH (test ${TEST_LIST})
-	 TARGET_LINK_LIBRARIES(${test} ga es eoutils eo)
+	 	TARGET_LINK_LIBRARIES(${test} ga es eoutils eo)
 	ENDFOREACH (test)
 	
-ENDIF(ENABLE_MINIMAL_CMAKE_TESTING)
+ENDIF(ENABLE_CMAKE_TESTING)
 
 ######################################################################################