From 845d9f60edf7e9baafa43cd6ebf980c153ffc9b4 Mon Sep 17 00:00:00 2001 From: sjunges Date: Mon, 15 Feb 2016 22:18:47 +0100 Subject: [PATCH 1/4] support for platforms with libtool using a different standard lib folder and gtest is built with the same compiler as the project now Former-commit-id: 22d32c55a0dcebc5ff75a766e39e656e0714d3c1 --- resources/3rdparty/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/3rdparty/CMakeLists.txt b/resources/3rdparty/CMakeLists.txt index f2099eb11..b602d4682 100644 --- a/resources/3rdparty/CMakeLists.txt +++ b/resources/3rdparty/CMakeLists.txt @@ -5,7 +5,7 @@ include(ExternalProject) ExternalProject_Add( xercesc SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/xercesc-3.1.2 - CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/xercesc-3.1.2/configure --prefix=${CMAKE_CURRENT_BINARY_DIR}/xercesc-3.1.2 CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} CFLAGS=-O3 CXXFLAGS=-O3 + CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/xercesc-3.1.2/configure --prefix=${CMAKE_CURRENT_BINARY_DIR}/xercesc-3.1.2 --libdir=${CMAKE_CURRENT_BINARY_DIR}/xercesc-3.1.2/lib CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} CFLAGS=-O3 CXXFLAGS=-O3 PREFIX ${CMAKE_CURRENT_BINARY_DIR}/xercesc-3.1.2 BUILD_COMMAND make BUILD_IN_SOURCE 0 @@ -20,7 +20,7 @@ ExternalProject_Add( DOWNLOAD_COMMAND "" PREFIX ${CMAKE_CURRENT_BINARY_DIR}/glpk-4.57 SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/glpk-4.57 - CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/glpk-4.57/configure --prefix=${CMAKE_CURRENT_BINARY_DIR}/glpk-4.57 CC=${CMAKE_C_COMPILER} + CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/glpk-4.57/configure --prefix=${CMAKE_CURRENT_BINARY_DIR}/glpk-4.57 --libdir=${CMAKE_CURRENT_BINARY_DIR}/glpk-4.57/lib CC=${CMAKE_C_COMPILER} BUILD_COMMAND make "CFLAGS=-O2 -w" INSTALL_COMMAND make install BUILD_IN_SOURCE 0 @@ -40,7 +40,7 @@ ExternalProject_Add( SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/gtest-1.7.0" # Force separate output paths for debug and release builds to allow easy # identification of correct lib in subsequent TARGET_LINK_LIBRARIES - CMAKE_ARGS -Dgtest_force_shared_crt=ON + CMAKE_ARGS -Dgtest_force_shared_crt=ON -DCXX=${CMAKE_CXX_COMPILER} # Disable install step INSTALL_COMMAND "" # Wrap download, configure and build steps in a script to log output From faca16db3695e902656f74b402be567ee934633c Mon Sep 17 00:00:00 2001 From: sjunges Date: Mon, 15 Feb 2016 22:27:23 +0100 Subject: [PATCH 2/4] minor refactoring of cmakecode for inclusion of tbb Former-commit-id: 51deceb9782472199064c317bb85ad8742242e7e --- CMakeLists.txt | 19 ++++++------------- storm-config.h.in | 2 +- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e985841e4..422ebf915 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -565,9 +565,6 @@ endif() ## ############################################################# -set(gtest_force_shared_crt ON) -add_subdirectory("${PROJECT_SOURCE_DIR}/resources/3rdparty/gtest-1.7.0") - ############################################################# ## ## Log4CPlus @@ -597,20 +594,16 @@ set(TBB_INSTALL_DIR "${PROJECT_SOURCE_DIR}/resources/3rdparty/tbb42_20140122_mer find_package(TBB) -if (TBB_FOUND AND STORM_USE_INTELTBB) - link_directories(${TBB_LIBRARY_DIRS}) - set(STORM_CPP_INTELTBB_DEF "define") -else() - set(STORM_CPP_INTELTBB_DEF "undef") -endif() - +set(STORM_HAVE_INTELTBB 0) if (TBB_FOUND) - message(STATUS "StoRM - Found Intel TBB with interface version ${TBB_INTERFACE_VERSION}.") + message(STATUS "StoRM - Found Intel TBB with interface version ${TBB_INTERFACE_VERSION}.") if (STORM_USE_INTELTBB) + set(STORM_HAVE_INTELTBB 1) message(STATUS "StoRM - Linking with Intel TBB in ${TBB_LIBRARY_DIRS}.") - include_directories(${TBB_INCLUDE_DIRS}) - target_link_libraries(storm tbb tbbmalloc) + link_directories(${TBB_LIBRARY_DIRS}) + include_directories(${TBB_INCLUDE_DIRS}) + list(APPEND STORM_LINK_LIBRARIES tbb tbbmalloc) endif(STORM_USE_INTELTBB) endif(TBB_FOUND) diff --git a/storm-config.h.in b/storm-config.h.in index 7c845458f..ec45f1445 100644 --- a/storm-config.h.in +++ b/storm-config.h.in @@ -33,7 +33,7 @@ #cmakedefine STORM_HAVE_MSAT // Whether Intel Threading Building Blocks are available and to be used (define/undef) -#@STORM_CPP_INTELTBB_DEF@ STORM_HAVE_INTELTBB +#cmakedefine STORM_HAVE_INTELTBB // Whether support for parametric systems should be enabled #cmakedefine PARAMETRIC_SYSTEMS From d2d71960fcfd6d951f48abb05e64699b69943762 Mon Sep 17 00:00:00 2001 From: sjunges Date: Mon, 15 Feb 2016 22:36:15 +0100 Subject: [PATCH 3/4] slightly better cmake output Former-commit-id: 796d0a652d1f41faf37316214ae7c303dcf8ac5d --- CMakeLists.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 422ebf915..63043f1a5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,12 +42,11 @@ else() set (CMAKE_BUILD_TYPE "RELEASE") endif() message(STATUS "StoRM - Building ${CMAKE_BUILD_TYPE} version.") -message(STATUS "StoRM - CMAKE_BUILD_TYPE (ENV): $ENV{CMAKE_BUILD_TYPE}") if(STORM_COMPILE_WITH_CCACHE) find_program(CCACHE_FOUND ccache) 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_LINK ccache) else() @@ -458,7 +457,6 @@ endif() if(STORM_HAVE_CARL) message(STATUS "StoRM - Linking with carl.") - message("${carl_INCLUDE_DIR}") include_directories("${carl_INCLUDE_DIR}") list(APPEND STORM_LINK_LIBRARIES ${carl_LIBRARIES}) endif() @@ -515,7 +513,7 @@ endif(ENABLE_MSAT) find_package(Xerces) 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(XERCESC_INCLUDE ${XERCES_ROOT}/include) set(XERCES_LIBRARY_PATH ${XERCES_ROOT}/lib) From 50c0df75d82cfba8c750fa88add950e2a01a7a43 Mon Sep 17 00:00:00 2001 From: sjunges Date: Mon, 15 Feb 2016 23:16:31 +0100 Subject: [PATCH 4/4] towards supporting xcode generator again Former-commit-id: 9a3142f242721585ee6763c30620853ea6c89ba6 --- resources/3rdparty/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/3rdparty/CMakeLists.txt b/resources/3rdparty/CMakeLists.txt index b602d4682..694ab7265 100644 --- a/resources/3rdparty/CMakeLists.txt +++ b/resources/3rdparty/CMakeLists.txt @@ -43,6 +43,8 @@ ExternalProject_Add( CMAKE_ARGS -Dgtest_force_shared_crt=ON -DCXX=${CMAKE_CXX_COMPILER} # Disable install step INSTALL_COMMAND "" + BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/gtest-1.7.0" + INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/gtest-1.7.0" # Wrap download, configure and build steps in a script to log output LOG_CONFIGURE ON LOG_BUILD ON)