From 48295ac70a3862ca7cdf8eb125f0680a7d35e7dc Mon Sep 17 00:00:00 2001
From: Ayrton Munoz <adm@immunant.com>
Date: Wed, 6 Mar 2024 14:40:19 -0500
Subject: [PATCH] WIP Merge CMake ExternalProject invocations

---
 cmake/define-ia2-wrapper.cmake | 4 ++--
 cmake/define-test.cmake        | 4 ++--
 tests/CMakeLists.txt           | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cmake/define-ia2-wrapper.cmake b/cmake/define-ia2-wrapper.cmake
index 44b0c11d5..0c51a90aa 100644
--- a/cmake/define-ia2-wrapper.cmake
+++ b/cmake/define-ia2-wrapper.cmake
@@ -64,7 +64,7 @@ function(define_ia2_wrapper)
     add_custom_command(
         OUTPUT ${CALL_GATE_SRC} ${CALL_GATE_HDR} ${LD_ARGS_FILES}
                ${ALL_SRCS}
-        COMMAND ${CMAKE_BINARY_DIR}/rewriter/ia2-rewriter
+        COMMAND ${CMAKE_BINARY_DIR}/tools/rewriter/ia2-rewriter
             --output-prefix=${CMAKE_CURRENT_BINARY_DIR}/${TEST_NAME}_call_gates
             --root-directory=${CMAKE_CURRENT_SOURCE_DIR}
             --output-directory=${CMAKE_CURRENT_BINARY_DIR}
@@ -76,7 +76,7 @@ function(define_ia2_wrapper)
             ${DEFINE_IA2_WRAPPER_EXTRA_REWRITER_ARGS}
             ${ORIGINAL_SRCS}
         WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-        DEPENDS ia2-rewriter ${ORIGINAL_SRCS}
+        DEPENDS tools ${ORIGINAL_SRCS}
         VERBATIM)
 
     add_custom_target(
diff --git a/cmake/define-test.cmake b/cmake/define-test.cmake
index 0980cd024..9a9da8a3c 100644
--- a/cmake/define-test.cmake
+++ b/cmake/define-test.cmake
@@ -300,8 +300,8 @@ function(define_test)
     add_custom_command(
         OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/libc.so.6
         COMMAND ${CMAKE_COMMAND} -E copy ${LIBC_PATH} ${CMAKE_CURRENT_BINARY_DIR}/libc.so.6
-        COMMAND ${CMAKE_BINARY_DIR}/pad-tls/pad-tls --allow-no-tls ${CMAKE_CURRENT_BINARY_DIR}/libc.so.6
-        DEPENDS pad-tls
+        COMMAND ${CMAKE_BINARY_DIR}/tools/pad-tls/pad-tls --allow-no-tls ${CMAKE_CURRENT_BINARY_DIR}/libc.so.6
+        DEPENDS tools
         COMMENT "Padding TLS segment of libc"
     )
 
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 8825dadf4..05a465f4d 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -31,7 +31,7 @@ configure_lit_site_cfg(
   ${CMAKE_CURRENT_SOURCE_DIR}/lit.cfg.py
   )
 
-set(IA2_TEST_DEPENDS ia2-rewriter)
+set(IA2_TEST_DEPENDS tools)
 
 add_lit_testsuite(check-ia2 "Running the IA2 tests"
   ${CMAKE_CURRENT_BINARY_DIR}