Browse Source

awkward types and cmake goes wrong

Former-commit-id: 2f1bf7b21c
tempestpy_adaptions
sjunges 8 years ago
parent
commit
e5c7c93d33
  1. 2
      resources/3rdparty/include_cudd.cmake
  2. 2
      resources/3rdparty/include_glpk.cmake

2
resources/3rdparty/include_cudd.cmake

@ -20,7 +20,7 @@ ExternalProject_Add(
# Do not use system CUDD, StoRM has a modified version # Do not use system CUDD, StoRM has a modified version
set(CUDD_INCLUDE_DIR ${STORM_3RDPARTY_BINARY_DIR}/cudd-3.0.0/include) 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_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_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) set(CUDD_VERSION_STRING 3.0.0)
list(APPEND STORM_LINK_LIBRARIES ${CUDD_SHARED_LIBRARY}) list(APPEND STORM_LINK_LIBRARIES ${CUDD_SHARED_LIBRARY})

2
resources/3rdparty/include_glpk.cmake

@ -7,7 +7,7 @@ else()
DOWNLOAD_COMMAND "" DOWNLOAD_COMMAND ""
PREFIX ${STORM_3RDPARTY_BINARY_DIR}/glpk-4.57 PREFIX ${STORM_3RDPARTY_BINARY_DIR}/glpk-4.57
SOURCE_DIR ${STORM_3RDPARTY_SOURCE_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_SOURCE_DIR}/glpk-4.57 --libdir=${STORM_3RDPARTY_SOURCE_DIR}/glpk-4.57/lib CC=${CMAKE_C_COMPILER}
CONFIGURE_COMMAND ${STORM_3RDPARTY_SOURCE_DIR}/glpk-4.57/configure --prefix=${STORM_3RDPARTY_BINARY_DIR}/glpk-4.57 --libdir=${STORM_3RDPARTY_BINARY_DIR}/glpk-4.57/lib CC=${CMAKE_C_COMPILER}
BUILD_COMMAND make "CFLAGS=-O2 -w" BUILD_COMMAND make "CFLAGS=-O2 -w"
INSTALL_COMMAND make install INSTALL_COMMAND make install
BUILD_IN_SOURCE 0 BUILD_IN_SOURCE 0

Loading…
Cancel
Save