diff options
author | Mathias Preiner <mathias.preiner@gmail.com> | 2018-09-04 11:40:46 -0700 |
---|---|---|
committer | Mathias Preiner <mathias.preiner@gmail.com> | 2018-09-22 16:30:59 -0700 |
commit | 32bc6b382859a96f08f7ef78c0d64efc5235d227 (patch) | |
tree | 77539b00dc6e7673fcb97066aa32cb3bd0de6549 /CMakeLists.txt | |
parent | c255e8d8a39ca904ba6f99589fa06123c728d784 (diff) |
cmake: Add missing checks for cvc4autoconfig.h to ConfigureCVC4.cmake.
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 72 |
1 files changed, 2 insertions, 70 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 47934d05f..264daa615 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -221,8 +221,6 @@ set(CVC4_BUILD_PROFILE_PRODUCTION 0) set(CVC4_BUILD_PROFILE_DEBUG 0) set(CVC4_BUILD_PROFILE_TESTING 0) set(CVC4_BUILD_PROFILE_COMPETITION 0) -# Whether CVC4 is built with the (optional) GPLed library dependences. -set(CVC4_GPL_DEPS 0) #-----------------------------------------------------------------------------# # Compiler flags @@ -338,7 +336,7 @@ if(ENABLE_MUZZLE) endif() if(ENABLE_PORTFOLIO) - find_package(Boost REQUIRED COMPONENTS thread) + find_package(Boost 1.50.0 REQUIRED COMPONENTS thread) # Disable CLN for portfolio builds since it is not thread safe (uses an # unlocked hash table internally). set(USE_CLN OFF) @@ -348,6 +346,7 @@ if(ENABLE_PORTFOLIO) add_c_cxx_flag(-pthread) endif() add_definitions(-DCVC4_PORTFOLIO) + set(BOOST_HAS_THREAD_ATTR 1) endif() if(ENABLE_PROFILING) @@ -459,11 +458,7 @@ if(USE_READLINE) set(HAVE_LIBREADLINE 1) if(Readline_COMPENTRY_FUNC_RETURNS_CHARPTR) set(READLINE_COMPENTRY_FUNC_RETURNS_CHARP 1) - else() - set(READLINE_COMPENTRY_FUNC_RETURNS_CHARP 0) endif() -else() - set(HAVE_LIBREADLINE 0) endif() if(USE_SYMFPU) @@ -511,73 +506,10 @@ execute_process( include(ConfigureCVC4) -# Define to 1 if Boost threading library has support for thread attributes -set(BOOST_HAS_THREAD_ATTR 0) # Defined if using the CLN multi-precision arithmetic library. set(CVC4_CLN_IMP ${CVC4_USE_CLN_IMP}) # Defined if using the GMP multi-precision arithmetic library. set(CVC4_GMP_IMP ${CVC4_USE_GMP_IMP}) -## Defined if the requested minimum BOOST version is satisfied -#set(HAVE_BOOST 1) -## Define to 1 if you have <boost/system/error_code.hpp> -#set(HAVE_BOOST_SYSTEM_ERROR_CODE_HPP 1) -## Define to 1 if you have <boost/thread.hpp> -#set(HAVE_BOOST_THREAD_HPP 1) -# Defined to 1 if clock_gettime() is supported by the platform. -set(HAVE_CLOCK_GETTIME 1) -# define if the compiler supports basic C++11 syntax -set(HAVE_CXX11 1) -# Define to 1 if you have the declaration of `optreset', and to 0 if you don't. -set(HAVE_DECL_OPTRESET 0) -## Define to 1 if you have the declaration of `strerror_r', and to 0 if you -## don't. -#set(HAVE_DECL_STRERROR_R 1) -## Define to 1 if you have the <dlfcn.h> header file. -#set(HAVE_DLFCN_H 1) -# Define to 1 if you have the <ext/stdio_filebuf.h> header file. -set(HAVE_EXT_STDIO_FILEBUF_H 1) -# Defined to 1 if ffs() is supported by the platform. -set(HAVE_FFS 1) -# Define to 1 if you have the <getopt.h> header file. -set(HAVE_GETOPT_H 1) -## Define to 1 if you have the <inttypes.h> header file. -#set(HAVE_INTTYPES_H 1) -## Define to 1 if you have the `gmp' library (-lgmp). -#set(HAVE_LIBGMP 1) -## Define to 1 if you have the `profiler' library (-lprofiler). -#set(HAVE_LIBPROFILER 0) -# Define to 1 to use libreadline -#set(HAVE_LIBREADLINE 0) -## Define to 1 if you have the `tcmalloc' library (-ltcmalloc). -#set(HAVE_LIBTCMALLOC 0) -## Define to 1 if you have the <memory.h> header file. -#set(HAVE_MEMORY_H 1) -# Defined to 1 if sigaltstack() is supported by the platform. -set(HAVE_SIGALTSTACK 1) -## Define to 1 if you have the <stdint.h> header file. -#set(HAVE_STDINT_H 1) -## Define to 1 if you have the <stdlib.h> header file. -#set(HAVE_STDLIB_H 1) -# Define to 1 if you have the `strerror_r' function. -set(HAVE_STRERROR_R 1) -## Define to 1 if you have the <strings.h> header file. -#set(HAVE_STRINGS_H 1) -## Define to 1 if you have the <string.h> header file. -#set(HAVE_STRING_H 1) -# Defined to 1 if strtok_r() is supported by the platform. -set(HAVE_STRTOK_R 1) -## Define to 1 if you have the <sys/stat.h> header file. -#set(HAVE_SYS_STAT_H 1) -## Define to 1 if you have the <sys/types.h> header file. -#set(HAVE_SYS_TYPES_H 1) -# Define to 1 if you have the <unistd.h> header file. -set(HAVE_UNISTD_H 1) -## Define to the sub-directory where libtool stores uninstalled libraries. -#set(LT_OBJDIR ".libs/") -## Define to 1 if you have the ANSI C header files. -#set(STDC_HEADERS 1) -# Define to 1 if strerror_r returns char *. -set(STRERROR_R_CHAR_P 1) configure_file(cvc4autoconfig.new.h.in cvc4autoconfig.h) include_directories(${CMAKE_CURRENT_BINARY_DIR}) |