From 8e890726209632017e3b4b964a1a693e88cea973 Mon Sep 17 00:00:00 2001 From: Svetlana Rokashevich Date: Mon, 31 Jul 2023 22:53:59 +0300 Subject: [PATCH] Replace standard cmake functions with wrappers Signed-off-by: Svetlana Rokashevich --- assembler/CMakeLists.txt | 8 ++++---- bytecode_optimizer/CMakeLists.txt | 2 +- runtime/CMakeLists.txt | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/assembler/CMakeLists.txt b/assembler/CMakeLists.txt index 81aa1b8c6..31a82024e 100644 --- a/assembler/CMakeLists.txt +++ b/assembler/CMakeLists.txt @@ -13,8 +13,8 @@ set(EXTENSION_DIR ${PANDA_ECMASCRIPT_PLUGIN_SOURCE}/assembler/extension) -target_sources(arkassembler_obj PRIVATE ${EXTENSION_DIR}/ecmascript_meta.cpp) -target_include_directories(arkassembler_obj PUBLIC ${EXTENSION_DIR}) +panda_target_sources(arkassembler_obj PRIVATE ${EXTENSION_DIR}/ecmascript_meta.cpp) +panda_target_include_directories(arkassembler_obj PUBLIC ${EXTENSION_DIR}) set(ECMASCRIPT_META_GEN_H ${PANDA_BINARY_ROOT}/assembler/ecmascript_meta_gen.h) panda_gen_file( @@ -27,7 +27,7 @@ add_custom_target(ecmascript_meta_gen_h DEPENDS ${ECMASCRIPT_META_GEN_H}) add_dependencies(arkassembler_obj ecmascript_meta_gen_h) if (PANDA_ENABLE_AFL) - target_sources(arkassembler_fuzz PRIVATE ${EXTENSION_DIR}/ecmascript_meta.cpp) - target_include_directories(arkassembler_fuzz PUBLIC ${EXTENSION_DIR}) + panda_target_sources(arkassembler_fuzz PRIVATE ${EXTENSION_DIR}/ecmascript_meta.cpp) + panda_target_include_directories(arkassembler_fuzz PUBLIC ${EXTENSION_DIR}) add_dependencies(arkassembler_fuzz ecmascript_meta_gen_h) endif() diff --git a/bytecode_optimizer/CMakeLists.txt b/bytecode_optimizer/CMakeLists.txt index 00b164cef..4e46e5307 100644 --- a/bytecode_optimizer/CMakeLists.txt +++ b/bytecode_optimizer/CMakeLists.txt @@ -26,6 +26,6 @@ panda_isa_gen( add_dependencies(arkbytecodeopt_obj isa_gen_${PROJECT_NAME}) -target_include_directories(arkbytecodeopt_obj PUBLIC +panda_target_include_directories(arkbytecodeopt_obj PUBLIC ${GENERATED_DIR} ) diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt index d83469648..af0313352 100644 --- a/runtime/CMakeLists.txt +++ b/runtime/CMakeLists.txt @@ -245,12 +245,12 @@ panda_gen( add_dependencies(arkruntime_static ecma_intrinsics_gen_arkruntime) add_dependencies(intrinsics_gen_arkruntime ecma_intrinsics_gen_arkruntime) -target_include_directories(arkruntime_interpreter_impl PUBLIC +panda_target_include_directories(arkruntime_interpreter_impl PUBLIC ${PANDA_BINARY_ROOT}/compiler/generated ) if (TARGET arkruntime_test_interpreter_impl) - target_include_directories(arkruntime_test_interpreter_impl PUBLIC + panda_target_include_directories(arkruntime_test_interpreter_impl PUBLIC ${PANDA_BINARY_ROOT}/compiler/generated ) endif() -- Gitee