From 42f50474631eb3cb1159a8df45a50aed276bba49 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Sat, 2 Jul 2022 21:04:20 +0700 Subject: [PATCH] cmake: Cleanup remnants of workaround for USES_TERMINAL. In older versions, this was dependent upon the version of cmake, but when it was updated for newer cmake, these remnants were left. --- CMakeLists.txt | 9 +-------- cmake/z3_add_component.cmake | 8 ++++---- doc/CMakeLists.txt | 2 +- src/CMakeLists.txt | 2 +- src/api/CMakeLists.txt | 2 +- src/api/dotnet/CMakeLists.txt | 4 ++-- src/api/java/CMakeLists.txt | 4 ++-- src/api/python/CMakeLists.txt | 4 ++-- src/ast/pattern/CMakeLists.txt | 2 +- 9 files changed, 15 insertions(+), 22 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e3fb1860bc2..2ca176568ee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,13 +10,6 @@ project(Z3 VERSION 4.11.0.0 LANGUAGES CXX) set(Z3_FULL_VERSION_STR "${Z3_VERSION}") # Note this might be modified message(STATUS "Z3 version ${Z3_VERSION}") -################################################################################ -# Set various useful variables depending on CMake version -################################################################################ - -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 ################################################################################ @@ -482,7 +475,7 @@ add_custom_target(uninstall COMMAND "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" COMMENT "Uninstalling..." - ${ADD_CUSTOM_COMMAND_USES_TERMINAL_ARG} + USES_TERMINAL VERBATIM ) diff --git a/cmake/z3_add_component.cmake b/cmake/z3_add_component.cmake index 47ecb04aa44..aa5f8517f5a 100644 --- a/cmake/z3_add_component.cmake +++ b/cmake/z3_add_component.cmake @@ -122,7 +122,7 @@ macro(z3_add_component component_name) ${Z3_GENERATED_FILE_EXTRA_DEPENDENCIES} COMMENT "Generating \"${_full_output_file_path}\" from \"${pyg_file}\"" WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" - ${ADD_CUSTOM_COMMAND_USES_TERMINAL_ARG} + USES_TERMINAL VERBATIM ) list(APPEND _list_generated_headers "${_full_output_file_path}") @@ -283,7 +283,7 @@ macro(z3_add_install_tactic_rule) ${Z3_GENERATED_FILE_EXTRA_DEPENDENCIES} "${CMAKE_CURRENT_BINARY_DIR}/install_tactic.deps" COMMENT "Generating \"${CMAKE_CURRENT_BINARY_DIR}/install_tactic.cpp\"" - ${ADD_CUSTOM_COMMAND_USES_TERMINAL_ARG} + USES_TERMINAL VERBATIM ) unset(_expanded_components) @@ -321,7 +321,7 @@ macro(z3_add_memory_initializer_rule) ${Z3_GENERATED_FILE_EXTRA_DEPENDENCIES} ${_mem_init_finalize_headers} COMMENT "Generating \"${CMAKE_CURRENT_BINARY_DIR}/mem_initializer.cpp\"" - ${ADD_CUSTOM_COMMAND_USES_TERMINAL_ARG} + USES_TERMINAL VERBATIM ) unset(_mem_init_finalize_headers) @@ -357,7 +357,7 @@ macro(z3_add_gparams_register_modules_rule) ${Z3_GENERATED_FILE_EXTRA_DEPENDENCIES} ${_register_module_header_files} COMMENT "Generating \"${CMAKE_CURRENT_BINARY_DIR}/gparams_register_modules.cpp\"" - ${ADD_CUSTOM_COMMAND_USES_TERMINAL_ARG} + USES_TERMINAL VERBATIM ) unset(_expanded_components) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index e37ca131f24..54ba73fb0c2 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -69,7 +69,7 @@ add_custom_target(api_docs ${ALWAYS_BUILD_DOCS_ARG} DEPENDS ${DOC_EXTRA_DEPENDS} COMMENT "Generating documentation" - ${ADD_CUSTOM_TARGET_USES_TERMINAL_ARG} + USES_TERMINAL ) # Remove generated documentation when running `clean` target. diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 51fafb42f91..5be29c9508f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -204,7 +204,7 @@ if (MSVC) ${Z3_GENERATED_FILE_EXTRA_DEPENDENCIES} ${Z3_FULL_PATH_API_HEADER_FILES_TO_SCAN} COMMENT "Generating \"${dll_module_exports_file}\"" - ${ADD_CUSTOM_COMMAND_USES_TERMINAL_ARG} + USES_TERMINAL VERBATIM ) add_custom_target(libz3_extra_depends diff --git a/src/api/CMakeLists.txt b/src/api/CMakeLists.txt index 98318098537..f00a2732bbf 100644 --- a/src/api/CMakeLists.txt +++ b/src/api/CMakeLists.txt @@ -29,7 +29,7 @@ add_custom_command(OUTPUT ${generated_files} # FIXME: When update_api.py no longer uses ``mk_util`` drop this dependency "${PROJECT_SOURCE_DIR}/scripts/mk_util.py" COMMENT "Generating ${generated_files}" - ${ADD_CUSTOM_COMMAND_USES_TERMINAL_ARG} + USES_TERMINAL VERBATIM ) diff --git a/src/api/dotnet/CMakeLists.txt b/src/api/dotnet/CMakeLists.txt index 1e9f598e770..82abfbf0915 100644 --- a/src/api/dotnet/CMakeLists.txt +++ b/src/api/dotnet/CMakeLists.txt @@ -19,7 +19,7 @@ add_custom_command(OUTPUT "${Z3_DOTNET_NATIVE_FILE}" "${PROJECT_SOURCE_DIR}/scripts/update_api.py" ${Z3_GENERATED_FILE_EXTRA_DEPENDENCIES} COMMENT "Generating ${Z3_DOTNET_NATIVE_FILE}" - ${ADD_CUSTOM_COMMAND_USES_TERMINAL_ARG} + USES_TERMINAL ) # Generate Enumerations.cs @@ -35,7 +35,7 @@ add_custom_command(OUTPUT "${Z3_DOTNET_CONST_FILE}" "${PROJECT_SOURCE_DIR}/scripts/mk_consts_files.py" ${Z3_GENERATED_FILE_EXTRA_DEPENDENCIES} COMMENT "Generating ${Z3_DOTNET_CONST_FILE}" - ${ADD_CUSTOM_COMMAND_USES_TERMINAL_ARG} + USES_TERMINAL ) set(Z3_DOTNET_ASSEMBLY_SOURCES_IN_SRC_TREE diff --git a/src/api/java/CMakeLists.txt b/src/api/java/CMakeLists.txt index 695c946a313..cb73702fe11 100644 --- a/src/api/java/CMakeLists.txt +++ b/src/api/java/CMakeLists.txt @@ -32,7 +32,7 @@ add_custom_command(OUTPUT "${Z3_JAVA_NATIVE_JAVA}" "${Z3_JAVA_NATIVE_CPP}" # FIXME: When update_api.py no longer uses ``mk_util`` drop this dependency "${PROJECT_SOURCE_DIR}/scripts/mk_util.py" COMMENT "Generating \"${Z3_JAVA_NATIVE_JAVA}\" and \"${Z3_JAVA_NATIVE_CPP}\"" - ${ADD_CUSTOM_COMMAND_USES_TERMINAL_ARG} + USES_TERMINAL ) # Add rule to build native code that provides a bridge between @@ -88,7 +88,7 @@ add_custom_command(OUTPUT ${Z3_JAVA_ENUMERATION_PACKAGE_FILES_FULL_PATH} "${PROJECT_SOURCE_DIR}/scripts/mk_consts_files.py" ${Z3_GENERATED_FILE_EXTRA_DEPENDENCIES} COMMENT "Generating ${Z3_JAVA_PACKAGE_NAME}.enumerations package" - ${ADD_CUSTOM_COMMAND_USES_TERMINAL_ARG} + USES_TERMINAL ) set(Z3_JAVA_JAR_SOURCE_FILES diff --git a/src/api/python/CMakeLists.txt b/src/api/python/CMakeLists.txt index 067a25e8c6c..f5e449ea84f 100644 --- a/src/api/python/CMakeLists.txt +++ b/src/api/python/CMakeLists.txt @@ -43,7 +43,7 @@ add_custom_command(OUTPUT "${z3py_bindings_build_dest}/z3/z3core.py" "${PROJECT_SOURCE_DIR}/scripts/update_api.py" ${Z3_GENERATED_FILE_EXTRA_DEPENDENCIES} COMMENT "Generating z3core.py" - ${ADD_CUSTOM_COMMAND_USES_TERMINAL_ARG} + USES_TERMINAL ) list(APPEND build_z3_python_bindings_target_depends "${z3py_bindings_build_dest}/z3/z3core.py") @@ -59,7 +59,7 @@ add_custom_command(OUTPUT "${z3py_bindings_build_dest}/z3/z3consts.py" "${PROJECT_SOURCE_DIR}/scripts/mk_consts_files.py" ${Z3_GENERATED_FILE_EXTRA_DEPENDENCIES} COMMENT "Generating z3consts.py" - ${ADD_CUSTOM_COMMAND_USES_TERMINAL_ARG} + USES_TERMINAL ) list(APPEND build_z3_python_bindings_target_depends "${z3py_bindings_build_dest}/z3/z3consts.py") diff --git a/src/ast/pattern/CMakeLists.txt b/src/ast/pattern/CMakeLists.txt index 8d0cf0cb462..7393b711065 100644 --- a/src/ast/pattern/CMakeLists.txt +++ b/src/ast/pattern/CMakeLists.txt @@ -15,7 +15,7 @@ add_custom_command(OUTPUT "database.h" DEPENDS "${PROJECT_SOURCE_DIR}/scripts/mk_pat_db.py" ${Z3_GENERATED_FILE_EXTRA_DEPENDENCIES} COMMENT "Generating \"database.h\"" - ${ADD_CUSTOM_COMMAND_USES_TERMINAL_ARG} + USES_TERMINAL VERBATIM )