From 51532ba446695303b427989808a428c9fd1ee0b2 Mon Sep 17 00:00:00 2001 From: Nikolaj Bjorner Date: Fri, 7 Jun 2019 17:08:22 -0700 Subject: [PATCH] remove stale config #2318 thanks @ekpyron Signed-off-by: Nikolaj Bjorner --- CMakeLists.txt | 41 +++++++++-------------------------------- 1 file changed, 9 insertions(+), 32 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5c82c1c00..e7ecb404a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,15 +27,9 @@ message(STATUS "Z3 version ${Z3_VERSION}") ################################################################################ # Set various useful variables depending on CMake version ################################################################################ -if (("${CMAKE_VERSION}" VERSION_EQUAL "3.2") OR ("${CMAKE_VERSION}" VERSION_GREATER "3.2")) - # In CMake >= 3.2 add_custom_command() and add_custom_target() - # supports a ``USES_TERMINAL`` argument - set(ADD_CUSTOM_COMMAND_USES_TERMINAL_ARG "USES_TERMINAL") - set(ADD_CUSTOM_TARGET_USES_TERMINAL_ARG "USES_TERMINAL") -else() - set(ADD_CUSTOM_COMMAND_USES_TERMINAL_ARG "") - set(ADD_CUSTOM_TARGET_USES_TERMINAL_ARG "") -endif() + +set(ADD_CUSTOM_COMMAND_USES_TERMINAL_ARG "USES_TERMINAL") +set(ADD_CUSTOM_TARGET_USES_TERMINAL_ARG "USES_TERMINAL") ################################################################################ # Message for polluted source tree sanity checks @@ -198,17 +192,8 @@ include(${PROJECT_SOURCE_DIR}/cmake/z3_add_cxx_flag.cmake) ################################################################################ # C++ language version ################################################################################ -if ("${CMAKE_VERSION}" VERSION_LESS "3.1") - # FIXME: Drop this when we upgrade to newer CMake versions. - if (("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")) - z3_add_cxx_flag("-std=c++11" REQUIRED) - else() - message(AUTHOR_WARNING "Not setting C++ language version for compiler") - endif() -else () - set(CMAKE_CXX_STANDARD 11) - set(CMAKE_CXX_STANDARD_REQUIRED ON) -endif () +set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD_REQUIRED ON) ################################################################################ # Platform detection @@ -550,18 +535,10 @@ add_subdirectory(src) # use Z3 via CMake. ################################################################################ include(CMakePackageConfigHelpers) -if ("${CMAKE_VERSION}" VERSION_LESS "3.0") - # FIXME: Remove this once we drop support for CMake 2.8.12 - export(TARGETS libz3 - NAMESPACE z3:: - FILE "${PROJECT_BINARY_DIR}/Z3Targets.cmake" - ) -else() - export(EXPORT Z3_EXPORTED_TARGETS - NAMESPACE z3:: - FILE "${PROJECT_BINARY_DIR}/Z3Targets.cmake" - ) -endif() +export(EXPORT Z3_EXPORTED_TARGETS + NAMESPACE z3:: + FILE "${PROJECT_BINARY_DIR}/Z3Targets.cmake" +) set(Z3_FIRST_PACKAGE_INCLUDE_DIR "${PROJECT_BINARY_DIR}/src/api") set(Z3_SECOND_PACKAGE_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/src/api") set(Z3_CXX_PACKAGE_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/src/api/c++")