From c40deeabb086493373973f07a3a1b2c1bffbc6b8 Mon Sep 17 00:00:00 2001 From: mancini <mancini@astron.nl> Date: Wed, 22 May 2024 13:17:55 +0200 Subject: [PATCH] Keep default filename --- ci/das6/compile_and_run.sh | 2 +- cmake/precompile.cmake | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/das6/compile_and_run.sh b/ci/das6/compile_and_run.sh index 053eb22..bb9bea5 100755 --- a/ci/das6/compile_and_run.sh +++ b/ci/das6/compile_and_run.sh @@ -22,6 +22,6 @@ cmake -B ${BUILD_DIR} . -DCMAKE_BUILD_TYPE=Release make -C ${BUILD_DIR} -j -tar -cvf asm-${ARCHITECTURE}-${COMPILER_VERSION}.tar ${BUILD_DIR}/*.as +tar -cvf asm-${ARCHITECTURE}-${COMPILER_VERSION}.tar ${BUILD_DIR}/*.s ${BUILD_DIR}/microbenchmarks --benchmark_out=results-${COMPILER_VERSION}-${ARCHITECTURE}.json --benchmark_out_format=json \ No newline at end of file diff --git a/cmake/precompile.cmake b/cmake/precompile.cmake index 281c437..37eaa0a 100644 --- a/cmake/precompile.cmake +++ b/cmake/precompile.cmake @@ -7,12 +7,12 @@ macro (add_precompile_target) list(TRANSFORM apt_INCLUDE_DIRS PREPEND -I) - add_custom_command(OUTPUT ${apt_TARGET_NAME}.as - COMMAND ${CMAKE_CXX_COMPILER} -std=c++${CMAKE_CXX_STANDARD} ${CMAKE_CXX_COMPLERS_ARG} ${apt_COMPILER_FLAGS} ${apt_SOURCES} ${apt_INCLUDE_DIRS} -S -o ${apt_TARGET_NAME}.as + add_custom_command(OUTPUT ${apt_TARGET_NAME}.s + COMMAND ${CMAKE_CXX_COMPILER} -std=c++${CMAKE_CXX_STANDARD} ${CMAKE_CXX_COMPLERS_ARG} ${apt_COMPILER_FLAGS} ${apt_SOURCES} ${apt_INCLUDE_DIRS} -S -o ${apt_TARGET_NAME}.s DEPENDS ${apt_SOURCES} ) add_custom_target(precompile_${apt_TARGET_NAME} ALL - DEPENDS ${apt_TARGET_NAME}.as + DEPENDS ${apt_TARGET_NAME}.s COMMENT "Adding precompile target ${KERNEL_NAME} with source ${KERNEL_SOURCE}") set_property( TARGET precompile_${apt_TARGET_NAME} -- GitLab