From 7b27fcd68b2c2b70efd317827cc5b9b464dd03a8 Mon Sep 17 00:00:00 2001 From: hbruintjes Date: Thu, 21 Apr 2016 16:24:14 +0200 Subject: [PATCH] cudd use autoreconf, set min version to 13.4 which still works Former-commit-id: d17b923138e4299874175bbc1f59c89d75a25236 --- resources/3rdparty/CMakeLists.txt | 1 + resources/3rdparty/cudd-3.0.0/configure.ac | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/3rdparty/CMakeLists.txt b/resources/3rdparty/CMakeLists.txt index 4bd155a0d..2dea08528 100644 --- a/resources/3rdparty/CMakeLists.txt +++ b/resources/3rdparty/CMakeLists.txt @@ -32,6 +32,7 @@ ExternalProject_Add( DOWNLOAD_COMMAND "" SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/cudd-3.0.0 PREFIX ${CMAKE_CURRENT_BINARY_DIR}/cudd-3.0.0 + UPDATE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/cudd-3.0.0/autoreconf CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/cudd-3.0.0/configure --enable-shared --enable-obj --prefix=${CMAKE_CURRENT_BINARY_DIR}/cudd-3.0.0 --libdir=${CMAKE_CURRENT_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 diff --git a/resources/3rdparty/cudd-3.0.0/configure.ac b/resources/3rdparty/cudd-3.0.0/configure.ac index 25331173c..2bc78b4a0 100644 --- a/resources/3rdparty/cudd-3.0.0/configure.ac +++ b/resources/3rdparty/cudd-3.0.0/configure.ac @@ -7,7 +7,7 @@ AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) AC_CANONICAL_HOST AM_INIT_AUTOMAKE( - [1.14 -Wall -Werror foreign subdir-objects color-tests silent-rules] + [1.13.4 -Wall -Werror foreign subdir-objects color-tests silent-rules] ) AC_REQUIRE_AUX_FILE([tap-driver.sh]) @@ -32,6 +32,7 @@ fi : ${CXXFLAGS="-Wall -Wextra -std=c++0x -g -O3"} AC_PROG_CC +AM_PROG_CC_C_O AC_PROG_CXX AM_PROG_AR LT_PREREQ([2.4])