fix cmake for CUDD

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

View File

@ -121,7 +121,17 @@ else()
set(YAP_STARTUP startup.yss)
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)
endif(WITH_JAVA)
set(WITH_PYTHON YES CACHE FILEPATH "Try to use Python (currently Python 3)")

View File

@ -16,10 +16,6 @@ IF (NOT YAP_FOUND)
MESSAGE (SEND_ERROR "YAP was not 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)
# CUDD_FOUND - system has Cudd
# CUDD_LIBRARIES - Link these to use Cudd
@ -36,13 +32,6 @@ IF (CUDD_FOUND)
${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"
"${CMAKE_CURRENT_BINARY_DIR}/cudd_config.h" )
@ -78,6 +67,3 @@ IF (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)

View File

@ -1,34 +1,16 @@
SET( CMAKE_FIND_FRAMEWORK LAST)
SET( CMAKE_FIND_APPBUNDLE LAST)
# Be sure to also update these in Makefile!
set(SO_MAJOR 1)
set(SO_MINOR 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)
# CUDD_FOUND - system has Cudd
# CUDD_LIBRARIES - Link these to use Cudd
# CUDD_INCLUDE_DIR - Include directory for using Cudd
INCLUDE_DIRECTORIES(
${CUDD_INCLUDE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CUDD_INCLUDE_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 )
set( CPLINT_SOURCES
cplint.h
cplint_yap.c
@ -155,7 +137,7 @@ examples/win.uni
)
TARGET_LINK_LIBRARIES(bddem
${CUDD_LIBRARIES_EXPORT}
${CUDD_LIBRARIES}
libYap
)
@ -181,7 +163,6 @@ examples/win.uni
TARGET_LINK_LIBRARIES(cplint
${CUDD_LIBRARIES}
libYap
bddem
)
add_subDIRECTORY ( approx/simplecuddLPADs )

View File

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