support cudd 3.0

packages/bdd/CMakeLists.txt

@@ -36,12 +36,12 @@ IF (CUDD_FOUND)
     ${CMAKE_CURRENT_BINARY_DIR}
     )
 
-  check_include_files( util.h HAVE_UTIL_H )
-  check_include_files( cudd/util.h HAVE_CUDD_UTIL_H )
-  check_include_files( cudd.h HAVE_CUDD_H )
-  check_include_files( "stdio.h;cudd/cudd.h" HAVE_CUDD_CUDD_H )
-  check_include_files( cuddInt.h HAVE_CUDDINT_H )
-  check_include_files( "stdio.h;cudd/cudd.h;cudd/cuddInt.h" HAVE_CUDD_CUDDINT_H )
+  check_include_files( "stdio.h;cuddInt.h" HAVE_CUDDINT_H )
+   check_include_files( "stdio.h;cudd/cuddInt.h" HAVE_CUDD_CUDDINT_H )
+  check_include_files( "stdio.h;dddmpInt.h" HAVE_DDDMPINT_H )
+   check_include_files( "stdio.h;dddmp/dddmpInt.h" HAVE_DDDMP_DDDMPINT_H )
+  check_include_files( "stdio.h;cuddObj.hh" HAVE_CUDDOBJ_HH )
+   check_include_files( "stdio.h;cudd/cuddObj.hh" HAVE_CUDD_CUDDOBJ_HH )
 
   configure_file ("${PROJECT_SOURCE_DIR}/cudd_config.h.cmake"
     "${CMAKE_CURRENT_BINARY_DIR}/cudd_config.h" )

packages/bdd/cudd.c

@@ -44,15 +44,13 @@ CUDD will generate better/faster code.
 #include "config.h"
 #include "cudd_config.h"
 
-#if HAVE_CUDD_UTIL_H
-#include <cudd/util.h>
-#elif HAVE_UTIL_H
-#include <util.h>
+#if HAVE_STRING_H
+#include <string.h>
 #endif
-#if HAVE_CUDD_CUDD_H
-#include "cudd/cudd.h"
-#elif HAVE_CUDD_H
-#include "cudd.h"
+#if HAVE_CUDDINT_H
+#include "cuddInt.h"
+#elif HAVE_CUDD_CUDDINT_H
+#include "cudd/cuddInt.h"
 #endif
 
 static YAP_Functor FunctorDollarVar, FunctorCudd, FunctorAnd, FunctorAnd4,

packages/bdd/cudd_config.h

@@ -1,32 +0,0 @@
-// cmake template file
-
-/* Define to 1 if you have the <cuddInt.h> header file. */
-#ifndef HAVE_CUDDINT_H
-/* #undef HAVE_CUDDINT_H */
-#endif
-
-/* Define to 1 if you have the <cudd/cuddInt.h> header file. */
-#ifndef HAVE_CUDD_CUDDINT_H
-#define HAVE_CUDD_CUDDINT_H 1
-#endif
-
-/* Define to 1 if you have the <cudd/cudd.h> header file. */
-#ifndef HAVE_CUDD_CUDD_H
-#define HAVE_CUDD_CUDD_H 1
-#endif
-
-/*Define to 1 if you have the <cudd.h> header file. */
-#ifndef HAVE_CUDD_H
-/* #undef HAVE_CUDD_H */
-#endif
-
-/* Define to 1 if you have the <cudd/util.h> header file. */
-#ifndef HAVE_CUDD_UTIL_H
-#define HAVE_CUDD_UTIL_H 1
-#endif
-
-/* Define to 1 if you have the <util.h> header file. */
-#ifndef HAVE_UTIL_H
-#define HAVE_UTIL_H 1
-#endif
-

packages/bdd/cudd_config.h.cmake

@@ -10,23 +10,24 @@
 #cmakedefine HAVE_CUDD_CUDDINT_H ${HAVE_CUDD_CUDDINT_H}
 #endif
 
-/* Define to 1 if you have the <cudd/cudd.h> header file. */
-#ifndef HAVE_CUDD_CUDD_H
-#cmakedefine HAVE_CUDD_CUDD_H ${HAVE_CUDD_CUDD_H}
+
+/* Define to 1 if you have the <cuddObj.hh> header file. */
+#ifndef HAVE_CUDDOBJ_HH
+#cmakedefine HAVE_CUDDOBJ_HH ${HAVE_CUDDOBJ_HH}
 #endif
 
-/*Define to 1 if you have the <cudd.h> header file. */
-#ifndef HAVE_CUDD_H
-#cmakedefine HAVE_CUDD_H ${HAVE_CUDD_H}
+/* Define to 1 if you have the <cudd/cuddObj.hh> header file. */
+#ifndef HAVE_CUDD_CUDDOBJ_HH
+#cmakedefine HAVE_CUDD_CUDDOBJ_HH ${HAVE_CUDD_CUDDOBJ_HH}
 #endif
 
-/* Define to 1 if you have the <cudd/util.h> header file. */
-#ifndef HAVE_CUDD_UTIL_H
-#cmakedefine HAVE_CUDD_UTIL_H ${HAVE_CUDD_UTIL_H}
+
+/* Define to 1 if you have the <dddmpInt.h> header file. */
+#ifndef HAVE_DDDMPINT_H
+#cmakedefine HAVE_DDDMPINT_H ${HAVE_DDDMPINT_H}
 #endif
 
-/* Define to 1 if you have the <util.h> header file. */
-#ifndef HAVE_UTIL_H
-#cmakedefine HAVE_UTIL_H ${HAVE_UTIL_H}
+/* Define to 1 if you have the <cudd/dddmpInt.h> header file. */
+#ifndef HAVE_CUDD_CUDDINT_H
+#cmakedefine HAVE_CUDD_DDDMPINT_H ${HAVE_CUDD_DDDMPINT_H}
 #endif
-

packages/bdd/simplecudd/CMakeLists.txt

@@ -10,7 +10,7 @@ add_executable (Problogbdd
   ${SRC})
 
 set_target_properties (Problogbdd PROPERTIES
-  OUTPUT_NAME simplecudd
+  OUTPUT_NAME problogbdd
   )
 
 target_link_libraries(Problogbdd

packages/bdd/simplecudd_lfi/CMakeLists.txt

@@ -14,7 +14,7 @@ add_executable (Problogbdd-Lfi
   ${SRC})
 
 set_target_properties (Problogbdd-Lfi PROPERTIES
-  OUTPUT_NAME simplecudd_lfi
+  OUTPUT_NAME problogbdd_lfi
   )
 
 target_link_libraries(Problogbdd-Lfi