mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-11-03 21:09:11 +00:00
Code Activity

cmake: Cleanup remnants of workaround for USES_TERMINAL.

Browse source 
In older versions, this was dependent upon the version of cmake,
but when it was updated for newer cmake, these remnants were
left.
This commit is contained in:
Bruce Mitchener 2022-07-02 21:04:20 +07:00 • committed by Nikolaj Bjorner
parent 8313282cda
commit 42f5047463
9 changed files with 15 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

9
CMakeLists.txt
View file

@ -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 set(Z3_FULL_VERSION_STR "${Z3_VERSION}") # Note this might be modified
message(STATUS "Z3 version ${Z3_VERSION}") 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 # Message for polluted source tree sanity checks
################################################################################ ################################################################################
@ -482,7 +475,7 @@ add_custom_target(uninstall
COMMAND COMMAND
"${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
COMMENT "Uninstalling..." COMMENT "Uninstalling..."
${ADD_CUSTOM_COMMAND_USES_TERMINAL_ARG} USES_TERMINAL
VERBATIM VERBATIM
) )

8
cmake/z3_add_component.cmake
View file

@ -122,7 +122,7 @@ macro(z3_add_component component_name)
${Z3_GENERATED_FILE_EXTRA_DEPENDENCIES} ${Z3_GENERATED_FILE_EXTRA_DEPENDENCIES}
COMMENT "Generating \"${_full_output_file_path}\" from \"${pyg_file}\"" COMMENT "Generating \"${_full_output_file_path}\" from \"${pyg_file}\""
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
${ADD_CUSTOM_COMMAND_USES_TERMINAL_ARG} USES_TERMINAL
VERBATIM VERBATIM
) )
list(APPEND _list_generated_headers "${_full_output_file_path}") list(APPEND _list_generated_headers "${_full_output_file_path}")
@ -283,7 +283,7 @@ macro(z3_add_install_tactic_rule)
${Z3_GENERATED_FILE_EXTRA_DEPENDENCIES} ${Z3_GENERATED_FILE_EXTRA_DEPENDENCIES}
"${CMAKE_CURRENT_BINARY_DIR}/install_tactic.deps" "${CMAKE_CURRENT_BINARY_DIR}/install_tactic.deps"
COMMENT "Generating \"${CMAKE_CURRENT_BINARY_DIR}/install_tactic.cpp\"" COMMENT "Generating \"${CMAKE_CURRENT_BINARY_DIR}/install_tactic.cpp\""
${ADD_CUSTOM_COMMAND_USES_TERMINAL_ARG} USES_TERMINAL
VERBATIM VERBATIM
) )
unset(_expanded_components) unset(_expanded_components)
@ -321,7 +321,7 @@ macro(z3_add_memory_initializer_rule)
${Z3_GENERATED_FILE_EXTRA_DEPENDENCIES} ${Z3_GENERATED_FILE_EXTRA_DEPENDENCIES}
${_mem_init_finalize_headers} ${_mem_init_finalize_headers}
COMMENT "Generating \"${CMAKE_CURRENT_BINARY_DIR}/mem_initializer.cpp\"" COMMENT "Generating \"${CMAKE_CURRENT_BINARY_DIR}/mem_initializer.cpp\""
${ADD_CUSTOM_COMMAND_USES_TERMINAL_ARG} USES_TERMINAL
VERBATIM VERBATIM
) )
unset(_mem_init_finalize_headers) unset(_mem_init_finalize_headers)
@ -357,7 +357,7 @@ macro(z3_add_gparams_register_modules_rule)
${Z3_GENERATED_FILE_EXTRA_DEPENDENCIES} ${Z3_GENERATED_FILE_EXTRA_DEPENDENCIES}
${_register_module_header_files} ${_register_module_header_files}
COMMENT "Generating \"${CMAKE_CURRENT_BINARY_DIR}/gparams_register_modules.cpp\"" COMMENT "Generating \"${CMAKE_CURRENT_BINARY_DIR}/gparams_register_modules.cpp\""
${ADD_CUSTOM_COMMAND_USES_TERMINAL_ARG} USES_TERMINAL
VERBATIM VERBATIM
) )
unset(_expanded_components) unset(_expanded_components)

2
doc/CMakeLists.txt
View file

@ -69,7 +69,7 @@ add_custom_target(api_docs ${ALWAYS_BUILD_DOCS_ARG}
DEPENDS DEPENDS
${DOC_EXTRA_DEPENDS} ${DOC_EXTRA_DEPENDS}
COMMENT "Generating documentation" COMMENT "Generating documentation"
${ADD_CUSTOM_TARGET_USES_TERMINAL_ARG} USES_TERMINAL
) )
# Remove generated documentation when running `clean` target. # Remove generated documentation when running `clean` target.

2
src/CMakeLists.txt
View file

@ -204,7 +204,7 @@ if (MSVC)
${Z3_GENERATED_FILE_EXTRA_DEPENDENCIES} ${Z3_GENERATED_FILE_EXTRA_DEPENDENCIES}
${Z3_FULL_PATH_API_HEADER_FILES_TO_SCAN} ${Z3_FULL_PATH_API_HEADER_FILES_TO_SCAN}
COMMENT "Generating \"${dll_module_exports_file}\"" COMMENT "Generating \"${dll_module_exports_file}\""
${ADD_CUSTOM_COMMAND_USES_TERMINAL_ARG} USES_TERMINAL
VERBATIM VERBATIM
) )
add_custom_target(libz3_extra_depends add_custom_target(libz3_extra_depends

2
src/api/CMakeLists.txt
View file

@ -29,7 +29,7 @@ add_custom_command(OUTPUT ${generated_files}
# FIXME: When update_api.py no longer uses ``mk_util`` drop this dependency # FIXME: When update_api.py no longer uses ``mk_util`` drop this dependency
"${PROJECT_SOURCE_DIR}/scripts/mk_util.py" "${PROJECT_SOURCE_DIR}/scripts/mk_util.py"
COMMENT "Generating ${generated_files}" COMMENT "Generating ${generated_files}"
${ADD_CUSTOM_COMMAND_USES_TERMINAL_ARG} USES_TERMINAL
VERBATIM VERBATIM
) )

4
src/api/dotnet/CMakeLists.txt
View file

@ -19,7 +19,7 @@ add_custom_command(OUTPUT "${Z3_DOTNET_NATIVE_FILE}"
"${PROJECT_SOURCE_DIR}/scripts/update_api.py" "${PROJECT_SOURCE_DIR}/scripts/update_api.py"
${Z3_GENERATED_FILE_EXTRA_DEPENDENCIES} ${Z3_GENERATED_FILE_EXTRA_DEPENDENCIES}
COMMENT "Generating ${Z3_DOTNET_NATIVE_FILE}" COMMENT "Generating ${Z3_DOTNET_NATIVE_FILE}"
${ADD_CUSTOM_COMMAND_USES_TERMINAL_ARG} USES_TERMINAL
) )
# Generate Enumerations.cs # Generate Enumerations.cs
@ -35,7 +35,7 @@ add_custom_command(OUTPUT "${Z3_DOTNET_CONST_FILE}"
"${PROJECT_SOURCE_DIR}/scripts/mk_consts_files.py" "${PROJECT_SOURCE_DIR}/scripts/mk_consts_files.py"
${Z3_GENERATED_FILE_EXTRA_DEPENDENCIES} ${Z3_GENERATED_FILE_EXTRA_DEPENDENCIES}
COMMENT "Generating ${Z3_DOTNET_CONST_FILE}" COMMENT "Generating ${Z3_DOTNET_CONST_FILE}"
${ADD_CUSTOM_COMMAND_USES_TERMINAL_ARG} USES_TERMINAL
) )
set(Z3_DOTNET_ASSEMBLY_SOURCES_IN_SRC_TREE set(Z3_DOTNET_ASSEMBLY_SOURCES_IN_SRC_TREE

4
src/api/java/CMakeLists.txt
View file

@ -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 # FIXME: When update_api.py no longer uses ``mk_util`` drop this dependency
"${PROJECT_SOURCE_DIR}/scripts/mk_util.py" "${PROJECT_SOURCE_DIR}/scripts/mk_util.py"
COMMENT "Generating \"${Z3_JAVA_NATIVE_JAVA}\" and \"${Z3_JAVA_NATIVE_CPP}\"" 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 # 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" "${PROJECT_SOURCE_DIR}/scripts/mk_consts_files.py"
${Z3_GENERATED_FILE_EXTRA_DEPENDENCIES} ${Z3_GENERATED_FILE_EXTRA_DEPENDENCIES}
COMMENT "Generating ${Z3_JAVA_PACKAGE_NAME}.enumerations package" COMMENT "Generating ${Z3_JAVA_PACKAGE_NAME}.enumerations package"
${ADD_CUSTOM_COMMAND_USES_TERMINAL_ARG} USES_TERMINAL
) )
set(Z3_JAVA_JAR_SOURCE_FILES set(Z3_JAVA_JAR_SOURCE_FILES

4
src/api/python/CMakeLists.txt
View file

@ -43,7 +43,7 @@ add_custom_command(OUTPUT "${z3py_bindings_build_dest}/z3/z3core.py"
"${PROJECT_SOURCE_DIR}/scripts/update_api.py" "${PROJECT_SOURCE_DIR}/scripts/update_api.py"
${Z3_GENERATED_FILE_EXTRA_DEPENDENCIES} ${Z3_GENERATED_FILE_EXTRA_DEPENDENCIES}
COMMENT "Generating z3core.py" 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") 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" "${PROJECT_SOURCE_DIR}/scripts/mk_consts_files.py"
${Z3_GENERATED_FILE_EXTRA_DEPENDENCIES} ${Z3_GENERATED_FILE_EXTRA_DEPENDENCIES}
COMMENT "Generating z3consts.py" 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") list(APPEND build_z3_python_bindings_target_depends "${z3py_bindings_build_dest}/z3/z3consts.py")

2
src/ast/pattern/CMakeLists.txt
View file

@ -15,7 +15,7 @@ add_custom_command(OUTPUT "database.h"
DEPENDS "${PROJECT_SOURCE_DIR}/scripts/mk_pat_db.py" DEPENDS "${PROJECT_SOURCE_DIR}/scripts/mk_pat_db.py"
${Z3_GENERATED_FILE_EXTRA_DEPENDENCIES} ${Z3_GENERATED_FILE_EXTRA_DEPENDENCIES}
COMMENT "Generating \"database.h\"" COMMENT "Generating \"database.h\""
${ADD_CUSTOM_COMMAND_USES_TERMINAL_ARG} USES_TERMINAL
VERBATIM VERBATIM
) )