Skip to content

Commit 54be585

Browse files
committed
DX: Improve exavmlib deps
Signed-off-by: Peter M <petermm@gmail.com>
1 parent 8f0f7c6 commit 54be585

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

CMakeModules/BuildElixir.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ macro(pack_archive avm_name)
4848

4949
add_custom_command(
5050
OUTPUT ${avm_name}.avm
51-
DEPENDS ${avm_name}_beams PackBEAM
51+
DEPENDS ${avm_name}_beams PackBEAM ${BEAMS}
5252
COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/PackBEAM -a ${INCLUDE_LINES} ${avm_name}.avm ${BEAMS}
5353
COMMENT "Packing archive ${avm_name}.avm"
5454
VERBATIM
@@ -93,7 +93,7 @@ macro(pack_runnable avm_name main)
9393

9494
add_custom_command(
9595
OUTPUT ${avm_name}.avm
96-
DEPENDS ${avm_name}_main ${ARCHIVE_TARGETS} PackBEAM
96+
DEPENDS ${avm_name}_main ${ARCHIVE_TARGETS} PackBEAM Elixir.${main}.beam
9797
COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/PackBEAM ${INCLUDE_LINES} ${avm_name}.avm Elixir.${main}.beam ${ARCHIVES}
9898
COMMENT "Packing runnable ${avm_name}.avm"
9999
VERBATIM
@@ -170,7 +170,7 @@ macro(pack_test avm_name main)
170170

171171
add_custom_command(
172172
OUTPUT ${avm_name}.avm
173-
DEPENDS ${avm_name}_main ${avm_name}_tests ${ARCHIVE_TARGETS} PackBEAM
173+
DEPENDS ${avm_name}_main ${avm_name}_tests ${ARCHIVE_TARGETS} PackBEAM Elixir.${main}.beam ${TEST_BEAMS} ${ARCHIVES}
174174
COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/PackBEAM ${INCLUDE_LINES} ${avm_name}.avm Elixir.${main}.beam ${TEST_BEAMS} ${ARCHIVES}
175175
COMMENT "Packing test ${avm_name}.avm"
176176
VERBATIM

tests/libs/exavmlib/CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,10 @@ set(TEST_MODULES
2727
)
2828

2929
pack_test(Tests Tests ${TEST_MODULES})
30+
31+
# alisp is not in pack_test's standard library list but is needed by exavmlib tests
32+
add_custom_command(
33+
OUTPUT Tests.avm
34+
DEPENDS ${CMAKE_BINARY_DIR}/libs/alisp/src/alisp.avm alisp
35+
APPEND
36+
)

0 commit comments

Comments
 (0)