Skip to content

Commit c248bf3

Browse files
committed
add ARCHIVE_IAR variable
1 parent 798e5df commit c248bf3

File tree

1 file changed

+47
-44
lines changed

1 file changed

+47
-44
lines changed

ArchiveUtility.cmake

Lines changed: 47 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -129,50 +129,53 @@ function (add_static_library_bundle target)
129129
string (APPEND mri_script "echo save\n")
130130
string (APPEND mri_script "echo end\n")
131131

132-
set (iar_script)
133-
string (APPEND iar_script "--create")
134-
foreach (bundle_library IN LISTS bundle_libraries)
135-
string (APPEND iar_script " \$<TARGET_FILE:${bundle_library}>")
136-
endforeach()
137-
string (APPEND iar_script " -o ${output_directory}/${output_library}\n")
138-
139-
set (iar_script_file ${mri_script_dir}/script.iar.sh)
140-
set (iar_cp_file ${mri_script_dir}/script.iar_cp.sh)
141-
142-
file (GENERATE
143-
OUTPUT ${iar_script_file}
144-
CONTENT "${iar_script}"
145-
CONDITION 1
146-
)
147-
148-
149-
add_custom_command (
150-
OUTPUT ${output_directory}/${output_library}
151-
COMMAND ${CMAKE_AR} -f ${iar_script_file}
152-
COMMAND_EXPAND_LISTS
153-
WORKING_DIRECTORY
154-
${output_directory}
155-
DEPENDS
156-
${bundle_libraries}
157-
)
158-
159-
# set (mri_script_file ${mri_script_dir}/script.mri.sh)
160-
161-
# file (GENERATE
162-
# OUTPUT ${mri_script_file}
163-
# CONTENT "${mri_script}"
164-
# CONDITION 1
165-
# )
166-
167-
# add_custom_command (
168-
# OUTPUT ${output_directory}/${output_library}
169-
# COMMAND bash ${mri_script_file} | ${CMAKE_AR} -M
170-
# COMMAND_EXPAND_LISTS
171-
# WORKING_DIRECTORY
172-
# ${output_directory}
173-
# DEPENDS
174-
# ${bundle_libraries}
175-
# )
132+
if (NOT ARCHIVE_IAR)
133+
set (mri_script_file ${mri_script_dir}/script.mri.sh)
134+
135+
file (GENERATE
136+
OUTPUT ${mri_script_file}
137+
CONTENT "${mri_script}"
138+
CONDITION 1
139+
)
140+
141+
add_custom_command (
142+
OUTPUT ${output_directory}/${output_library}
143+
COMMAND bash ${mri_script_file} | ${CMAKE_AR} -M
144+
COMMAND_EXPAND_LISTS
145+
WORKING_DIRECTORY
146+
${output_directory}
147+
DEPENDS
148+
${bundle_libraries}
149+
)
150+
endif()
151+
152+
if (ARCHIVE_IAR)
153+
set (iar_script)
154+
string (APPEND iar_script "--create")
155+
foreach (bundle_library IN LISTS bundle_libraries)
156+
string (APPEND iar_script " \$<TARGET_FILE:${bundle_library}>")
157+
endforeach()
158+
string (APPEND iar_script " -o ${output_directory}/${output_library}\n")
159+
160+
set (iar_script_file ${mri_script_dir}/script.iar.sh)
161+
set (iar_cp_file ${mri_script_dir}/script.iar_cp.sh)
162+
163+
file (GENERATE
164+
OUTPUT ${iar_script_file}
165+
CONTENT "${iar_script}"
166+
CONDITION 1
167+
)
168+
169+
add_custom_command (
170+
OUTPUT ${output_directory}/${output_library}
171+
COMMAND ${CMAKE_AR} -f ${iar_script_file}
172+
COMMAND_EXPAND_LISTS
173+
WORKING_DIRECTORY
174+
${output_directory}
175+
DEPENDS
176+
${bundle_libraries}
177+
)
178+
endif()
176179

177180
add_custom_target (${target} ALL
178181
DEPENDS ${output_directory}/${output_library}

0 commit comments

Comments
 (0)