* ./hurricane:

- Change: When static linking is required, also switch Boost libraries in static
        mode. Automatically done is modules using FindHURRICANE through
        SET_LIB_LINK_MODE(). Note: FindBoost must be called *after* SET_LIB_LINK_MODE().
This commit is contained in:
Jean-Paul Chaput 2010-05-31 12:27:50 +00:00
parent 62790ef0dc
commit e51246d3c7
2 changed files with 18 additions and 11 deletions

View File

@ -33,6 +33,18 @@ LIST(INSERT CMAKE_MODULE_PATH 0 "${HURRICANE_SOURCE_DIR}/cmake_modules/")
OPTION(BUILD_DOC "Build the documentation (doxygen)" OFF)
SET(QT_USE_QTXML "true")
#SET(QT_USE_QTOPENGL "true")
FIND_PACKAGE(Qt4 REQUIRED) # find and setup Qt4 for this project
FIND_PACKAGE(BISON REQUIRED)
FIND_PACKAGE(FLEX REQUIRED)
FIND_PACKAGE(PythonLibs REQUIRED)
FIND_PACKAGE(PythonSitePackages REQUIRED)
IF(BUILD_DOC)
FIND_PACKAGE(Doxygen)
ENDIF(BUILD_DOC)
#SET_LIB_LINK_MODE()
IF(NOT BUILD_SHARED_LIBS)
# check for qmake
@ -41,22 +53,15 @@ IF(NOT BUILD_SHARED_LIBS)
NO_DEFAULT_PATH
)
MESSAGE(STATUS "Building static libraries.")
IF(Boost_FOUND)
SET(Boost_USE_STATIC_LIBS ON)
MESSAGE(STATUS "Using Boost static libraries.")
ENDIF(Boost_FOUND)
ELSE(NOT BUILD_SHARED_LIBS)
MESSAGE(STATUS "Building dynamic libraries.")
ENDIF(NOT BUILD_SHARED_LIBS)
SET(QT_USE_QTXML "true")
#SET(QT_USE_QTOPENGL "true")
FIND_PACKAGE(Qt4 REQUIRED) # find and setup Qt4 for this project
FIND_PACKAGE(BISON REQUIRED)
FIND_PACKAGE(FLEX REQUIRED)
FIND_PACKAGE(Boost 1.33.1 COMPONENTS regex REQUIRED)
FIND_PACKAGE(PythonLibs REQUIRED)
FIND_PACKAGE(PythonSitePackages REQUIRED)
IF(BUILD_DOC)
FIND_PACKAGE(Doxygen)
ENDIF(BUILD_DOC)
ADD_SUBDIRECTORY(src)
ADD_SUBDIRECTORY(cmake_modules)

View File

@ -47,6 +47,8 @@ MACRO(SET_LIB_LINK_MODE)
/opt/qt4-static-4.3.2/bin
NO_DEFAULT_PATH
)
SET(Boost_USE_STATIC_LIBS ON)
MESSAGE(STATUS "Using Boost static libraries.")
MESSAGE(STATUS "Building static libraries.")
ELSE(NOT BUILD_SHARED_LIBS)
MESSAGE(STATUS "Building dynamic libraries.")