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:25:20 +00:00
parent 7dcdf849a4
commit 08b55a4bd8
2 changed files with 9 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
crlcore/CMakeLists.txt
View File

@ -2,13 +2,13 @@ PROJECT(CRLCORE)
CMAKE_MINIMUM_REQUIRED(VERSION 2.4.0)
IF(COMMAND CMAKE_POLICY)
CMAKE_POLICY(SET CMP0003 NEW)
CMAKE_POLICY(SET CMP0005 NEW)
IF(NOT (CMAKE_VERSION VERSION_LESS 2.8.0))
CMAKE_POLICY(SET CMP0014 OLD)
ENDIF(NOT (CMAKE_VERSION VERSION_LESS 2.8.0))
ENDIF(COMMAND CMAKE_POLICY)
#IF(COMMAND CMAKE_POLICY)
# CMAKE_POLICY(SET CMP0003 NEW)
# CMAKE_POLICY(SET CMP0005 NEW)
# IF(NOT (CMAKE_VERSION VERSION_LESS 2.8.0))
# CMAKE_POLICY(SET CMP0014 OLD)
# ENDIF(NOT (CMAKE_VERSION VERSION_LESS 2.8.0))
#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.
@ -52,9 +52,9 @@ ENDIF(IS_USR OR IS_OPT)
SET(QT_USE_QTXML "true")
FIND_PACKAGE(Goodies REQUIRED)
set_cmake_policies()
set_lib_link_mode()
SetupBoost(program_options filesystem python regex)
setup_boost(program_options filesystem python regex)
FIND_PACKAGE(LibXml2 REQUIRED)
FIND_PACKAGE(PythonLibs REQUIRED)

21
crlcore/cmake_modules/FindCORIOLIS.cmake
View File

@ -10,24 +10,6 @@ SET(CORIOLIS_DIR_MESSAGE "Set the CORIOLIS_INCLUDE_DIR cmake cache entry to the
# don't even bother under WIN32
IF(UNIX)
# Setup the DIR_SEARCH_PATH.
#MACRO(SETUP_SEARCH_DIR project)
# IF( NOT("$ENV{${project}_USER_TOP}" STREQUAL "") )
# MESSAGE("-- ${project}_USER_TOP is set to $ENV{${project}_USER_TOP}")
# LIST(FIND ${project}_DIR_SEARCH "${${project}_DIR_SEARCH}" DIR_INDEX)
# IF( DIR_INDEX LESS 0)
# LIST(INSERT ${project}_DIR_SEARCH 0 "$ENV{${project}_USER_TOP}")
# ENDIF( DIR_INDEX LESS 0)
# ENDIF( NOT("$ENV{${project}_USER_TOP}" STREQUAL "") )
#
# IF( NOT("$ENV{${project}_TOP}" STREQUAL "") )
# MESSAGE("-- ${project}_TOP is set to $ENV{${project}_TOP}")
# LIST(FIND ${project}_DIR_SEARCH "${${project}_DIR_SEARCH}" DIR_INDEX)
# IF( DIR_INDEX LESS 0)
# LIST(INSERT ${project}_DIR_SEARCH 0 "$ENV{${project}_TOP}")
# ENDIF( DIR_INDEX LESS 0)
# ENDIF( NOT("$ENV{${project}_TOP}" STREQUAL "") )
#ENDMACRO(SETUP_SEARCH_DIR project)
SETUP_SEARCH_DIR(CORIOLIS)
#
@ -68,9 +50,6 @@ IF(UNIX)
SET_LIBRARIES_PATH(CORIOLIS CRLCORE)
SET_LIBRARIES_PATH(CORIOLIS_PYTHON CORIOLIS_PYTHON)
MESSAGE("${CORIOLIS_PYTHON_INCLUDE_PATH}")
MESSAGE("${CORIOLIS_PYTHON_LIBRARY_PATH}")
HURRICANE_CHECK_LIBRARIES(CORIOLIS)
HURRICANE_CHECK_LIBRARIES(CORIOLIS_PYTHON ${CORIOLIS_FIND_REQUIRED})