From bca98e7514b6bc031714544005121b230b5d4ed4 Mon Sep 17 00:00:00 2001 From: sjunges Date: Wed, 23 Nov 2016 20:09:02 +0100 Subject: [PATCH] aclocal and autoreconf seem necessary to configure cudd currently, so check for both --- resources/3rdparty/CMakeLists.txt | 4 ---- resources/3rdparty/include_cudd.cmake | 12 ++++++++++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/resources/3rdparty/CMakeLists.txt b/resources/3rdparty/CMakeLists.txt index 7f9faa2ad..87b0b790f 100644 --- a/resources/3rdparty/CMakeLists.txt +++ b/resources/3rdparty/CMakeLists.txt @@ -4,10 +4,6 @@ add_custom_target(test-resources) set(STORM_3RDPARTY_SOURCE_DIR ${PROJECT_SOURCE_DIR}/resources/3rdparty) set(STORM_3RDPARTY_BINARY_DIR ${PROJECT_BINARY_DIR}/resources/3rdparty) -#### -#### Find autoreconf for cudd update step -find_program(AUTORECONF autoreconf) -mark_as_advanced(AUTORECONF) ############################################################# ## diff --git a/resources/3rdparty/include_cudd.cmake b/resources/3rdparty/include_cudd.cmake index d4db55653..79edfc071 100644 --- a/resources/3rdparty/include_cudd.cmake +++ b/resources/3rdparty/include_cudd.cmake @@ -1,7 +1,19 @@ + +#### +#### Find autoreconf for cudd update step +find_program(AUTORECONF autoreconf) +find_program(ACLOCAL aclocal) +mark_as_advanced(AUTORECONF) +mark_as_advanced(ACLOCAL) + if (NOT AUTORECONF) message(FATAL_ERROR "Cannot find autoreconf, cannot compile cudd3.") endif() +if (NOT ACLOCAL) + message(FATAL_ERROR "Cannot find aclocal, cannot compile cudd3.") +endif() + set(CUDD_LIB_DIR ${STORM_3RDPARTY_BINARY_DIR}/cudd-3.0.0/lib) ExternalProject_Add(