Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions cpp/librtcx/embed.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
# cmake-format: on
# =============================================================================

if(NOT TARGET zstd)
message(FATAL_ERROR "embed(): zstd target is required for LIBRTCX embedding.")
endif()
Comment thread
coderabbitai[bot] marked this conversation as resolved.

# This function initializes a target for JIT embedding. It must be called before any calls to
# embed_includes() or embed_blob() for the target. It creates a dedicated INTERFACE library target
# that is used to track registered files and dependencies via target properties. The TARGET argument
Expand Down Expand Up @@ -268,16 +272,11 @@ function(embed TARGET)

set(RUNNER "${TARGET}__jit_embed_run")
add_executable(${RUNNER} EXCLUDE_FROM_ALL "${EMBED_SCRIPT}")
target_link_libraries(${RUNNER} PRIVATE ${CMAKE_DL_LIBS})
if(NOT ARG_COMPRESSION STREQUAL "none")
if(NOT TARGET zstd)
message(FATAL_ERROR "embed(): zstd target is required when COMPRESSION is not none.")
endif()
target_include_directories(${RUNNER} PRIVATE ${ZSTD_INCLUDE_DIR})
target_link_libraries(${RUNNER} PRIVATE zstd)
endif()
target_link_libraries(${RUNNER} PRIVATE ${CMAKE_DL_LIBS} zstd)
target_include_directories(
${RUNNER} PRIVATE ${CMAKE_CURRENT_FUNCTION_LIST_DIR} ${ZSTD_INCLUDE_DIR}
)
set_target_properties(${RUNNER} PROPERTIES CXX_STANDARD 20 CXX_STANDARD_REQUIRED YES)
target_include_directories(${RUNNER} PRIVATE ${CMAKE_CURRENT_FUNCTION_LIST_DIR})

add_custom_command(
OUTPUT ${OUTPUT_DIR}/${TARGET}.hpp ${OUTPUT_DIR}/${TARGET}.s ${OUTPUT_DIR}/${TARGET}.bin
Expand Down
3 changes: 2 additions & 1 deletion cpp/librtcx/rtcx.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -619,7 +619,8 @@ void log_nvJitLink_result(link_params const& params,
}

for (auto& frag : params.memory_fragments) {
fragments_str = std::format("{}\t{}\n", fragments_str, frag.name);
fragments_str =
std::format("{}\t{}\n", fragments_str, frag.name == nullptr ? "<unnamed>" : frag.name);
}

std::string link_options_str;
Expand Down
Loading