|
@ -42,12 +42,11 @@ else() |
|
|
set (CMAKE_BUILD_TYPE "RELEASE") |
|
|
set (CMAKE_BUILD_TYPE "RELEASE") |
|
|
endif() |
|
|
endif() |
|
|
message(STATUS "StoRM - Building ${CMAKE_BUILD_TYPE} version.") |
|
|
message(STATUS "StoRM - Building ${CMAKE_BUILD_TYPE} version.") |
|
|
message(STATUS "StoRM - CMAKE_BUILD_TYPE (ENV): $ENV{CMAKE_BUILD_TYPE}") |
|
|
|
|
|
|
|
|
|
|
|
if(STORM_COMPILE_WITH_CCACHE) |
|
|
if(STORM_COMPILE_WITH_CCACHE) |
|
|
find_program(CCACHE_FOUND ccache) |
|
|
find_program(CCACHE_FOUND ccache) |
|
|
if(CCACHE_FOUND) |
|
|
if(CCACHE_FOUND) |
|
|
message(STATUS "SToRM - Using ccache") |
|
|
|
|
|
|
|
|
message(STATUS "StoRM - Using ccache") |
|
|
set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache) |
|
|
set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache) |
|
|
set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache) |
|
|
set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache) |
|
|
else() |
|
|
else() |
|
@ -458,7 +457,6 @@ endif() |
|
|
|
|
|
|
|
|
if(STORM_HAVE_CARL) |
|
|
if(STORM_HAVE_CARL) |
|
|
message(STATUS "StoRM - Linking with carl.") |
|
|
message(STATUS "StoRM - Linking with carl.") |
|
|
message("${carl_INCLUDE_DIR}") |
|
|
|
|
|
include_directories("${carl_INCLUDE_DIR}") |
|
|
include_directories("${carl_INCLUDE_DIR}") |
|
|
list(APPEND STORM_LINK_LIBRARIES ${carl_LIBRARIES}) |
|
|
list(APPEND STORM_LINK_LIBRARIES ${carl_LIBRARIES}) |
|
|
endif() |
|
|
endif() |
|
@ -515,7 +513,7 @@ endif(ENABLE_MSAT) |
|
|
|
|
|
|
|
|
find_package(Xerces) |
|
|
find_package(Xerces) |
|
|
if(NOT XERCES_FOUND) |
|
|
if(NOT XERCES_FOUND) |
|
|
message("Use shipped version of xerces") |
|
|
|
|
|
|
|
|
message(STATUS "Use shipped version of xerces") |
|
|
set(XERCES_ROOT ${CMAKE_BINARY_DIR}/resources/3rdparty/xercesc-3.1.2) |
|
|
set(XERCES_ROOT ${CMAKE_BINARY_DIR}/resources/3rdparty/xercesc-3.1.2) |
|
|
set(XERCESC_INCLUDE ${XERCES_ROOT}/include) |
|
|
set(XERCESC_INCLUDE ${XERCES_ROOT}/include) |
|
|
set(XERCES_LIBRARY_PATH ${XERCES_ROOT}/lib) |
|
|
set(XERCES_LIBRARY_PATH ${XERCES_ROOT}/lib) |
|
|