From aa72861142bdfe10a1d552cd29fc6f06d97717db Mon Sep 17 00:00:00 2001
From: The Coriolis Project <alliance-users@asim.lip6.fr>
Date: Wed, 28 Apr 2010 21:54:56 +0000
Subject: [PATCH] Correct pathes detection.

---
 ispd/CMakeLists.txt | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/ispd/CMakeLists.txt b/ispd/CMakeLists.txt
index 931de901..a7b034b0 100644
--- a/ispd/CMakeLists.txt
+++ b/ispd/CMakeLists.txt
@@ -1,4 +1,4 @@
-PROJECT(UNICORN)
+PROJECT(ISPD)
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.4.0)
 IF(COMMAND CMAKE_POLICY)
@@ -28,35 +28,36 @@ SET(CMAKE_CXX_FLAGS_DEBUG           "-g -Wall" CACHE STRING "Debug options." FOR
 # This macro has to be included in all the tools CMakeLists.txt as it's
 # the sole means of localizing other tools/projects.
 MACRO(SETUP_PROJECT_PATHS project)
-  IF( NOT("$ENV{${project}_USER_TOP}" STREQUAL "") )
-    MESSAGE("-- ${project}_USER_TOP is set to $ENV{${project}_USER_TOP}")
-    SET(PROJECT_MODULE_PATH "$ENV{${project}_USER_TOP}/share/cmake_modules/")
-    LIST(FIND CMAKE_MODULE_PATH "${PROJECT_MODULE_PATH}" DIR_INDEX)
-    IF( DIR_INDEX LESS 0)
-      LIST(INSERT CMAKE_MODULE_PATH 0 "${PROJECT_MODULE_PATH}")
-    ENDIF( DIR_INDEX LESS 0)
-  ENDIF( NOT("$ENV{${project}_USER_TOP}" STREQUAL "") )
-  
   IF( NOT("$ENV{${project}_TOP}" STREQUAL "") )
     MESSAGE("-- ${project}_TOP is set to $ENV{${project}_TOP}")
     SET(PROJECT_MODULE_PATH "$ENV{${project}_TOP}/share/cmake_modules/")
-    LIST(FIND CMAKE_MODULE_PATH "${PROJECT_MODULE_PATH}" DIR_INDEX)
-    IF( DIR_INDEX LESS 0)
-      LIST(INSERT CMAKE_MODULE_PATH 0 "${PROJECT_MODULE_PATH}")
-    ENDIF( DIR_INDEX LESS 0)
+    LIST(INSERT CMAKE_MODULE_PATH 0 "${PROJECT_MODULE_PATH}")
   ENDIF( NOT("$ENV{${project}_TOP}" STREQUAL "") )
+
+  IF( NOT("$ENV{${project}_USER_TOP}" STREQUAL "") )
+    MESSAGE("-- ${project}_USER_TOP is set to $ENV{${project}_USER_TOP}")
+    SET(PROJECT_MODULE_PATH "$ENV{${project}_USER_TOP}/share/cmake_modules/")
+    LIST(INSERT CMAKE_MODULE_PATH 0 "${PROJECT_MODULE_PATH}")
+  ENDIF( NOT("$ENV{${project}_USER_TOP}" STREQUAL "") )
+
+  LIST(REMOVE_DUPLICATES CMAKE_MODULE_PATH)
 ENDMACRO(SETUP_PROJECT_PATHS project)
 
 SETUP_PROJECT_PATHS(IO)
 SETUP_PROJECT_PATHS(CORIOLIS)
 
+MESSAGE("-- Components of CMAKE_MODULE_PATH:")
+FOREACH(PATH IN LISTS CMAKE_MODULE_PATH)
+  MESSAGE("--   ${PATH}")
+ENDFOREACH(PATH)
+
 SET(QT_USE_QTXML "true")
 
 FIND_PACKAGE(Boost 1.33.1 COMPONENTS program_options REQUIRED)
 FIND_PACKAGE(Qt4 REQUIRED) # find and setup Qt4 for this project
 FIND_PACKAGE(IO REQUIRED)
-FIND_PACKAGE(LEFDEF REQUIRED)
 FIND_PACKAGE(HURRICANE REQUIRED)
+FIND_PACKAGE(LEFDEF REQUIRED)
 FIND_PACKAGE(CORIOLIS REQUIRED)
 FIND_PACKAGE(KNIK REQUIRED)
 FIND_PACKAGE(KATABATIC REQUIRED)