From e5c7c93d33485f82c7f9386ad2ce5c5c9b61a0a5 Mon Sep 17 00:00:00 2001 From: sjunges Date: Thu, 21 Jul 2016 22:50:29 +0200 Subject: [PATCH] awkward types and cmake goes wrong Former-commit-id: 2f1bf7b21c413b60964296c5be9963ea4f28cd65 --- resources/3rdparty/include_cudd.cmake | 2 +- resources/3rdparty/include_glpk.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/3rdparty/include_cudd.cmake b/resources/3rdparty/include_cudd.cmake index 2b032bf91..d63e855d3 100644 --- a/resources/3rdparty/include_cudd.cmake +++ b/resources/3rdparty/include_cudd.cmake @@ -20,7 +20,7 @@ ExternalProject_Add( # 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_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_VERSION_STRING 3.0.0) list(APPEND STORM_LINK_LIBRARIES ${CUDD_SHARED_LIBRARY}) diff --git a/resources/3rdparty/include_glpk.cmake b/resources/3rdparty/include_glpk.cmake index e3b899bad..2ac870b3d 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_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" INSTALL_COMMAND make install BUILD_IN_SOURCE 0