From 479aebfc657eb9bc90fad550f51ec3b3d2efec76 Mon Sep 17 00:00:00 2001 From: Mathias Preiner Date: Wed, 12 Sep 2018 11:10:01 -0700 Subject: [PATCH] cmake: Add make install rule. --- CMakeLists.txt | 25 +++--- configure.sh | 8 ++ doc/CMakeLists.txt | 13 +++ proofs/signatures/CMakeLists.txt | 1 + src/CMakeLists.txt | 130 +++++++++++++++++++++++++++++ src/bindings/CMakeLists.txt | 4 + src/bindings/python/CMakeLists.txt | 26 +++++- src/main/CMakeLists.txt | 2 + src/parser/CMakeLists.txt | 4 +- 9 files changed, 200 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7c7715ad3..b72d097b8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,15 +8,16 @@ endif() project(cvc4) -# Major component of the version of CVC4. -set(CVC4_MAJOR 1) -# Minor component of the version of CVC4. -set(CVC4_MINOR 7) -# Release component of the version of CVC4. -set(CVC4_RELEASE 0) +set(CVC4_MAJOR 1) # Major component of the version of CVC4. +set(CVC4_MINOR 7) # Minor component of the version of CVC4. +set(CVC4_RELEASE 0) # Release component of the version of CVC4. + # Extraversion component of the version of CVC4. set(CVC4_EXTRAVERSION "-prerelease") +# Shared library versioning. Increment SOVERSION for every new CVC4 release. +set(CVC4_SOVERSION 5) + # Full release string for CVC4. if(CVC4_RELEASE) set(CVC4_RELEASE_STRING @@ -28,10 +29,6 @@ endif() # Define to the full name of this package. set(PACKAGE_NAME "${PROJECT_NAME}") -# Shared library versioning. Increment SOVERSION for every new CVC4 release. -set(CVC4_VERSION "${CVC4_MAJOR}.${CVC4_MINOR}.${CVC4_RELEASE}") -set(CVC4_SOVERSION 5) - #### These defines are only use in autotools make files, will likely be #### replaced with corresponding CPack stuff ## Define to the full name and version of this package. @@ -250,6 +247,7 @@ option(USE_CADICAL "Use CaDiCaL SAT solver") option(USE_CRYPTOMINISAT "Use CryptoMiniSat SAT solver") option(USE_LFSC "Use LFSC proof checker") option(USE_SYMFPU "Use SymFPU for floating point support") +option(USE_PYTHON2 "Prefer using Python 2 (for Python bindings)") # Custom install directories for dependencies # If no directory is provided by the user, we first check if the dependency was @@ -358,6 +356,13 @@ enable_testing() #-----------------------------------------------------------------------------# +if(USE_PYTHON2) + find_package(PythonInterp 2.7 REQUIRED) +else() + find_package(PythonInterp 3) + find_package(PythonInterp REQUIRED) +endif() + set(GMP_HOME ${GMP_DIR}) find_package(GMP REQUIRED) libcvc4_link_libraries(${GMP_LIBRARIES}) diff --git a/configure.sh b/configure.sh index 00b958f4c..8e31c5da7 100755 --- a/configure.sh +++ b/configure.sh @@ -36,6 +36,7 @@ The following flags enable optional features (disable with --no-