solvers: also link MiniSat2 options #6783
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
To be able to parse options again when setting up a solver, the parseOption method has to be present. Hence, link against the Options.cc file of MiniSat2 as well. Signed-off-by: Norbert Manthey <[email protected]>
CBMC compiles with more strict compiler warnings. To make the compiler happy, extend the MiniSat patch to fix the Option.cc file as well.
NlightNFotis
requested review from
kroening,
tautschnig,
peterschrammel,
chris-ryder,
thomasspriggs and
TGWDB
as code owners
6 tasks
tautschnig
requested changes
May 6, 2022
| @@ -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) | |||
There was a problem hiding this comment.
scripts/minisat2_CMakeLists.txt also needs updating.
There was a problem hiding this comment.
Addressed in 82b1600
Codecov Report
@@ Coverage Diff @@
## develop #6783 +/- ##
===========================================
+ Coverage 76.90% 77.79% +0.89%
===========================================
Files 1590 1567 -23
Lines 183970 179841 -4129
===========================================
- Hits 141485 139913 -1572
+ Misses 42485 39928 -2557
Continue to review full report at Codecov.
|
tautschnig
approved these changes
May 24, 2022
TGWDB
approved these changes
May 25, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR is created to supersede #3243.
It's object is to link against one of the object files of
Minisat that we're currently missing (
options.cc).For a more extensive discussion of the pros/cons of the change,
please refer to the original PR.