From 6975c60645abb0c6d26812005966c1d5f18a41bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADtor=20Santos=20Costa?= Date: Mon, 9 Nov 2015 11:28:44 +0000 Subject: [PATCH] support interface to minisat2. --- packages/swi-minisat2/C/CMakeLists.txt | 51 ++++++++++++++++++++++++++ packages/swi-minisat2/C/pl-minisat.C | 2 +- packages/swi-minisat2/CMakeLists.txt | 18 +++++++++ packages/swi-minisat2/minisat.pl | 1 + 4 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 packages/swi-minisat2/C/CMakeLists.txt create mode 100644 packages/swi-minisat2/CMakeLists.txt diff --git a/packages/swi-minisat2/C/CMakeLists.txt b/packages/swi-minisat2/C/CMakeLists.txt new file mode 100644 index 000000000..e5571b12a --- /dev/null +++ b/packages/swi-minisat2/C/CMakeLists.txt @@ -0,0 +1,51 @@ + +#cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR) + + set ( MINISAT2_HEADERS +Alg.h +BasicHeap.h +BoxedVec.h +Heap.h +Map.h +Queue.h +Solver.h +SolverTypes.h +Sort.h +Vec.h +) + +set ( MINISAT2_SOURCES +Solver.C +pl-minisat.C +) + + + INCLUDE_DIRECTORIES( + ${CMAKE_CURRENT_SOURCE_DIR} + ) + + ADD_LIBRARY(minisat2 SHARED ${MINISAT2_SOURCES} ${MINISAT2_HEADERS} ) + + set_target_properties (minisat2 PROPERTIES OUTPUT_NAME pl-minisat) + set_target_properties (minisat2 PROPERTIES PREFIX "") + + + if(DEFINED YAP_MAJOR_VERSION) + TARGET_LINK_LIBRARIES(minisat2 + libYap + ) + else() + ADD_LIBRARY(minisat2 SHARED ${MINISAT2_SOURCES} ) + endif() + + #set_property(TARGET minisat2 PROPERTY CXX_STANDARD 11) + #set_property(TARGET minisat2 PROPERTY CXX_STANDARD_REQUIRED ON) + + install ( + TARGETS minisat2 + RUNTIME DESTINATION ${bindir} + ARCHIVE DESTINATION ${libdir} + LIBRARY DESTINATION ${dlls} + ) + + diff --git a/packages/swi-minisat2/C/pl-minisat.C b/packages/swi-minisat2/C/pl-minisat.C index 355898a5e..dca924705 100644 --- a/packages/swi-minisat2/C/pl-minisat.C +++ b/packages/swi-minisat2/C/pl-minisat.C @@ -1,4 +1,4 @@ -#include +//#include #include #include #include diff --git a/packages/swi-minisat2/CMakeLists.txt b/packages/swi-minisat2/CMakeLists.txt new file mode 100644 index 000000000..8795ff2ff --- /dev/null +++ b/packages/swi-minisat2/CMakeLists.txt @@ -0,0 +1,18 @@ + +set (PROGRAMS + cnf.pl + minisat.pl + ) + +set (EXAMPLE_PROGRAMS + examples/adder.pl + examples/pearl_examples.pl + ) + +install(FILES + ${PROGRAMS} + DESTINATION ${libpl} + ) + +add_subDIRECTORY (C) + diff --git a/packages/swi-minisat2/minisat.pl b/packages/swi-minisat2/minisat.pl index 8418fd81d..386f70c22 100644 --- a/packages/swi-minisat2/minisat.pl +++ b/packages/swi-minisat2/minisat.pl @@ -41,6 +41,7 @@ maximize_v3/2 ]). +:- use_module(library(shlib)). :- use_module(library(lists)).