Skip to content

Commit 50cf8c1

Browse files
committed
Fix Erlang and Elixir archive CMakeModules
There were typos in both CMakeModules BuildErlang.cmake and BuildElixir.cmake that possibly lead to incorrect output names, especially when stacktrace lines are included. Signed-off-by: Winford <winford@object.stream>
1 parent b257211 commit 50cf8c1

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

CMakeModules/BuildElixir.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ macro(pack_archive avm_name)
4646
add_custom_target(
4747
${avm_name} ALL
4848
DEPENDS ${avm_name}_beams PackBEAM
49-
COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/PackBEAM -a ${INCLUDE_LINES} ${avm_name}.avm ${BEAMS}
49+
COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/PackBEAM ${INCLUDE_LINES} -a ${avm_name}.avm ${BEAMS}
5050
COMMENT "Packing archive ${avm_name}.avm"
5151
VERBATIM
5252
)
@@ -87,7 +87,7 @@ macro(pack_runnable avm_name main)
8787

8888
add_custom_target(
8989
${avm_name} ALL
90-
COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/PackBEAM ${INCLUDE_LINES} ${avm_name}.avm Elixir.${main}.beam ${ARCHIVES}
90+
COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/PackBEAM ${INCLUDE_LINES} -a ${avm_name}.avm Elixir.${main}.beam ${ARCHIVES}
9191
COMMENT "Packing runnable ${avm_name}.avm"
9292
VERBATIM
9393
)

CMakeModules/BuildErlang.cmake

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ macro(pack_archive avm_name)
4646
${avm_name} ALL
4747
DEPENDS ${avm_name}_beams PackBEAM
4848
#DEPENDS ${pack_archive_${avm_name}_beams}
49-
COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/PackBEAM -a ${INCLUDE_LINES} ${avm_name}.avm ${pack_archive_${avm_name}_beams}
49+
COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/PackBEAM ${INCLUDE_LINES} -a ${avm_name}.avm ${pack_archive_${avm_name}_beams}
5050
COMMENT "Packing archive ${avm_name}.avm"
5151
VERBATIM
5252
)
@@ -74,7 +74,7 @@ macro(pack_lib avm_name)
7474

7575
add_custom_target(
7676
${avm_name} ALL
77-
COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/PackBEAM -a ${INCLUDE_LINES} ${avm_name}.avm ${pack_lib_${avm_name}_archives}
77+
COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/PackBEAM ${INCLUDE_LINES} -a ${avm_name}.avm ${pack_lib_${avm_name}_archives}
7878
COMMENT "Packing runnable ${avm_name}.avm"
7979
VERBATIM
8080
)
@@ -139,7 +139,7 @@ macro(pack_runnable avm_name main)
139139

140140
add_custom_target(
141141
${avm_name} ALL
142-
COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/PackBEAM ${INCLUDE_LINES} ${avm_name}.avm ${main}.beam ${pack_runnable_${avm_name}_archives}
142+
COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/PackBEAM ${INCLUDE_LINES} -a ${avm_name}.avm ${main}.beam ${pack_runnable_${avm_name}_archives}
143143
COMMENT "Packing runnable ${avm_name}.avm"
144144
VERBATIM
145145
)
@@ -165,7 +165,7 @@ macro(pack_test test_avm_name)
165165
add_custom_target(
166166
${test_avm_name} ALL
167167
COMMAND erlc +debug_info -I ${CMAKE_SOURCE_DIR}/libs/include ${CMAKE_CURRENT_SOURCE_DIR}/tests.erl
168-
COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/PackBEAM ${INCLUDE_LINES} ${CMAKE_CURRENT_BINARY_DIR}/${test_avm_name}.avm ${CMAKE_CURRENT_BINARY_DIR}/tests.beam ${pack_test_${test_avm_name}_archives}
168+
COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/PackBEAM ${INCLUDE_LINES} -a ${CMAKE_CURRENT_BINARY_DIR}/${test_avm_name}.avm ${CMAKE_CURRENT_BINARY_DIR}/tests.beam ${pack_test_${test_avm_name}_archives}
169169
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/tests.erl
170170
COMMENT "Packing runnable ${test_avm_name}.avm"
171171
VERBATIM
@@ -200,7 +200,7 @@ macro(pack_uf2 avm_name main)
200200

201201
add_custom_target(
202202
${avm_name}.avm ALL
203-
COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/PackBEAM ${avm_name}.avm ${main}.beam ${pack_uf2_${avm_name}_archives}
203+
COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/PackBEAM -a ${avm_name}.avm ${main}.beam ${pack_uf2_${avm_name}_archives}
204204
COMMENT "Packing runnable ${avm_name}.avm"
205205
VERBATIM
206206
)

0 commit comments

Comments
 (0)