Merge pull request #6783 from NlightNFotis/link-minisat

solvers: also link MiniSat2 options

Author: NlightNFotis

scripts/minisat-2.2.1-patch

@@ -179,6 +179,23 @@ index 2dba10f..7d2e83a 100644
          if (verbose){
              fprintf(stderr, "\n        %s\n", description);
              fprintf(stderr, "\n");
+diff --git a/minisat/utils/Options.cc b/minisat/utils/Options.cc
+index 83c40e8..15bfca1 100644
+--- a/minisat/utils/Options.cc
++++ b/minisat/utils/Options.cc
+@@ -43,10 +43,12 @@ void Minisat::parseOptions(int& argc, char** argv, bool strict)
+             }
+
+             if (!parsed_ok)
++            {
+                 if (strict && match(argv[i], "-"))
+                     fprintf(stderr, "ERROR! Unknown flag \"%s\". Use '--%shelp' for help.\n", argv[i], Option::getHelpPrefixString()), exit(1);
+                 else
+                     argv[j++] = argv[i];
++            }
+         }
+     }
+
 diff --git a/minisat/utils/ParseUtils.h b/minisat/utils/ParseUtils.h
 index d307164..7b46f09 100644
 --- a/minisat/utils/ParseUtils.h

scripts/minisat2_CMakeLists.txt

@@ -4,6 +4,7 @@
 add_library(minisat2-condensed
     minisat/simp/SimpSolver.cc
     minisat/core/Solver.cc
+    minisat/utils/Options.cc
 )
 
 set_target_properties(

src/solvers/Makefile

@@ -17,7 +17,7 @@ endif
 ifneq ($(MINISAT2),)
   MINISAT2_SRC=sat/satcheck_minisat2.cpp
   MINISAT2_INCLUDE=-I $(MINISAT2)
-  MINISAT2_LIB=$(MINISAT2)/minisat/simp/SimpSolver$(OBJEXT) $(MINISAT2)/minisat/core/Solver$(OBJEXT)
+  MINISAT2_LIB=$(MINISAT2)/minisat/simp/SimpSolver$(OBJEXT) $(MINISAT2)/minisat/core/Solver$(OBJEXT) $(MINISAT2)/minisat/utils/Options$(OBJEXT)
   CP_CXXFLAGS += -DHAVE_MINISAT2 -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
   CLEANFILES += $(MINISAT2_LIB) $(patsubst %$(OBJEXT), %$(DEPEXT), $(MINISAT2_LIB))
 endif