Fix cmake usage

Author: msoos

CMakeLists.txt

@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-cmake_minimum_required(VERSION 3.12 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.15 FATAL_ERROR)
 
 # -----------------------------------------------------------------------------
 # Make RelWithDebInfo the default build type if otherwise not set
@@ -54,6 +54,8 @@ foreach(build_config ${build_types})
     endforeach()
 endforeach()
 
+set(CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY ON)
+set(CMAKE_EXPORT_PACKAGE_REGISTRY OFF)
 project(approxmc)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_C_STANDARD 99)
@@ -90,9 +92,6 @@ if((${CMAKE_SYSTEM_NAME} MATCHES "Linux") OR (${CMAKE_SYSTEM_NAME} MATCHES "Darw
     endif()
 endif()
 
-set(THREADS_PREFER_PTHREAD_FLAG ON)
-find_package(Threads REQUIRED)
-
 option(SANITIZE "Use Clang sanitizers. You MUST use clang++ as the compiler for this to work" OFF)
 if(SANITIZE)
     message(WARNING " --Using clang sanitizers -- you MUST use clang++ or the compile WILL fail")
@@ -349,31 +348,30 @@ endmacro()
 # -----------------------------------------------------------------------------
 # Dependencies
 # -----------------------------------------------------------------------------
-option(NOZLIB "Don't use zlib" OFF)
-if(NOT NOZLIB AND NOT (STATICCOMPILE AND WIN32))
-    find_package(ZLIB)
-    if(ZLIB_FOUND)
-        message(STATUS "OK, Found ZLIB!")
-        add_compile_definitions(USE_ZLIB)
-    else()
-        message(STATUS "WARNING: Did not find ZLIB, gzipped file support will be disabled")
-    endif()
-endif()
-
 find_package(GMP REQUIRED)
-
+set(cryptominisat5_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../cryptominisat/build")
 find_package(cryptominisat5 CONFIG REQUIRED)
 message(STATUS "CryptoMiniSat5 dynamic lib: ${CRYPTOMINISAT5_LIBRARIES}")
 message(STATUS "CryptoMiniSat5 static lib:  ${CRYPTOMINISAT5_STATIC_LIBRARIES}")
 message(STATUS "CryptoMiniSat5 static lib deps: ${CRYPTOMINISAT5_STATIC_LIBRARIES_DEPS}")
 message(STATUS "CryptoMiniSat5 include dirs: ${CRYPTOMINISAT5_INCLUDE_DIRS}")
 
+set(arjun_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../arjun/build")
 find_package(arjun CONFIG REQUIRED)
 message(STATUS "Arjun dynamic lib : ${ARJUN_LIBRARIES}")
+message(STATUS "Arjun dynamic lib : ${ARJUN_STATIC_LIBRARIES}")
 message(STATUS "Arjun include dirs: ${ARJUN_INCLUDE_DIRS}")
-find_package(sbva CONFIG REQUIRED)
-find_package(EvalMaxSAT CONFIG REQUIRED)
-find_package(treedecomp CONFIG REQUIRED)
+
+option(NOZLIB "Don't use zlib" OFF)
+if(NOT NOZLIB AND NOT (STATICCOMPILE AND WIN32))
+    find_package(ZLIB)
+    if(ZLIB_FOUND)
+        message(STATUS "OK, Found ZLIB!")
+        add_compile_definitions(USE_ZLIB)
+    else()
+        message(STATUS "WARNING: Did not find ZLIB, gzipped file support will be disabled")
+    endif()
+endif()
 
 # -----------------------------------------------------------------------------
 # Provide an export name to be used by targets that wish to export themselves.

scripts/build_scripts/build_norm.sh

@@ -1,8 +1,7 @@
-#!/bin/bash
+#!/usr/bin/env bash
+set -euo pipefail
 
-set -e
-
-rm -rf lib* Test* tests* include tests scalmc* CM* cmake* approxmc* apx-src
+rm -rf .cmake lib* Test* tests* include tests scalmc* CM* cmake* approxmc* apx-src
 cmake -DENABLE_TESTING=ON ..
 make -j16
 make test

src/CMakeLists.txt

@@ -51,31 +51,29 @@ target_include_directories(approxmc
     ${CMAKE_CURRENT_BINARY_DIR}
   PUBLIC
     ${CRYPTOMINISAT5_INCLUDE_DIRS}
-    ${ARJUN_INCLUDE_DIRS}
-    ${GMP_INCLUDE_DIRS}
 )
 
 target_link_libraries(approxmc
   PUBLIC
-    Threads::Threads
-    ${ARJUN_LIBRARIES}
     ${CRYPTOMINISAT5_LIBRARIES}
 )
 
 add_executable(approxmc-bin main.cpp ${approxmc_lib_files})
 
-target_include_directories(approxmc-bin PRIVATE
+target_include_directories(approxmc-bin
+  PRIVATE
     ${PROJECT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
-    ${CRYPTOMINISAT5_INCLUDE_DIRS}
     ${ARJUN_INCLUDE_DIRS}
-    ${GMP_INCLUDE_DIRS}
+  PUBLIC
+    ${CRYPTOMINISAT5_INCLUDE_DIRS}
 )
 
 target_link_libraries(approxmc-bin
   PRIVATE
     ${GMP_LIBRARY}
+    ${ARJUN_LIBRARIES}
     approxmc
 )
 

src/counter.cpp

@@ -41,11 +41,6 @@
 #include "counter.h"
 #include "appmc_constants.h"
 #include "time_mem.h"
-#ifdef CMS_LOCAL_BUILD
-#include "arjun.h"
-#else
-#include <arjun/arjun.h>
-#endif
 
 using std::cout;
 using std::endl;