WIP Merge CMake ExternalProject invocations

immunant · Mar 6, 2024 · 48295ac · 48295ac
1 parent 713d4cd
commit 48295ac
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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}