diff --git a/packages/bdd/CMakeLists.txt b/packages/bdd/CMakeLists.txt index 3f769bfbc..d13d029b8 100644 --- a/packages/bdd/CMakeLists.txt +++ b/packages/bdd/CMakeLists.txt @@ -72,5 +72,8 @@ IF (CUDD_FOUND) INSTALL(FILES ddnnf.yap DESTINATION ${libpl}) INSTALL(FILES simpbool.yap DESTINATION ${libpl}) INSTALL(FILES trie_sp.yap DESTINATION ${libpl}) - + ENDIF (CUDD_FOUND) + +SET (CUDD_FOUND_EXPORT ${CUDD_FOUND} PARENT_SCOPE) +SET (CUDD_LIBRARIES_EXPORT ${CUDD_LIBRARIES} PARENT_SCOPE) diff --git a/packages/bdd/cudd_config.h.cmake b/packages/bdd/cudd_config.h.cmake index 600579e6b..0aae2954a 100644 --- a/packages/bdd/cudd_config.h.cmake +++ b/packages/bdd/cudd_config.h.cmake @@ -2,31 +2,31 @@ /* Define to 1 if you have the header file. */ #ifndef HAVE_CUDDINT_H -#define HAVE_CUDDINT_H ${HAVE_CUDDINT_H} +#cmakedefine HAVE_CUDDINT_H ${HAVE_CUDDINT_H} #endif /* Define to 1 if you have the header file. */ #ifndef HAVE_CUDD_CUDDINT_H -#define HAVE_CUDD_CUDDINT_H ${HAVE_CUDD_CUDDINT_H} +#cmakedefine HAVE_CUDD_CUDDINT_H ${HAVE_CUDD_CUDDINT_H} #endif /* Define to 1 if you have the header file. */ #ifndef HAVE_CUDD_CUDD_H -#define HAVE_CUDD_CUDD_H ${HAVE_CUDD_CUDD_H} +#cmakedefine HAVE_CUDD_CUDD_H ${HAVE_CUDD_CUDD_H} #endif -/* Define to 1 if you have the header file. */ +/*Define to 1 if you have the header file. */ #ifndef HAVE_CUDD_H -#define HAVE_CUDD_H ${HAVE_CUDD_H} +#cmakedefine HAVE_CUDD_H ${HAVE_CUDD_H} #endif /* Define to 1 if you have the header file. */ #ifndef HAVE_CUDD_UTIL_H -#define HAVE_CUDD_UTIL_H ${HAVE_CUDD_UTIL_H} +#cmakedefine HAVE_CUDD_UTIL_H ${HAVE_CUDD_UTIL_H} #endif /* Define to 1 if you have the header file. */ #ifndef HAVE_UTIL_H -#define HAVE_UTIL_H ${HAVE_UTIL_H} +#cmakedefine HAVE_UTIL_H ${HAVE_UTIL_H} #endif diff --git a/packages/cplint/approx/simplecuddLPADs/CMakeLists.txt b/packages/cplint/approx/simplecuddLPADs/CMakeLists.txt new file mode 100644 index 000000000..a6784506d --- /dev/null +++ b/packages/cplint/approx/simplecuddLPADs/CMakeLists.txt @@ -0,0 +1,31 @@ +set (SRC + general.c + general.h + ProblogBDD.c + simplecudd.h + simplecudd.c + ) + + +add_executable (LPADbdd + ${SRC}) + +set_target_properties (LPADbdd PROPERTIES + OUTPUT_NAME LPADBDD + ) + +target_link_libraries(LPADbdd + ${CUDD_LIBRARIES_EXPORT} + libYap + ) + + INCLUDE_DIRECTORIES( + ${CUDD_INCLUDE_DIR_EXPORT} + ${CMAKE_CURRENT_BINARY_DIR} + ) + + install(TARGETS LPADbdd + RUNTIME DESTINATION ${bindir} + LIBRARY DESTINATION ${dlls} + ) + diff --git a/packages/cplint/approx/simplecuddLPADs/simplecudd.h b/packages/cplint/approx/simplecuddLPADs/simplecudd.h index 21300a144..e11da0422 100644 --- a/packages/cplint/approx/simplecuddLPADs/simplecudd.h +++ b/packages/cplint/approx/simplecuddLPADs/simplecudd.h @@ -197,6 +197,7 @@ variable=value #include #include #include "config.h" +#include "cudd_config.h" #if HAVE_UTIL_H #include #endif diff --git a/packages/cplint/slipcase/bddem.c b/packages/cplint/slipcase/bddem.c index 63fb4e9b5..689107bec 100644 --- a/packages/cplint/slipcase/bddem.c +++ b/packages/cplint/slipcase/bddem.c @@ -14,9 +14,10 @@ for the relative license. #include #include #include "config.h" +#include "cudd_config.h" #if HAVE_CUDD_CUDDINT_H #include "cudd/cuddInt.h" -#else +#elif HAVE_CUDDINT_H #include "cuddInt.h" #endif #include "YapInterface.h"