From 98244ac9a97c4f5e641024657d0a4cd82e0ff9ab Mon Sep 17 00:00:00 2001
From: Dan Liew <daniel.liew@imperial.ac.uk>
Date: Wed, 9 Mar 2016 01:26:06 +0000
Subject: [PATCH] [CMake] Remove global "generated file" dependency on
 ``mk_util.py``. Most file generation scripts don't depend on it anymore.

The exceptions are uses of ``update_api.py``. An explicit dependency
has been added here and a ``FIXME`` has been left to indicate that this
should be removed once ``update_api.py`` is completly independent of
``mk_util.py``.
---
 CMakeLists.txt                              | 2 --
 contrib/cmake/src/api/CMakeLists.txt        | 2 ++
 contrib/cmake/src/api/python/CMakeLists.txt | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5cdf06120..0204a8a44 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -340,9 +340,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
 ################################################################################
 # Note: ``update_api.py`` is deliberately not here because it not used
 # to generate every generated file. The targets that need it list it explicitly.
-# FIXME: We should drop the dependency on ``mk_util.py``
 set(Z3_GENERATED_FILE_EXTRA_DEPENDENCIES
-  "${CMAKE_SOURCE_DIR}/scripts/mk_util.py"
   "${CMAKE_SOURCE_DIR}/scripts/mk_genfile_common.py"
 )
 
diff --git a/contrib/cmake/src/api/CMakeLists.txt b/contrib/cmake/src/api/CMakeLists.txt
index 78837c001..8e796168f 100644
--- a/contrib/cmake/src/api/CMakeLists.txt
+++ b/contrib/cmake/src/api/CMakeLists.txt
@@ -26,6 +26,8 @@ add_custom_command(OUTPUT ${generated_files}
   DEPENDS "${CMAKE_SOURCE_DIR}/scripts/update_api.py"
           ${Z3_GENERATED_FILE_EXTRA_DEPENDENCIES}
           ${Z3_FULL_PATH_API_HEADER_FILES_TO_SCAN}
+          # FIXME: When update_api.py no longer uses ``mk_util`` drop this dependency
+          "${CMAKE_SOURCE_DIR}/scripts/mk_util.py"
   COMMENT "Generating ${generated_files}"
   ${ADD_CUSTOM_COMMAND_USES_TERMINAL_ARG}
   VERBATIM
diff --git a/contrib/cmake/src/api/python/CMakeLists.txt b/contrib/cmake/src/api/python/CMakeLists.txt
index 05d04e552..6e4096057 100644
--- a/contrib/cmake/src/api/python/CMakeLists.txt
+++ b/contrib/cmake/src/api/python/CMakeLists.txt
@@ -39,6 +39,8 @@ add_custom_command(OUTPUT "${z3py_bindings_build_dest}/z3core.py"
     ${Z3_FULL_PATH_API_HEADER_FILES_TO_SCAN}
     "${CMAKE_SOURCE_DIR}/scripts/update_api.py"
     ${Z3_GENERATED_FILE_EXTRA_DEPENDENCIES}
+    # FIXME: When update_api.py no longer uses ``mk_util`` drop this dependency
+    "${CMAKE_SOURCE_DIR}/scripts/mk_util.py"
   COMMENT "Generating z3core.py"
   ${ADD_CUSTOM_COMMAND_USES_TERMINAL_ARG}
 )