diff --git a/kite/CMakeLists.txt b/kite/CMakeLists.txt index 26fe2f7e..256035b4 100644 --- a/kite/CMakeLists.txt +++ b/kite/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,15 +23,20 @@ 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) FIND_PACKAGE(LibXml2 REQUIRED) +SET(QT_USE_QTXML "true") FIND_PACKAGE(Qt4 REQUIRED) # find and setup Qt4 for this project FIND_PACKAGE(PythonLibs REQUIRED) FIND_PACKAGE(PythonSitePackages REQUIRED) @@ -55,16 +47,6 @@ FIND_PACKAGE(CORIOLIS REQUIRED) FIND_PACKAGE(KNIK REQUIRED) FIND_PACKAGE(KATABATIC 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}") - IF(CHECK_DATABASE) ADD_DEFINITIONS(-DCHECK_DATABASE) ENDIF(CHECK_DATABASE)