From 1989dc5e5ac7f4b25f3dfe9959d04e12ee203480 Mon Sep 17 00:00:00 2001 From: Vern Paxson Date: Wed, 1 May 2024 17:13:18 -0700 Subject: [PATCH] enable ZAM operation specifications to reside in multiple files (not yet used) --- auxil/gen-zam | 2 +- cmake | 2 +- src/CMakeLists.txt | 5 +++-- src/script_opt/ZAM/{Ops.in => OPs/ZAM.op} | 0 4 files changed, 5 insertions(+), 4 deletions(-) rename src/script_opt/ZAM/{Ops.in => OPs/ZAM.op} (100%) diff --git a/auxil/gen-zam b/auxil/gen-zam index 5887f1f04f..376de10133 160000 --- a/auxil/gen-zam +++ b/auxil/gen-zam @@ -1 +1 @@ -Subproject commit 5887f1f04f525c4c682eb55aa0c7505574459c74 +Subproject commit 376de10133c100948a2875258d11ab97b361467c diff --git a/cmake b/cmake index 1d793368ac..925c32db4d 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 1d793368ac4d4b06cb2c9c716e5477dbf3c2a8e3 +Subproject commit 925c32db4d6d952ec43fa18a85d8bb70138b9257 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 10dcb2a3d5..bb075c4d35 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -159,9 +159,10 @@ list(APPEND BINPAC_OUTPUTS "${BINPAC_OUTPUT_CC}") include(Gen-ZAM) -set(GEN_ZAM_SRC ${CMAKE_CURRENT_SOURCE_DIR}/script_opt/ZAM/Ops.in) +set(GEN_ZAM_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/script_opt/ZAM/OPs) +set(GEN_ZAM_SRC ${GEN_ZAM_SRC_DIR}/ZAM.op) -gen_zam_target(${GEN_ZAM_SRC}) +gen_zam_target(${GEN_ZAM_SRC_DIR}) # ############################################################################## # Including subdirectories. diff --git a/src/script_opt/ZAM/Ops.in b/src/script_opt/ZAM/OPs/ZAM.op similarity index 100% rename from src/script_opt/ZAM/Ops.in rename to src/script_opt/ZAM/OPs/ZAM.op