diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix cmake for CUDD

Browse Source
This commit is contained in:
Vitor Santos Costa 2016-04-14 23:24:07 +01:00
parent 05a76a2b3f
commit a761bd752c
4 changed files with 128 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -121,7 +121,17 @@ else()
set(YAP_STARTUP startup.yss) set(YAP_STARTUP startup.yss)
endif() endif()
set(WITH_CUDD YES CACHE FILEPATH "Try to use Cudd (currently Cudd 3)")
if (WITH_CUDD)
include(cudd)
endif(WITH_CUDD)
set(WITH_JAVA YES CACHE FILEPATH "Try to use Java (currently Java 6,7,8)")
if (WITH_JAVA)
include(java) include(java)
endif(WITH_JAVA)
set(WITH_PYTHON YES CACHE FILEPATH "Try to use Python (currently Python 3)") set(WITH_PYTHON YES CACHE FILEPATH "Try to use Python (currently Python 3)")

14
packages/bdd/CMakeLists.txt
View File

@ -16,10 +16,6 @@ IF (NOT YAP_FOUND)
MESSAGE (SEND_ERROR "YAP was not found!") MESSAGE (SEND_ERROR "YAP was not found!")
ENDIF (NOT YAP_FOUND) ENDIF (NOT YAP_FOUND)
macro_optional_find_package (CUDD ON)
macro_log_feature (CUDD_FOUND "CUDD"
"Use CUDD Library"
"http://vlsi.colorado.edu/~fabio/CUDD/" FALSE)
IF (CUDD_FOUND) IF (CUDD_FOUND)
# CUDD_FOUND - system has Cudd # CUDD_FOUND - system has Cudd
# CUDD_LIBRARIES - Link these to use Cudd # CUDD_LIBRARIES - Link these to use Cudd
@ -36,13 +32,6 @@ IF (CUDD_FOUND)
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
) )
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" configure_file ("${PROJECT_SOURCE_DIR}/cudd_config.h.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/cudd_config.h" ) "${CMAKE_CURRENT_BINARY_DIR}/cudd_config.h" )
@ -78,6 +67,3 @@ IF (CUDD_FOUND)
ENDIF (CUDD_FOUND) ENDIF (CUDD_FOUND)
SET (CUDD_FOUND_EXPORT ${CUDD_FOUND} PARENT_SCOPE)
SET (CUDD_LIBRARIES_EXPORT ${CUDD_LIBRARIES} PARENT_SCOPE)
SET (CUDD_INCLUDE_DIR_EXPORT ${CUDD_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE)

157
packages/cplint/CMakeLists.txt
View File

@ -1,45 +1,27 @@
SET( CMAKE_FIND_FRAMEWORK LAST)
SET( CMAKE_FIND_APPBUNDLE LAST)
# Be sure to also update these in Makefile! # Be sure to also update these in Makefile!
set(SO_MAJOR 1) set(SO_MAJOR 1)
set(SO_MINOR 0) set(SO_MINOR 0)
set(SO_PATCH 0) set(SO_PATCH 0)
find_package (CUDD)
macro_log_feature (CUDD_FOUND "CUDD"
"Use CUDD Library"
"http://vlsi.colorado.edu/~fabio/CUDD/" FALSE)
IF (CUDD_FOUND) IF (CUDD_FOUND)
# CUDD_FOUND - system has Cudd
# CUDD_LIBRARIES - Link these to use Cudd
# CUDD_INCLUDE_DIR - Include directory for using Cudd
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${CUDD_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR} ${CUDD_INCLUDE_DIR}
) )
check_include_files( util.h HAVE_UTIL_H ) set( CPLINT_SOURCES
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 )
set( CPLINT_SOURCES
cplint.h cplint.h
cplint_yap.c cplint_yap.c
cplint_Prob.c ) cplint_Prob.c )
set( BDDEM_SOURCES set( BDDEM_SOURCES
slipcase/bddem.c slipcase/bddem.c
cplint.h cplint.h
) )
set (CPLINT_PROGRAMS set (CPLINT_PROGRAMS
lpadvel.pl lpadvel.pl
lpadclpbn.pl lpadclpbn.pl
lpadsld.pl lpadsld.pl
@ -58,14 +40,14 @@ set (CPLINT_PROGRAMS
approx/tptree_lpad.pl approx/tptree_lpad.pl
) )
set (CPLINT_SEMANTICS_PROGRAMS set (CPLINT_SEMANTICS_PROGRAMS
semlpadsld.pl semlpadsld.pl
semlpad.pl semlpad.pl
semcpl.pl semcpl.pl
slg.pl slg.pl
) )
set (CPLINT_LEARNING_PROGRAMS set (CPLINT_LEARNING_PROGRAMS
em/em.pl em/em.pl
em/inference.pl em/inference.pl
lemur/dv_lemur.pl lemur/dv_lemur.pl
@ -82,67 +64,67 @@ set (CPLINT_LEARNING_PROGRAMS
slipcover/slipcover.pl slipcover/slipcover.pl
) )
set (CPLINT_TEST_PROGRAMS set (CPLINT_TEST_PROGRAMS
testcpl.pl testcpl.pl
testlpad.pl testlpad.pl
testlpadclpbn.pl testlpadclpbn.pl
testlpadsld_gbfalse.pl testlpadsld_gbfalse.pl
testlpadsld_gbtrue.pl testlpadsld_gbtrue.pl
testlpadsldit.pl testlpadsldit.pl
testlpadslditc.pl testlpadslditc.pl
testlpadslditr.pl testlpadslditr.pl
testlpadvel.pl testlpadvel.pl
testsemcpl.pl testsemcpl.pl
testsemlpad.pl testsemlpad.pl
testsemlpadsld.pl testsemlpadsld.pl
) )
set (CPLINT_EXAMPLE_PROGRAMS set (CPLINT_EXAMPLE_PROGRAMS
examples/alarm.cpl examples/alarm.cpl
examples/coin.cpl examples/coin.cpl
examples/coin.uni examples/coin.uni
examples/coin2.cpl examples/coin2.cpl
examples/coin2.uni examples/coin2.uni
examples/dice.cpl examples/dice.cpl
examples/dice.uni examples/dice.uni
examples/ex.cpl examples/ex.cpl
examples/ex.uni examples/ex.uni
examples/exapprox.cpl examples/exapprox.cpl
examples/exapprox.uni examples/exapprox.uni
examples/exist.cpl examples/exist.cpl
examples/exist.uni examples/exist.uni
examples/exist1.cpl examples/exist1.cpl
examples/exist1.uni examples/exist1.uni
examples/exrange.cpl examples/exrange.cpl
examples/exrange.uni examples/exrange.uni
examples/female.cpl examples/female.cpl
examples/hiv.cpl examples/hiv.cpl
examples/hiv.uni examples/hiv.uni
examples/invalid.cpl examples/invalid.cpl
examples/invalid.uni examples/invalid.uni
examples/light.cpl examples/light.cpl
examples/light.uni examples/light.uni
examples/mendel.cpl examples/mendel.cpl
examples/mendel.uni examples/mendel.uni
examples/mendels.cpl examples/mendels.cpl
examples/mendels.uni examples/mendels.uni
examples/paper_ref.cpl examples/paper_ref.cpl
examples/paper_ref_not.cpl examples/paper_ref_not.cpl
examples/paper_ref_simple.cpl examples/paper_ref_simple.cpl
examples/school.cpl examples/school.cpl
examples/school_simple.cpl examples/school_simple.cpl
examples/school_simple.uni examples/school_simple.uni
examples/student.cpl examples/student.cpl
examples/student.uni examples/student.uni
examples/threesideddice.cpl examples/threesideddice.cpl
examples/threesideddice.uni examples/threesideddice.uni
examples/throws.cpl examples/throws.cpl
examples/throws.uni examples/throws.uni
examples/trigger.cpl examples/trigger.cpl
examples/trigger.uni examples/trigger.uni
examples/twosideddice.cpl examples/twosideddice.cpl
examples/win.cpl examples/win.cpl
examples/win.uni examples/win.uni
) )
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
@ -155,7 +137,7 @@ examples/win.uni
) )
TARGET_LINK_LIBRARIES(bddem TARGET_LINK_LIBRARIES(bddem
${CUDD_LIBRARIES_EXPORT} ${CUDD_LIBRARIES}
libYap libYap
) )
@ -181,7 +163,6 @@ examples/win.uni
TARGET_LINK_LIBRARIES(cplint TARGET_LINK_LIBRARIES(cplint
${CUDD_LIBRARIES} ${CUDD_LIBRARIES}
libYap libYap
bddem
) )
add_subDIRECTORY ( approx/simplecuddLPADs ) add_subDIRECTORY ( approx/simplecuddLPADs )

4
packages/cplint/approx/simplecuddLPADs/CMakeLists.txt
View File

@ -15,12 +15,12 @@ set_target_properties (LPADbdd PROPERTIES
) )
target_link_libraries(LPADbdd target_link_libraries(LPADbdd
${CUDD_LIBRARIES_EXPORT} ${CUDD_LIBRARIES}
libYap libYap
) )
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${CUDD_INCLUDE_DIR_EXPORT} ${CUDD_INCLUDE_DIR}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
) )