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

---
 unicorn/CMakeLists.txt     | 12 ++++--------
 unicorn/src/CMakeLists.txt |  8 ++++----
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/unicorn/CMakeLists.txt b/unicorn/CMakeLists.txt
index f383d452..01779980 100644
--- a/unicorn/CMakeLists.txt
+++ b/unicorn/CMakeLists.txt
@@ -35,20 +35,16 @@ MACRO(SETUP_PROJECT_PATHS project)
   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(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}_USER_TOP}" STREQUAL "") )
+
+  LIST(REMOVE_DUPLICATES CMAKE_MODULE_PATH)
 ENDMACRO(SETUP_PROJECT_PATHS project)
 
 SETUP_PROJECT_PATHS(IO)
diff --git a/unicorn/src/CMakeLists.txt b/unicorn/src/CMakeLists.txt
index c709c864..ffebc6da 100644
--- a/unicorn/src/CMakeLists.txt
+++ b/unicorn/src/CMakeLists.txt
@@ -17,10 +17,10 @@
      qt4_add_resources ( RCC_SRCS      Unicorn.qrc )
 
            add_library ( unicorn        ${cpps} ${MOCcpps} )
- target_link_libraries ( unicorn       #${SOLSTICE_GRAPHICAL_LIBRARIES}
-                                       #${SOLSTICE_LIBRARIES}
-                                       #${EQUINOX_GRAPHICAL_LIBRARIES}
-                                       #${EQUINOX_LIBRARIES}
+ target_link_libraries ( unicorn        ${SOLSTICE_GRAPHICAL_LIBRARIES}
+                                        ${SOLSTICE_LIBRARIES}
+                                        ${EQUINOX_GRAPHICAL_LIBRARIES}
+                                        ${EQUINOX_LIBRARIES}
                                         ${KITE_GRAPHICAL_LIBRARIES}
                                         ${KITE_LIBRARIES}
                                         ${KATABATIC_GRAPHICAL_LIBRARIES}