Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: msoos/cryptominisat
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5.11.20
Choose a base ref
...
head repository: msoos/cryptominisat
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5.11.21
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Feb 8, 2024

  1. Removing Bosphorus support

    @msoos
    msoos committed Feb 8, 2024
    Copy the full SHA
    c35ed3f View commit details

  2. Bumping version number so bosphorus cannot be enabled

    @msoos
    msoos committed Feb 8, 2024
    Copy the full SHA
    4c9a6b6 View commit details
Showing with 3 additions and 29 deletions.
  1. +2 −28 CMakeLists.txt
  2. +1 −1 pyproject.toml
30 changes: 2 additions & 28 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -447,7 +447,7 @@ else()
set(GIT_SHA "GIT-hash-notfound")
endif()

set(CMS_FULL_VERSION "5.11.20")
set(CMS_FULL_VERSION "5.11.21")

string(REPLACE "." ";" CMS_FULL_VERSION_LIST ${CMS_FULL_VERSION})
SetVersionNumber("PROJECT" ${CMS_FULL_VERSION_LIST})
@@ -574,34 +574,8 @@ endif()
# -----------------------------------------------------------------------------
# MIT option
# -----------------------------------------------------------------------------
option(NOBOSPHORUS "Don't use Bosphorus" ON)
option(REQUIRE_BOSPHORUS "Must use Bosphorus" OFF)
option(MIT "Build with only MIT licensed components" OFF)
if (MIT)
set(NOBOSPHORUS ON)
if(REQUIRE_BOSPHORUS)
message(FATAL_ERROR "Cannot have both MIT and REQUIRE_BOSPHORUS at the same time")
endif()
endif()

# -----------------------------------------------------------------------------
# Look for Boshphorus
# -----------------------------------------------------------------------------
if (NOT NOBOSPHORUS)
find_package(bosphorus)
if (NOT BOSPHORUS_LIBRARIES)
if (REQUIRE_BOSPHORUS)
message(FATAL_ERROR "Bosphorus NOT found, but it was required with REQUIRE_BOSPHORUS")
else()
message(WARNING "Bosphorus NOT found")
endif()
else()
message(STATUS "Bosphorus -- found version ${BOSPHORUS_VERSION_MAJOR}.${BOSPHORUS_VERSION_MINOR}")
message(STATUS "Bosphorus -- libraries: ${BOSPHORUS_LIBRARIES}")
message(STATUS "Bosphorus -- include dirs: ${BOSPHORUS_INCLUDE_DIRS}")
add_definitions( -DUSE_BOSPHORUS)
endif()
endif()
# NOTE: everything is MIT, bosphorus is now disabled

# -----------------------------------------------------------------------------
# Look for BreakID
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "pycryptosat"
version = "5.11.20"
version = "5.11.21"
description = "Bindings to CryptoMiniSat, an advanced SAT solver"
keywords = ["sat", "cryptography"]
license = { file = "LICENSE.txt" }