jcarr
/
coriolis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

All tools: using the new Goodies macro. 

Suppress loops in Hurricane libraries.
This commit is contained in:
Jean-Paul Chaput 2010-07-13 16:34:14 +00:00
parent 6ba12d7e06
commit 766f825168
2 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
stratus1/CMakeLists.txt
View File

@ -1,29 +1,6 @@
PROJECT(STRATUS1) PROJECT(STRATUS1)
CMAKE_MINIMUM_REQUIRED(VERSION 2.4.0) 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 # This macro has to be included in all the tools CMakeLists.txt as it's
# the sole means of localizing other tools/projects. # the sole means of localizing other tools/projects.
@ -43,6 +20,7 @@ MACRO(SETUP_PROJECT_PATHS project)
LIST(REMOVE_DUPLICATES CMAKE_MODULE_PATH) LIST(REMOVE_DUPLICATES CMAKE_MODULE_PATH)
ENDMACRO(SETUP_PROJECT_PATHS project) ENDMACRO(SETUP_PROJECT_PATHS project)
SETUP_PROJECT_PATHS(GOODIES)
SETUP_PROJECT_PATHS(VLSISAPD) SETUP_PROJECT_PATHS(VLSISAPD)
SETUP_PROJECT_PATHS(CORIOLIS) 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) SET(SYS_CONF_DIR "etc" CACHE STRING "System configuration directory (/etc)" FORCE)
ENDIF(IS_USR OR IS_OPT) 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(PythonLibs REQUIRED)
FIND_PACKAGE(PythonSitePackages REQUIRED) FIND_PACKAGE(PythonSitePackages REQUIRED)
FIND_PACKAGE(VLSISAPD REQUIRED) FIND_PACKAGE(VLSISAPD REQUIRED)
FIND_PACKAGE(HURRICANE REQUIRED) FIND_PACKAGE(HURRICANE REQUIRED)
FIND_PACKAGE(CORIOLIS REQUIRED) FIND_PACKAGE(CORIOLIS REQUIRED)
SET_LIB_LINK_MODE()
ADD_SUBDIRECTORY(src) ADD_SUBDIRECTORY(src)
ADD_SUBDIRECTORY(etc) ADD_SUBDIRECTORY(etc)

1
stratus1/src/stratus/st_model.py
View File

@ -49,6 +49,7 @@
from Hurricane import * from Hurricane import *
import Viewer
import CRL import CRL
import re, types, string import re, types, string