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

---
 stratus1/CMakeLists.txt          | 31 ++++++-------------------------
 stratus1/src/stratus/st_model.py |  1 +
 2 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/stratus1/CMakeLists.txt b/stratus1/CMakeLists.txt
index 2f69d534..c0c08a97 100644
--- a/stratus1/CMakeLists.txt
+++ b/stratus1/CMakeLists.txt
@@ -1,29 +1,6 @@
 PROJECT(STRATUS1)
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.4.0)
-IF(COMMAND CMAKE_POLICY)
-  CMAKE_POLICY(SET CMP0003 NEW)
-ENDIF(COMMAND CMAKE_POLICY)
-
-IF(APPLE)
-  EXECUTE_PROCESS(
-    COMMAND sw_vers -productVersion
-    OUTPUT_VARIABLE OSX_VERSION
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
-  MESSAGE(STATUS "OSX_VERSION='${OSX_VERSION}'")
-  IF(${OSX_VERSION} MATCHES "^10\\.[012345]\\.?")
-    MESSAGE(STATUS "OSX < 10.6")
-  ELSE(${OSX_VERSION} MATCHES "^10\\.[012345]\\.?")
-    SET(CMAKE_OSX_ARCHITECTURES "i386;ppc") # for QT4.5 32bits on snow leopard
-  ENDIF(${OSX_VERSION} MATCHES "^10\\.[012345]\\.?")
-ENDIF(APPLE)
-
-SET(CMAKE_C_FLAGS_DEBUG             "-g -Wall" CACHE STRING "Debug options." FORCE)
-SET(CMAKE_CXX_FLAGS_DEBUG           "-g -Wall" CACHE STRING "Debug options." FORCE)
-#SET(CMAKE_LINKER_FLAGS_DEBUG        "-pg"          CACHE STRING "Debug options." FORCE)
-#SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "-pg"          CACHE STRING "Debug options." FORCE)
-#SET(CMAKE_MODULE_LINKER_FLAGS_DEBUG "-pg"          CACHE STRING "Debug options." FORCE)
-#SET(CMAKE_EXE_LINKER_FLAGS_DEBUG    "-pg"          CACHE STRING "Debug options." FORCE)
 
 # This macro has to be included in all the tools CMakeLists.txt as it's
 # the sole means of localizing other tools/projects.
@@ -43,6 +20,7 @@ MACRO(SETUP_PROJECT_PATHS project)
   LIST(REMOVE_DUPLICATES CMAKE_MODULE_PATH)
 ENDMACRO(SETUP_PROJECT_PATHS project)
 
+SETUP_PROJECT_PATHS(GOODIES)
 SETUP_PROJECT_PATHS(VLSISAPD)
 SETUP_PROJECT_PATHS(CORIOLIS)
 
@@ -56,13 +34,16 @@ ELSE(IS_USR OR IS_OPT)
   SET(SYS_CONF_DIR "etc" CACHE STRING "System configuration directory (/etc)" FORCE)
 ENDIF(IS_USR OR IS_OPT)
 
+FIND_PACKAGE(Goodies REQUIRED)
+SET_CMAKE_POLICIES()
+SET_LIB_LINK_MODE()
+SETUP_APPLE()
+
 FIND_PACKAGE(PythonLibs REQUIRED)
 FIND_PACKAGE(PythonSitePackages REQUIRED)
 FIND_PACKAGE(VLSISAPD REQUIRED)
 FIND_PACKAGE(HURRICANE REQUIRED)
 FIND_PACKAGE(CORIOLIS REQUIRED)
 
-SET_LIB_LINK_MODE()
-
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(etc)
diff --git a/stratus1/src/stratus/st_model.py b/stratus1/src/stratus/st_model.py
index 5d74fdd5..b5e8f577 100644
--- a/stratus1/src/stratus/st_model.py
+++ b/stratus1/src/stratus/st_model.py
@@ -49,6 +49,7 @@
 
 
 from Hurricane  import *
+import Viewer
 import CRL
 
 import re, types, string