Browse Source

improvements on carl include

Former-commit-id: a70b0d693a
tempestpy_adaptions
sjunges 9 years ago
parent
commit
f2f5552708
  1. 5
      resources/3rdparty/CMakeLists.txt
  2. 1
      resources/3rdparty/carl
  3. BIN
      resources/3rdparty/glpk-4.57/bin/glpsol
  4. 1080
      resources/3rdparty/glpk-4.57/include/glpk.h
  5. BIN
      resources/3rdparty/glpk-4.57/lib/libglpk.36.dylib
  6. BIN
      resources/3rdparty/glpk-4.57/lib/libglpk.a
  7. 1
      resources/3rdparty/glpk-4.57/lib/libglpk.dylib
  8. 41
      resources/3rdparty/glpk-4.57/lib/libglpk.la
  9. 2
      resources/3rdparty/include_xerces.cmake

5
resources/3rdparty/CMakeLists.txt

@ -186,9 +186,10 @@ endif()
set(STORM_HAVE_CARL OFF)
if(USE_CARL)
find_package(carl QUIET REQUIRED)
find_package(carl QUIET)
if(carl_FOUND)
set(STORM_HAVE_CARL ON)
message(STATUS "StoRM - Use system version of carl")
message(STATUS "StoRM - Linking with carl ${carl_VERSION_STRING}")
include_directories("${carl_INCLUDE_DIR}")
list(APPEND STORM_LINK_LIBRARIES ${carl_LIBRARIES})
@ -308,6 +309,8 @@ ExternalProject_Add(
BUILD_IN_SOURCE 0
INSTALL_COMMAND ""
INSTALL_DIR "${STORM_3RDPARTY_BINARY_DIR}/sylvan"
LOG_CONFIGURE ON
LOG_BUILD ON
)
ExternalProject_Get_Property(sylvan source_dir)
ExternalProject_Get_Property(sylvan binary_dir)

1
resources/3rdparty/carl

@ -0,0 +1 @@
Subproject commit d67f986226cf846ba6366cdbe2abc21dff375542

BIN
resources/3rdparty/glpk-4.57/bin/glpsol

1080
resources/3rdparty/glpk-4.57/include/glpk.h
File diff suppressed because it is too large
View File

BIN
resources/3rdparty/glpk-4.57/lib/libglpk.36.dylib

BIN
resources/3rdparty/glpk-4.57/lib/libglpk.a

1
resources/3rdparty/glpk-4.57/lib/libglpk.dylib

@ -0,0 +1 @@
libglpk.36.dylib

41
resources/3rdparty/glpk-4.57/lib/libglpk.la

@ -0,0 +1,41 @@
# libglpk.la - a libtool library file
# Generated by libtool (GNU libtool) 2.4
#
# Please DO NOT delete this file!
# It is necessary for linking the library.
# The name that we can dlopen(3).
dlname='libglpk.36.dylib'
# Names of this library.
library_names='libglpk.36.dylib libglpk.dylib'
# The name of the static archive.
old_library='libglpk.a'
# Linker flags that can not go in dependency_libs.
inherited_linker_flags=' '
# Libraries that this one depends upon.
dependency_libs=' -lm'
# Names of additional weak libraries provided by this library
weak_library_names=''
# Version information for libglpk.
current=38
age=2
revision=0
# Is this an already installed library?
installed=yes
# Should we warn about portability when linking against -modules?
shouldnotlink=no
# Files to dlopen/dlpreopen
dlopen=''
dlpreopen=''
# Directory that this library needs to be installed in:
libdir='/Users/sjunges/i2/storm/resources/3rdparty/glpk-4.57/lib'

2
resources/3rdparty/include_xerces.cmake

@ -7,7 +7,7 @@ if(USE_XERCES)
ExternalProject_Add(
xercesc
SOURCE_DIR ${STORM_3RDPARTY_SOURCE_DIR}/xercesc-3.1.2
CONFIGURE_COMMAND ${STORM_3RDPARTY_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
CONFIGURE_COMMAND ${STORM_3RDPARTY_SOURCE_DIR}/xercesc-3.1.2/configure --prefix=${STORM_3RDPARTY_BINARY_DIR}/xercesc-3.1.2 --libdir=${STORM_3RDPARTY_BINARY_DIR}/xercesc-3.1.2/lib CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} CFLAGS=-O3 CXXFLAGS=-O3
PREFIX ${STORM_3RDPARTY_BINARY_DIR}/xercesc-3.1.2
BUILD_COMMAND make
BUILD_IN_SOURCE 0

Loading…
Cancel
Save