From 9ecac8f9f6aacb965fdd7abc3997f791a909ab5d Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Tue, 13 Jul 2010 16:34:16 +0000 Subject: [PATCH] All tools: using the new Goodies macro. Suppress loops in Hurricane libraries. --- cumulus/CMakeLists.txt | 38 +++++++++----------------------------- 1 file changed, 9 insertions(+), 29 deletions(-) diff --git a/cumulus/CMakeLists.txt b/cumulus/CMakeLists.txt index 4d2fbb58..4d1ff41a 100644 --- a/cumulus/CMakeLists.txt +++ b/cumulus/CMakeLists.txt @@ -1,30 +1,5 @@ PROJECT(CUMULUS) -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. MACRO(SETUP_PROJECT_PATHS project) @@ -43,9 +18,6 @@ MACRO(SETUP_PROJECT_PATHS project) LIST(REMOVE_DUPLICATES CMAKE_MODULE_PATH) ENDMACRO(SETUP_PROJECT_PATHS project) -SETUP_PROJECT_PATHS(VLSISAPD) -SETUP_PROJECT_PATHS(CORIOLIS) - STRING(REGEX MATCH "^/usr" IS_USR "$ENV{CORIOLIS_TOP}") STRING(REGEX MATCH "^/opt" IS_OPT "$ENV{CORIOLIS_TOP}") IF(IS_USR OR IS_OPT) @@ -56,12 +28,20 @@ ELSE(IS_USR OR IS_OPT) SET(SYS_CONF_DIR "etc" CACHE STRING "System configuration directory (/etc)" FORCE) ENDIF(IS_USR OR IS_OPT) +SETUP_PROJECT_PATHS(GOODIES) +SETUP_PROJECT_PATHS(VLSISAPD) +SETUP_PROJECT_PATHS(CORIOLIS) + +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)