From 52e89bbcdeff3607898fea232fa3b00db7c0125d Mon Sep 17 00:00:00 2001
From: legrand <legrand@331e1502-861f-0410-8da2-ba01fb791d7f>
Date: Wed, 18 Jul 2007 13:00:27 +0000
Subject: [PATCH] cmake modifs for ELSEIF compatibility

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@579 331e1502-861f-0410-8da2-ba01fb791d7f
---
 .../tutorial/Lesson1/CMakeLists.txt           | 29 ++++++++-------
 .../tutorial/Lesson2/CMakeLists.txt           | 28 ++++++++-------
 .../tutorial/Lesson3/CMakeLists.txt           | 24 +++++++------
 .../tutorial/examples/tsp/CMakeLists.txt      |  7 ++--
 trunk/paradiseo-moeo/src/CMakeLists.txt       | 11 +++---
 .../tutorial/Lesson1/CMakeLists.txt           | 26 ++++++++------
 .../tutorial/Lesson2/CMakeLists.txt           | 28 ++++++++-------
 .../tutorial/examples/flowshop/CMakeLists.txt | 36 ++++++++++---------
 8 files changed, 108 insertions(+), 81 deletions(-)

diff --git a/trunk/paradiseo-mo/tutorial/Lesson1/CMakeLists.txt b/trunk/paradiseo-mo/tutorial/Lesson1/CMakeLists.txt
index c9411d93c..86e8c7c3f 100644
--- a/trunk/paradiseo-mo/tutorial/Lesson1/CMakeLists.txt
+++ b/trunk/paradiseo-mo/tutorial/Lesson1/CMakeLists.txt
@@ -19,8 +19,10 @@ INCLUDE_DIRECTORIES(${TSP_SRC_DIR})
 # --> UNIX 
 IF(UNIX)  
   LINK_DIRECTORIES(${EO_SRC_DIR} ${EO_SRC_DIR}/utils ${TSP_BINARY_DIR}/lib)
+ENDIF(UNIX)
+
 # --> WIN
-ELSEIF(WIN32)  
+IF(WIN32)  
   # "CMAKE_BUILD_TYPE" supposed to be given on the command line, default=Debug
   IF (NOT DEFINED CMAKE_BUILD_TYPE)
     set (CMAKE_BUILD_TYPE Debug)
@@ -29,12 +31,14 @@ ELSEIF(WIN32)
   IF (CMAKE_BUILD_TYPE STREQUAL Debug)
   	LINK_DIRECTORIES(${TSP_BINARY_DIR}\\debug)
   	LINK_DIRECTORIES(${EO_LIB_DIR}\\debug)
-  ELSEIF(CMAKE_BUILD_TYPE STREQUAL Release)
+  ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug)
+  
+  IF (CMAKE_BUILD_TYPE STREQUAL Release)
   	LINK_DIRECTORIES(${TSP_BINARY_DIR}\\release)
   	LINK_DIRECTORIES(${EO_LIB_DIR}\\release)  
-  ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug)
+  ENDIF(CMAKE_BUILD_TYPE STREQUAL Release)
 
-ENDIF(UNIX)
+ENDIF(WIN32)
 
 ######################################################################################
 
@@ -71,9 +75,10 @@ IF(UNIX)
   TARGET_LINK_LIBRARIES(hill_climbing tsp) 
   TARGET_LINK_LIBRARIES(hill_climbing eo)
   TARGET_LINK_LIBRARIES(hill_climbing eoutils)
+ENDIF(UNIX) 
 
 # --> WIN
-ELSEIF(WIN32)  
+IF(WIN32)  
   # "CMAKE_BUILD_TYPE" supposed to be given on the command line, default=Debug
   IF (NOT DEFINED CMAKE_BUILD_TYPE)
     set (CMAKE_BUILD_TYPE Debug)
@@ -82,16 +87,16 @@ ELSEIF(WIN32)
   IF (CMAKE_BUILD_TYPE STREQUAL Debug)
   	TARGET_LINK_LIBRARIES(hill_climbing tsp)
     TARGET_LINK_LIBRARIES(hill_climbing eod)
-    TARGET_LINK_LIBRARIES(hill_climbing eoutilsd)    
-  ELSEIF(CMAKE_BUILD_TYPE STREQUAL Release)
+    TARGET_LINK_LIBRARIES(hill_climbing eoutilsd)   
+  ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug)
+    
+  IF(CMAKE_BUILD_TYPE STREQUAL Release)
   	TARGET_LINK_LIBRARIES(hill_climbing tsp)
     TARGET_LINK_LIBRARIES(hill_climbing eo)
     TARGET_LINK_LIBRARIES(hill_climbing eoutils)   
-  ELSE(CMAKE_BUILD_TYPE STREQUAL Debug)
-    MESSAGE(FATAL_ERROR " Cmake build type can only be \"Debug\" or \"Release\" ")
-  ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug)
-
-ENDIF(UNIX)
+  ENDIF(CMAKE_BUILD_TYPE STREQUAL Release) 
+  
+ENDIF(WIN32) 
 ######################################################################################
 
 
diff --git a/trunk/paradiseo-mo/tutorial/Lesson2/CMakeLists.txt b/trunk/paradiseo-mo/tutorial/Lesson2/CMakeLists.txt
index ca7dbfd4d..87db96702 100644
--- a/trunk/paradiseo-mo/tutorial/Lesson2/CMakeLists.txt
+++ b/trunk/paradiseo-mo/tutorial/Lesson2/CMakeLists.txt
@@ -19,9 +19,10 @@ INCLUDE_DIRECTORIES(${TSP_SRC_DIR})
 # --> UNIX 
 IF(UNIX)  
   LINK_DIRECTORIES(${EO_SRC_DIR} ${EO_SRC_DIR}/utils ${TSP_BINARY_DIR}/lib)
+ENDIF(UNIX)
 
 # --> WIN
-ELSEIF(WIN32)  
+IF(WIN32)  
   # "CMAKE_BUILD_TYPE" supposed to be given on the command line, default=Debug
   IF (NOT DEFINED CMAKE_BUILD_TYPE)
     set (CMAKE_BUILD_TYPE Debug)
@@ -30,12 +31,14 @@ ELSEIF(WIN32)
   IF (CMAKE_BUILD_TYPE STREQUAL Debug)
   	LINK_DIRECTORIES(${TSP_BINARY_DIR}\\debug)
   	LINK_DIRECTORIES(${EO_LIB_DIR}\\debug)
-  ELSEIF(CMAKE_BUILD_TYPE STREQUAL Release)
+  ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug)
+  
+  IF(CMAKE_BUILD_TYPE STREQUAL Release)
   	LINK_DIRECTORIES(${TSP_BINARY_DIR}\\release)
   	LINK_DIRECTORIES(${EO_LIB_DIR}\\release)  
-  ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug)
+  ENDIF(CMAKE_BUILD_TYPE STREQUAL Release)
 
-ENDIF(UNIX)
+ENDIF(WIN32)
 
 ######################################################################################
 
@@ -72,9 +75,10 @@ IF(UNIX)
   TARGET_LINK_LIBRARIES(tabu_search tsp) 
   TARGET_LINK_LIBRARIES(tabu_search eo)
   TARGET_LINK_LIBRARIES(tabu_search eoutils)
+ENDIF(UNIX)
 
 # --> WIN
-ELSEIF(WIN32)  
+IF(WIN32)  
   # "CMAKE_BUILD_TYPE" supposed to be given on the command line, default=Debug
   IF (NOT DEFINED CMAKE_BUILD_TYPE)
     set (CMAKE_BUILD_TYPE Debug)
@@ -83,16 +87,16 @@ ELSEIF(WIN32)
   IF (CMAKE_BUILD_TYPE STREQUAL Debug)
   	TARGET_LINK_LIBRARIES(tabu_search tsp)
     TARGET_LINK_LIBRARIES(tabu_search eod)
-    TARGET_LINK_LIBRARIES(tabu_search eoutilsd)    
-  ELSEIF(CMAKE_BUILD_TYPE STREQUAL Release)
+    TARGET_LINK_LIBRARIES(tabu_search eoutilsd)   
+   ELSE(CMAKE_BUILD_TYPE STREQUAL Debug)
+    
+  IF(CMAKE_BUILD_TYPE STREQUAL Release)
   	TARGET_LINK_LIBRARIES(tabu_search tsp)
     TARGET_LINK_LIBRARIES(tabu_search eo)
-    TARGET_LINK_LIBRARIES(tabu_search eoutils)  
-  ELSE(CMAKE_BUILD_TYPE STREQUAL Debug)
-    MESSAGE(FATAL_ERROR " Cmake build type can only be \"Debug\" or \"Release\" ") 
-  ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug)
+    TARGET_LINK_LIBRARIES(tabu_search eoutils)
+  ENDIF(CMAKE_BUILD_TYPE STREQUAL Release)
 
-ENDIF(UNIX)
+ENDIF(WIN32)
 ######################################################################################
 
 
diff --git a/trunk/paradiseo-mo/tutorial/Lesson3/CMakeLists.txt b/trunk/paradiseo-mo/tutorial/Lesson3/CMakeLists.txt
index 905745977..d806f2b2c 100644
--- a/trunk/paradiseo-mo/tutorial/Lesson3/CMakeLists.txt
+++ b/trunk/paradiseo-mo/tutorial/Lesson3/CMakeLists.txt
@@ -19,9 +19,10 @@ INCLUDE_DIRECTORIES(${TSP_SRC_DIR})
 # --> UNIX 
 IF(UNIX)  
   LINK_DIRECTORIES(${EO_SRC_DIR} ${EO_SRC_DIR}/utils ${TSP_BINARY_DIR}/lib)
+ENDIF(UNIX)
 
 # --> WIN
-ELSEIF(WIN32)  
+IF(WIN32)  
   # "CMAKE_BUILD_TYPE" supposed to be given on the command line, default=Debug
   IF (NOT DEFINED CMAKE_BUILD_TYPE)
     set (CMAKE_BUILD_TYPE Debug)
@@ -30,12 +31,14 @@ ELSEIF(WIN32)
   IF (CMAKE_BUILD_TYPE STREQUAL Debug)
   	LINK_DIRECTORIES(${TSP_BINARY_DIR}\\debug)
   	LINK_DIRECTORIES(${EO_LIB_DIR}\\debug)
-  ELSEIF(CMAKE_BUILD_TYPE STREQUAL Release)
+  ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug)
+  	
+  IF(CMAKE_BUILD_TYPE STREQUAL Release)
   	LINK_DIRECTORIES(${TSP_BINARY_DIR}\\release)
   	LINK_DIRECTORIES(${EO_LIB_DIR}\\release)  
-  ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug)
+  ENDIF(CMAKE_BUILD_TYPE STREQUAL Release)
 
-ENDIF(UNIX)
+ENDIF(WIN32)
 
 ######################################################################################
 
@@ -72,9 +75,10 @@ IF(UNIX)
   TARGET_LINK_LIBRARIES(simulated_annealing tsp) 
   TARGET_LINK_LIBRARIES(simulated_annealing eo)
   TARGET_LINK_LIBRARIES(simulated_annealing eoutils)
+ENDIF(UNIX)
 
 # --> WIN
-ELSEIF(WIN32)  
+IF(WIN32)  
   # "CMAKE_BUILD_TYPE" supposed to be given on the command line, default=Debug
   IF (NOT DEFINED CMAKE_BUILD_TYPE)
     set (CMAKE_BUILD_TYPE Debug)
@@ -84,15 +88,15 @@ ELSEIF(WIN32)
   	TARGET_LINK_LIBRARIES(simulated_annealing tsp)
     TARGET_LINK_LIBRARIES(simulated_annealing eod)
     TARGET_LINK_LIBRARIES(simulated_annealing eoutilsd)    
-  ELSEIF(CMAKE_BUILD_TYPE STREQUAL Release)
+  ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug)
+     
+  IF(CMAKE_BUILD_TYPE STREQUAL Release)
   	TARGET_LINK_LIBRARIES(simulated_annealing tsp)
     TARGET_LINK_LIBRARIES(simulated_annealing eo)
     TARGET_LINK_LIBRARIES(simulated_annealing eoutils)  
-  ELSE(CMAKE_BUILD_TYPE STREQUAL Debug)
-    MESSAGE(FATAL_ERROR " Cmake build type can only be \"Debug\" or \"Release\" ") 
-  ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug)
+  ENDIF(CMAKE_BUILD_TYPE STREQUAL Release)
 
-ENDIF(UNIX)
+ENDIF(WIN32)
 ######################################################################################
 
 
diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/CMakeLists.txt b/trunk/paradiseo-mo/tutorial/examples/tsp/CMakeLists.txt
index ad0de7e9c..4e75f7b17 100755
--- a/trunk/paradiseo-mo/tutorial/examples/tsp/CMakeLists.txt
+++ b/trunk/paradiseo-mo/tutorial/examples/tsp/CMakeLists.txt
@@ -51,12 +51,13 @@ SET (TSP_SOURCES 	graph.cpp
 # --> UNIX 
 IF(UNIX)   
   ADD_LIBRARY(tsp STATIC ${TSP_SOURCES})
-  		
+ENDIF(UNIX) 
+	
 # --> WIN
-ELSEIF(WIN32)  
+IF(WIN32)  
   ADD_LIBRARY(tsp STATIC ${TSP_SOURCES})
+ENDIF(WIN32)
 
-ENDIF(UNIX)
 ######################################################################################
 
 
diff --git a/trunk/paradiseo-moeo/src/CMakeLists.txt b/trunk/paradiseo-moeo/src/CMakeLists.txt
index 93f0fac3c..1c0b9ae74 100644
--- a/trunk/paradiseo-moeo/src/CMakeLists.txt
+++ b/trunk/paradiseo-moeo/src/CMakeLists.txt
@@ -21,12 +21,13 @@ SET (MOEO_SOURCES core/moeoObjectiveVectorTraits.cpp)
 # --> UNIX 
 IF(UNIX)   
   ADD_LIBRARY(moeo STATIC ${MOEO_SOURCES})
-  		
-# --> WIN
-ELSEIF(WIN32)  
-  ADD_LIBRARY(moeo STATIC ${MOEO_SOURCES})
-
 ENDIF(UNIX)
+		
+# --> WIN
+IF(WIN32)  
+  ADD_LIBRARY(moeo STATIC ${MOEO_SOURCES})
+ENDIF(WIN32)
+
 ######################################################################################
 
 
diff --git a/trunk/paradiseo-moeo/tutorial/Lesson1/CMakeLists.txt b/trunk/paradiseo-moeo/tutorial/Lesson1/CMakeLists.txt
index e7e1b7259..fcc736e35 100644
--- a/trunk/paradiseo-moeo/tutorial/Lesson1/CMakeLists.txt
+++ b/trunk/paradiseo-moeo/tutorial/Lesson1/CMakeLists.txt
@@ -35,9 +35,10 @@ INCLUDE_DIRECTORIES(${FLOWSHOP_SRC_DIR})
 # --> UNIX 
 IF(UNIX)  
   LINK_DIRECTORIES(${EO_SRC_DIR} ${EO_SRC_DIR}/utils ${ParadisEO-MOEO_BINARY_DIR}/lib ${FLOWSHOP_BINARY_DIR}/lib)
+ENDIF(UNIX)
 
 # --> WIN
-ELSEIF(WIN32)  
+IF(WIN32)  
   # "CMAKE_BUILD_TYPE" supposed to be given on the command line, default=Debug
   IF (NOT DEFINED CMAKE_BUILD_TYPE)
     set (CMAKE_BUILD_TYPE Debug)
@@ -47,13 +48,15 @@ ELSEIF(WIN32)
   	LINK_DIRECTORIES(${FLOWSHOP_BINARY_DIR}\\lib\\debug)
   	LINK_DIRECTORIES(${ParadisEO-MOEO_BINARY_DIR}\\lib\\debug)
   	LINK_DIRECTORIES(${EO_LIB_DIR}\\debug)
-  ELSEIF(CMAKE_BUILD_TYPE STREQUAL Release)
+  ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug)
+  	
+  IF(CMAKE_BUILD_TYPE STREQUAL Release)
   	LINK_DIRECTORIES(${FLOWSHOP_BINARY_DIR}\\lib\\release)
   	LINK_DIRECTORIES(${ParadisEO-MOEO_BINARY_DIR}\\lib\\release)
   	LINK_DIRECTORIES(${EO_LIB_DIR}\\release)  
-  ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug)
+  ENDIF(CMAKE_BUILD_TYPE STREQUAL Release)
 
-ENDIF(UNIX)
+ENDIF(WIN32)
 
 ######################################################################################
 
@@ -92,9 +95,10 @@ IF(UNIX)
   TARGET_LINK_LIBRARIES(FlowShopEA flowshop) 
   TARGET_LINK_LIBRARIES(FlowShopEA eo)
   TARGET_LINK_LIBRARIES(FlowShopEA eoutils)
+ENDIF(UNIX) 
 
 # --> WIN
-ELSEIF(WIN32)  
+IF(WIN32)  
   # "CMAKE_BUILD_TYPE" supposed to be given on the command line, default=Debug
   IF (NOT DEFINED CMAKE_BUILD_TYPE)
     set (CMAKE_BUILD_TYPE Debug)
@@ -104,17 +108,17 @@ ELSEIF(WIN32)
   	TARGET_LINK_LIBRARIES(FlowShopEA moeo)
   	TARGET_LINK_LIBRARIES(FlowShopEA flowshop)
     TARGET_LINK_LIBRARIES(FlowShopEA eod)
-    TARGET_LINK_LIBRARIES(FlowShopEA eoutilsd)    
-  ELSEIF(CMAKE_BUILD_TYPE STREQUAL Release)
+    TARGET_LINK_LIBRARIES(FlowShopEA eoutilsd)     
+  ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug) 
+      
+  IF(CMAKE_BUILD_TYPE STREQUAL Release)
   	TARGET_LINK_LIBRARIES(FlowShopEA moeo)
   	TARGET_LINK_LIBRARIES(FlowShopEA flowshop)
     TARGET_LINK_LIBRARIES(FlowShopEA eo)
     TARGET_LINK_LIBRARIES(FlowShopEA eoutils)   
-  ELSE(CMAKE_BUILD_TYPE STREQUAL Debug)
-    MESSAGE(FATAL_ERROR " Cmake build type can only be \"Debug\" or \"Release\" ")
-  ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug)
+  ENDIF(CMAKE_BUILD_TYPE STREQUAL Release)
 
-ENDIF(UNIX)
+ENDIF(WIN32) 
 ######################################################################################
 
 
diff --git a/trunk/paradiseo-moeo/tutorial/Lesson2/CMakeLists.txt b/trunk/paradiseo-moeo/tutorial/Lesson2/CMakeLists.txt
index 188903ae5..24b11dac9 100644
--- a/trunk/paradiseo-moeo/tutorial/Lesson2/CMakeLists.txt
+++ b/trunk/paradiseo-moeo/tutorial/Lesson2/CMakeLists.txt
@@ -17,9 +17,10 @@ INCLUDE_DIRECTORIES(${MOEO_SRC_DIR})
 # --> UNIX 
 IF(UNIX)  
   LINK_DIRECTORIES(${EO_SRC_DIR} ${EO_SRC_DIR}/utils ${ParadisEO-MOEO_BINARY_DIR}/lib)
+ENDIF(UNIX)
 
 # --> WIN
-ELSEIF(WIN32)  
+IF(WIN32)  
   # "CMAKE_BUILD_TYPE" supposed to be given on the command line, default=Debug
   IF (NOT DEFINED CMAKE_BUILD_TYPE)
     set (CMAKE_BUILD_TYPE Debug)
@@ -27,13 +28,15 @@ ELSEIF(WIN32)
  
   IF (CMAKE_BUILD_TYPE STREQUAL Debug)
   	LINK_DIRECTORIES(${ParadisEO-MOEO_BINARY_DIR}\\lib\\debug)
-  	LINK_DIRECTORIES(${EO_LIB_DIR}\\debug)  	
-  ELSEIF(CMAKE_BUILD_TYPE STREQUAL Release)
+  	LINK_DIRECTORIES(${EO_LIB_DIR}\\debug)   		
+  ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug)
+  
+  IF(CMAKE_BUILD_TYPE STREQUAL Release)
   	LINK_DIRECTORIES(${ParadisEO-MOEO_BINARY_DIR}\\lib\\release)
   	LINK_DIRECTORIES(${EO_LIB_DIR}\\release)  
-  ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug)
+  ENDIF(CMAKE_BUILD_TYPE STREQUAL Release)
 
-ENDIF(UNIX)
+ENDIF(WIN32)
 
 ######################################################################################
 
@@ -70,9 +73,10 @@ IF(UNIX)
   TARGET_LINK_LIBRARIES(sch1 moeo)
   TARGET_LINK_LIBRARIES(sch1 eo)
   TARGET_LINK_LIBRARIES(sch1 eoutils)
+ENDIF(UNIX)
 
 # --> WIN
-ELSEIF(WIN32)  
+IF(WIN32)  
   # "CMAKE_BUILD_TYPE" supposed to be given on the command line, default=Debug
   IF (NOT DEFINED CMAKE_BUILD_TYPE)
     set (CMAKE_BUILD_TYPE Debug)
@@ -81,16 +85,16 @@ ELSEIF(WIN32)
   IF (CMAKE_BUILD_TYPE STREQUAL Debug)
   	TARGET_LINK_LIBRARIES(sch1 moeo)
     TARGET_LINK_LIBRARIES(sch1 eod)
-    TARGET_LINK_LIBRARIES(sch1 eoutilsd)    
-  ELSEIF(CMAKE_BUILD_TYPE STREQUAL Release)
+    TARGET_LINK_LIBRARIES(sch1 eoutilsd)   
+  ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug)  
+     
+  IF(CMAKE_BUILD_TYPE STREQUAL Release)
   	TARGET_LINK_LIBRARIES(sch1 moeo)
     TARGET_LINK_LIBRARIES(sch1 eo)
     TARGET_LINK_LIBRARIES(sch1 eoutils)   
-  ELSE(CMAKE_BUILD_TYPE STREQUAL Debug)
-    MESSAGE(FATAL_ERROR " Cmake build type can only be \"Debug\" or \"Release\" ")
-  ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug)
+  ENDIF(CMAKE_BUILD_TYPE STREQUAL Release)
 
-ENDIF(UNIX)
+ENDIF(WIN32)
 ######################################################################################
 
 
diff --git a/trunk/paradiseo-moeo/tutorial/examples/flowshop/CMakeLists.txt b/trunk/paradiseo-moeo/tutorial/examples/flowshop/CMakeLists.txt
index 78af616e8..058aeed14 100644
--- a/trunk/paradiseo-moeo/tutorial/examples/flowshop/CMakeLists.txt
+++ b/trunk/paradiseo-moeo/tutorial/examples/flowshop/CMakeLists.txt
@@ -33,9 +33,10 @@ INCLUDE_DIRECTORIES(${FLOWSHOP_SRC_DIR})
 # --> UNIX 
 IF(UNIX)  
   LINK_DIRECTORIES(${EO_SRC_DIR} ${EO_SRC_DIR}/utils ${ParadisEO-MOEO_BINARY_DIR}/lib)
+ENDIF(UNIX)
 
 # --> WIN
-ELSEIF(WIN32)  
+IF(WIN32)  
   # "CMAKE_BUILD_TYPE" supposed to be given on the command line, default=Debug
   IF (NOT DEFINED CMAKE_BUILD_TYPE)
     set (CMAKE_BUILD_TYPE Debug)
@@ -44,12 +45,13 @@ ELSEIF(WIN32)
   IF (CMAKE_BUILD_TYPE STREQUAL Debug)
   	LINK_DIRECTORIES(${ParadisEO-MOEO_BINARY_DIR}\\lib\\debug)
   	LINK_DIRECTORIES(${EO_LIB_DIR}\\debug)
-  ELSEIF(CMAKE_BUILD_TYPE STREQUAL Release)
+  ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug)	
+  
+  IF(CMAKE_BUILD_TYPE STREQUAL Release)
   	LINK_DIRECTORIES(${ParadisEO-MOEO_BINARY_DIR}\\lib\\release)
   	LINK_DIRECTORIES(${EO_LIB_DIR}\\release)  
-  ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug)
-
-ENDIF(UNIX)
+  ENDIF(CMAKE_BUILD_TYPE STREQUAL Release)
+ENDIF(WIN32)  
 
 ######################################################################################
 
@@ -74,11 +76,12 @@ SET (FLOWSHOP_SOURCES   FlowShopBenchmarkParser.cpp
 # --> UNIX 
 IF(UNIX)   
   ADD_LIBRARY(flowshop STATIC ${FLOWSHOP_SOURCES})
-  		
-# --> WIN
-ELSEIF(WIN32)  
-  ADD_LIBRARY(flowshop STATIC ${FLOWSHOP_SOURCES})
+ENDIF(UNIX)
 
+# --> WIN
+IF(WIN32)  
+  ADD_LIBRARY(flowshop STATIC ${FLOWSHOP_SOURCES})
+ENDIF(WIN32) 
 
 ADD_DEPENDENCIES(flowshop moeo)
 
@@ -104,9 +107,10 @@ SET_TARGET_PROPERTIES(flowshop PROPERTIES VERSION "${FLOWSHOP_VERSION}")
 IF(UNIX) 
   TARGET_LINK_LIBRARIES(flowshop moeo)
   TARGET_LINK_LIBRARIES(flowshop eo)
+ENDIF(UNIX)
 
 # --> APPLE AND WIN
-ELSEIF(WIN32)  
+IF(WIN32)  
   # "CMAKE_BUILD_TYPE" supposed to be given on the command line, default=Debug
   IF (NOT DEFINED CMAKE_BUILD_TYPE)
     set (CMAKE_BUILD_TYPE Debug)
@@ -115,14 +119,14 @@ ELSEIF(WIN32)
   IF (CMAKE_BUILD_TYPE STREQUAL Debug)
   	TARGET_LINK_LIBRARIES(flowshop moeo)
     TARGET_LINK_LIBRARIES(flowshop eod)
-  ELSEIF(CMAKE_BUILD_TYPE STREQUAL Release)
+  ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug)
+   
+  IF(CMAKE_BUILD_TYPE STREQUAL Release)
   	TARGET_LINK_LIBRARIES(flowshop moeo)
     TARGET_LINK_LIBRARIES(flowshop eo)
-  ELSE(CMAKE_BUILD_TYPE STREQUAL Debug)
-    MESSAGE(FATAL_ERROR " Cmake build type can only be \"Debug\" or \"Release\" ")
-  ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug)
-
-ENDIF(UNIX)
+  ENDIF(CMAKE_BUILD_TYPE STREQUAL Release)
+ 
+ENDIF(WIN32)
 ######################################################################################