From dba1cc52a89bf4d0ef897fd7583e5bb2bfffde52 Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Tue, 13 Jul 2010 16:25:31 +0000 Subject: [PATCH] All tools: using the new Goodies macro. Suppress loops in Hurricane libraries. --- katabatic/CMakeLists.txt | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/katabatic/CMakeLists.txt b/katabatic/CMakeLists.txt index 0b84d215..fd3823d3 100644 --- a/katabatic/CMakeLists.txt +++ b/katabatic/CMakeLists.txt @@ -5,19 +5,6 @@ OPTION(CHECK_DATABASE "Run database in full check mode (very slow)" OFF) CMAKE_MINIMUM_REQUIRED(VERSION 2.4.0) -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) -SET(CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG -Wall" CACHE STRING "Release options." FORCE) -SET(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG -Wall" CACHE STRING "Release options." FORCE) - -IF(COMMAND CMAKE_POLICY) - CMAKE_POLICY(SET CMP0003 NEW) -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. MACRO(SETUP_PROJECT_PATHS project) @@ -36,30 +23,25 @@ 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) -SET(QT_USE_QTXML "true") +FIND_PACKAGE(Goodies REQUIRED) +SET_CMAKE_POLICIES() +SET_LIB_LINK_MODE() +SETUP_BOOST(program_options filesystem python regex) IF(BUILD_DOC) FIND_PACKAGE(Doxygen) ENDIF(BUILD_DOC) +SET(QT_USE_QTXML "true") FIND_PACKAGE(Qt4 REQUIRED) # find and setup Qt4 for this project FIND_PACKAGE(VLSISAPD REQUIRED) FIND_PACKAGE(HURRICANE REQUIRED) FIND_PACKAGE(CORIOLIS REQUIRED) FIND_PACKAGE(KNIK REQUIRED) -SET_LIB_LINK_MODE() -SET(Boost_USE_STATIC_LIBS ON) -MESSAGE(STATUS "Always uses Boost static libraries.") -FIND_PACKAGE(Boost 1.35.0 COMPONENTS program_options filesystem system regex python) -IF(NOT Boost_FOUND) - FIND_PACKAGE(Boost 1.33.1 COMPONENTS program_options filesystem python regex REQUIRED) -ENDIF(NOT Boost_FOUND) -MESSAGE(STATUS "Found Boost libraries ${Boost_LIB_VERSION} in ${Boost_INCLUDE_DIR}") -MESSAGE(STATUS " ${Boost_LIBRARIES}") - ADD_SUBDIRECTORY(src) ADD_SUBDIRECTORY(cmake_modules) IF(BUILD_DOC AND DOXYGEN_FOUND)