From 155052b9719edb620eb81b2b7b2d65ae0348a105 Mon Sep 17 00:00:00 2001
From: sjunges <sebastian.junges@rwth-aachen.de>
Date: Thu, 21 Jul 2016 16:31:33 +0200
Subject: [PATCH] refactor & fixes after refactoring
Former-commit-id: f1746cf6e43ad8c021b686704c8aa252202d9176
---
resources/3rdparty/CMakeLists.txt | 108 +++++++++++++-------------
resources/3rdparty/include_cudd.cmake | 8 +-
resources/3rdparty/include_glpk.cmake | 2 +-
3 files changed, 60 insertions(+), 58 deletions(-)
diff --git a/resources/3rdparty/CMakeLists.txt b/resources/3rdparty/CMakeLists.txt
index 8d6bc7aff..8e6c2ecd3 100644
--- a/resources/3rdparty/CMakeLists.txt
+++ b/resources/3rdparty/CMakeLists.txt
@@ -8,58 +8,7 @@ set(STORM_3RDPARTY_BINARY_DIR ${PROJECT_BINARY_DIR}/resources/3rdparty)
#### Find autoreconf for cudd update step
find_program(AUTORECONF autoreconf)
-ExternalProject_Add(
- sylvan
- DOWNLOAD_COMMAND ""
- PREFIX "sylvan"
- SOURCE_DIR ${STORM_3RDPARTY_SOURCE_DIR}/sylvan
- CMAKE_ARGS -DSYLVAN_BUILD_TEST=Off -DSYLVAN_BUILD_EXAMPLES=Off -DCMAKE_BUILD_TYPE=Release
- BINARY_DIR "${PROJECT_BINARY_DIR}/sylvan"
- INSTALL_COMMAND ""
- INSTALL_DIR "${STORM_3RDPARTY_BINARY_DIR}/sylvan"
-)
-ExternalProject_Get_Property(sylvan source_dir)
-ExternalProject_Get_Property(sylvan binary_dir)
-set(Sylvan_INCLUDE_DIR "${source_dir}/src")
-set(Sylvan_LIBRARY "${binary_dir}/src/libsylvan.a")
-ExternalProject_Add(
- googletest
- #For downloads (may be useful later!)
- #SVN_REPOSITORY http://googletest.googlecode.com/svn/trunk/
- #TIMEOUT 10
- DOWNLOAD_COMMAND ""
- SOURCE_DIR "${STORM_3RDPARTY_SOURCE_DIR}/gtest-1.7.0"
- # Force the same output paths for debug and release builds so that
- # we know in which place the binaries end up when using the Xcode generator
- CMAKE_ARGS -Dgtest_force_shared_crt=ON -DCXX=${CMAKE_CXX_COMPILER} -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG:PATH=${STORM_3RDPARTY_BINARY_DIR}/gtest-1.7.0 -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE:PATH=${STORM_3RDPARTY_BINARY_DIR}/gtest-1.7.0
- # Disable install step
- INSTALL_COMMAND ""
- BINARY_DIR "${STORM_3RDPARTY_BINARY_DIR}/gtest-1.7.0"
- INSTALL_DIR "${STORM_3RDPARTY_BINARY_DIR}/gtest-1.7.0"
- # Wrap download, configure and build steps in a script to log output
- LOG_CONFIGURE ON
- LOG_BUILD ON)
-
-# Specify include dir
-ExternalProject_Get_Property(googletest source_dir)
-set(GTEST_INCLUDE_DIR ${source_dir}/include)
-# Specify MainTest's link libraries
-ExternalProject_Get_Property(googletest binary_dir)
-set(GTEST_LIBRARIES ${binary_dir}/libgtest.a ${binary_dir}/libgtest_main.a)
-
-ExternalProject_Add(
- l3pp
- GIT_REPOSITORY https://github.com/hbruintjes/l3pp.git
- GIT_TAG master
- SOURCE_DIR ${STORM_3RDPARTY_SOURCE_DIR}/l3pp
- CONFIGURE_COMMAND ""
- BUILD_COMMAND ""
- INSTALL_COMMAND ""
- LOG_INSTALL ON
-)
-ExternalProject_Get_Property(l3pp source_dir)
-set(l3pp_INCLUDE "${source_dir}/")
#
#ExternalProject_Add(
# carl
@@ -78,8 +27,20 @@ set(l3pp_INCLUDE "${source_dir}/")
##
#############################################################
-# l3pp is set up as external project
-message("${l3pp_INCLUDE}")
+
+
+ExternalProject_Add(
+ l3pp
+ GIT_REPOSITORY https://github.com/hbruintjes/l3pp.git
+ GIT_TAG master
+ SOURCE_DIR ${STORM_3RDPARTY_SOURCE_DIR}/l3pp
+ CONFIGURE_COMMAND ""
+ BUILD_COMMAND ""
+ INSTALL_COMMAND ""
+ LOG_INSTALL ON
+)
+ExternalProject_Get_Property(l3pp source_dir)
+set(l3pp_INCLUDE "${source_dir}/")
include_directories(${l3pp_INCLUDE})
add_dependencies(resources l3pp)
@@ -330,6 +291,23 @@ include(${STORM_3RDPARTY_SOURCE_DIR}/include_xerces.cmake)
##
#############################################################
+ExternalProject_Add(
+ sylvan
+ DOWNLOAD_COMMAND ""
+ PREFIX "sylvan"
+ SOURCE_DIR ${STORM_3RDPARTY_SOURCE_DIR}/sylvan
+ CMAKE_ARGS -DSYLVAN_BUILD_TEST=Off -DSYLVAN_BUILD_EXAMPLES=Off -DCMAKE_BUILD_TYPE=Release
+ BINARY_DIR "${PROJECT_BINARY_DIR}/sylvan"
+ INSTALL_COMMAND ""
+ INSTALL_DIR "${STORM_3RDPARTY_BINARY_DIR}/sylvan"
+)
+ExternalProject_Get_Property(sylvan source_dir)
+ExternalProject_Get_Property(sylvan binary_dir)
+set(Sylvan_INCLUDE_DIR "${source_dir}/src")
+set(Sylvan_LIBRARY "${binary_dir}/src/libsylvan.a")
+
+
+
message(STATUS "StoRM - Using shipped version of sylvan")
message(STATUS "StoRM - Linking with sylvan")
include_directories("${Sylvan_INCLUDE_DIR}")
@@ -351,6 +329,30 @@ endif()
## Google Test gtest
##
#############################################################
+ExternalProject_Add(
+ googletest
+ #For downloads (may be useful later!)
+ #SVN_REPOSITORY http://googletest.googlecode.com/svn/trunk/
+ #TIMEOUT 10
+ DOWNLOAD_COMMAND ""
+ SOURCE_DIR "${STORM_3RDPARTY_SOURCE_DIR}/gtest-1.7.0"
+ # Force the same output paths for debug and release builds so that
+ # we know in which place the binaries end up when using the Xcode generator
+ CMAKE_ARGS -Dgtest_force_shared_crt=ON -DCXX=${CMAKE_CXX_COMPILER} -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG:PATH=${STORM_3RDPARTY_BINARY_DIR}/gtest-1.7.0 -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE:PATH=${STORM_3RDPARTY_BINARY_DIR}/gtest-1.7.0
+ # Disable install step
+ INSTALL_COMMAND ""
+ BINARY_DIR "${STORM_3RDPARTY_BINARY_DIR}/gtest-1.7.0"
+ INSTALL_DIR "${STORM_3RDPARTY_BINARY_DIR}/gtest-1.7.0"
+ # Wrap download, configure and build steps in a script to log output
+ LOG_CONFIGURE ON
+ LOG_BUILD ON)
+
+# Specify include dir
+ExternalProject_Get_Property(googletest source_dir)
+set(GTEST_INCLUDE_DIR ${source_dir}/include)
+# Specify MainTest's link libraries
+ExternalProject_Get_Property(googletest binary_dir)
+set(GTEST_LIBRARIES ${binary_dir}/libgtest.a ${binary_dir}/libgtest_main.a)
add_dependencies(test-resources googletest)
list(APPEND STORM_TEST_LINK_LIBRARIES ${GTEST_LIBRARIES})
diff --git a/resources/3rdparty/include_cudd.cmake b/resources/3rdparty/include_cudd.cmake
index e53168848..2b032bf91 100644
--- a/resources/3rdparty/include_cudd.cmake
+++ b/resources/3rdparty/include_cudd.cmake
@@ -9,7 +9,7 @@ ExternalProject_Add(
SOURCE_DIR ${STORM_3RDPARTY_SOURCE_DIR}/cudd-3.0.0
PREFIX ${STORM_3RDPARTY_BINARY_DIR}/cudd-3.0.0
UPDATE_COMMAND ${AUTORECONF}
- CONFIGURE_COMMAND ${STORM_3RDPARTY_SOURCE_DIR}/cudd-3.0.0/configure --enable-shared --enable-obj --prefix=${STORM_3RDPARTY_SOURCE_DIR}/cudd-3.0.0 --libdir=${STORM_3RDPARTY_SOURCE_DIR}/cudd-3.0.0/lib CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER}
+ CONFIGURE_COMMAND ${STORM_3RDPARTY_SOURCE_DIR}/cudd-3.0.0/configure --enable-shared --enable-obj --prefix=${STORM_3RDPARTY_BINARY_DIR}/cudd-3.0.0 --libdir=${STORM_3RDPARTY_BINARY_DIR}/cudd-3.0.0/lib CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER}
BUILD_COMMAND make "CFLAGS=-O2 -w"
INSTALL_COMMAND make install
BUILD_IN_SOURCE 0
@@ -19,9 +19,9 @@ ExternalProject_Add(
)
# Do not use system CUDD, StoRM has a modified version
-set(CUDD_INCLUDE_DIR ${CMAKE_BINARY_DIR}/resources/3rdparty/cudd-3.0.0/include)
-set(CUDD_SHARED_LIBRARY ${CMAKE_BINARY_DIR}/resources/3rdparty/cudd-3.0.0/lib/libcudd${DYNAMIC_EXT})
-set(CUDD_STATIC_LIBRARY ${CMAKE_BINARY_DIR}/resources/3rdparty/cudd-3.0.0/lib/libcudd${STATIC_EXT})
+set(CUDD_INCLUDE_DIR ${STORM_3RDPARTY_BINARY_DIR}/cudd-3.0.0/include)
+set(CUDD_SHARED_LIBRARY${STORM_3RDPARTY_BINARY_DIR}/cudd-3.0.0/lib/libcudd${DYNAMIC_EXT})
+set(CUDD_STATIC_LIBRARY $${STORM_3RDPARTY_BINARY_DIR}/cudd-3.0.0/cudd-3.0.0/lib/libcudd${STATIC_EXT})
set(CUDD_VERSION_STRING 3.0.0)
list(APPEND STORM_LINK_LIBRARIES ${CUDD_SHARED_LIBRARY})
add_dependencies(resources cudd3)
diff --git a/resources/3rdparty/include_glpk.cmake b/resources/3rdparty/include_glpk.cmake
index f6e58430d..e3b899bad 100644
--- a/resources/3rdparty/include_glpk.cmake
+++ b/resources/3rdparty/include_glpk.cmake
@@ -7,7 +7,7 @@ else()
DOWNLOAD_COMMAND ""
PREFIX ${STORM_3RDPARTY_BINARY_DIR}/glpk-4.57
SOURCE_DIR ${STORM_3RDPARTY_SOURCE_DIR}/glpk-4.57
- CONFIGURE_COMMAND ${STORM_3RDPARTY_SOURCE_DIR}/glpk-4.57/configure --prefix=${STORM_3RDPARTY_BINARY_DIR}/glpk-4.57 --libdir=${CMAKE_CURRENT_BINARY_DIR}/glpk-4.57/lib CC=${CMAKE_C_COMPILER}
+ CONFIGURE_COMMAND ${STORM_3RDPARTY_SOURCE_DIR}/glpk-4.57/configure --prefix=${STORM_3RDPARTY_SOURCE_DIR}/glpk-4.57 --libdir=${STORM_3RDPARTY_SOURCE_DIR}/glpk-4.57/lib CC=${CMAKE_C_COMPILER}
BUILD_COMMAND make "CFLAGS=-O2 -w"
INSTALL_COMMAND make install
BUILD_IN_SOURCE 0