From 08b55a4bd81e7ad7f0eeaca3e8612a460fad4f0c Mon Sep 17 00:00:00 2001
From: Jean-Paul Chaput <Jean-Paul.Chaput@lip6.fr>
Date: Tue, 13 Jul 2010 16:25:20 +0000
Subject: [PATCH] All tools: using the new Goodies macro. Suppress loops in
 Hurricane libraries.

---
 crlcore/CMakeLists.txt                   | 18 +++++++++---------
 crlcore/cmake_modules/FindCORIOLIS.cmake | 21 ---------------------
 2 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/crlcore/CMakeLists.txt b/crlcore/CMakeLists.txt
index 2bee3284..a36940a0 100644
--- a/crlcore/CMakeLists.txt
+++ b/crlcore/CMakeLists.txt
@@ -2,13 +2,13 @@ PROJECT(CRLCORE)
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.4.0)
 
-IF(COMMAND CMAKE_POLICY)
-  CMAKE_POLICY(SET CMP0003 NEW)
-  CMAKE_POLICY(SET CMP0005 NEW)
-  IF(NOT (CMAKE_VERSION VERSION_LESS 2.8.0))
-    CMAKE_POLICY(SET CMP0014 OLD)
-  ENDIF(NOT (CMAKE_VERSION VERSION_LESS 2.8.0))
-ENDIF(COMMAND CMAKE_POLICY)
+#IF(COMMAND CMAKE_POLICY)
+#  CMAKE_POLICY(SET CMP0003 NEW)
+#  CMAKE_POLICY(SET CMP0005 NEW)
+#  IF(NOT (CMAKE_VERSION VERSION_LESS 2.8.0))
+#    CMAKE_POLICY(SET CMP0014 OLD)
+#  ENDIF(NOT (CMAKE_VERSION VERSION_LESS 2.8.0))
+#ENDIF(COMMAND CMAKE_POLICY)
 
 # This macro has to be included in all the tools CMakeLists.txt as it's
 # the sole means of localizing other tools/projects.
@@ -52,9 +52,9 @@ ENDIF(IS_USR OR IS_OPT)
 SET(QT_USE_QTXML "true")
 
 FIND_PACKAGE(Goodies REQUIRED)
-
+set_cmake_policies()
 set_lib_link_mode()
-SetupBoost(program_options filesystem python regex)
+setup_boost(program_options filesystem python regex)
 
 FIND_PACKAGE(LibXml2 REQUIRED)
 FIND_PACKAGE(PythonLibs REQUIRED)
diff --git a/crlcore/cmake_modules/FindCORIOLIS.cmake b/crlcore/cmake_modules/FindCORIOLIS.cmake
index 0fa3670e..10983b06 100644
--- a/crlcore/cmake_modules/FindCORIOLIS.cmake
+++ b/crlcore/cmake_modules/FindCORIOLIS.cmake
@@ -10,24 +10,6 @@ SET(CORIOLIS_DIR_MESSAGE "Set the CORIOLIS_INCLUDE_DIR cmake cache entry to the
 
 # don't even bother under WIN32
 IF(UNIX)
-  # Setup the DIR_SEARCH_PATH.
-  #MACRO(SETUP_SEARCH_DIR project)
-  #  IF( NOT("$ENV{${project}_USER_TOP}" STREQUAL "") )
-  #    MESSAGE("-- ${project}_USER_TOP is set to $ENV{${project}_USER_TOP}")
-  #    LIST(FIND ${project}_DIR_SEARCH "${${project}_DIR_SEARCH}" DIR_INDEX)
-  #    IF( DIR_INDEX LESS 0)
-  #      LIST(INSERT ${project}_DIR_SEARCH 0 "$ENV{${project}_USER_TOP}")
-  #    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}")
-  #    LIST(FIND ${project}_DIR_SEARCH "${${project}_DIR_SEARCH}" DIR_INDEX)
-  #    IF( DIR_INDEX LESS 0)
-  #      LIST(INSERT ${project}_DIR_SEARCH 0 "$ENV{${project}_TOP}")
-  #    ENDIF( DIR_INDEX LESS 0)
-  #  ENDIF( NOT("$ENV{${project}_TOP}" STREQUAL "") )
-  #ENDMACRO(SETUP_SEARCH_DIR project)
   
   SETUP_SEARCH_DIR(CORIOLIS)
   #
@@ -68,9 +50,6 @@ IF(UNIX)
   SET_LIBRARIES_PATH(CORIOLIS CRLCORE)
   SET_LIBRARIES_PATH(CORIOLIS_PYTHON CORIOLIS_PYTHON)
 
-  MESSAGE("${CORIOLIS_PYTHON_INCLUDE_PATH}")
-  MESSAGE("${CORIOLIS_PYTHON_LIBRARY_PATH}")
-
   HURRICANE_CHECK_LIBRARIES(CORIOLIS)
   HURRICANE_CHECK_LIBRARIES(CORIOLIS_PYTHON ${CORIOLIS_FIND_REQUIRED})