From d1cf13d3c96bc12d4fa8a34484ff3c3550579f92 Mon Sep 17 00:00:00 2001 From: Vladislav Ivanishin Date: Mon, 26 Dec 2022 19:22:20 +0400 Subject: [PATCH] Adapt to renaming of ark-third-party to third_party Signed-off-by: Vladislav Ivanishin --- BUILD.gn | 2 +- CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 079e034bf..8da11ac47 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -110,7 +110,7 @@ action("substitute_icu_path") { args = [ rebase_path("runtime/templates/init_icu_gen.cpp.erb"), rebase_path("$target_gen_dir/init_icu_gen.cpp"), - rebase_path("$ark_root/ark-third-party"), + rebase_path(ark_third_party_root), ] } diff --git a/CMakeLists.txt b/CMakeLists.txt index 9db7310db..767c38e2e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,7 +24,7 @@ target_compile_definitions(arkbytecodeopt PUBLIC -DENABLE_BYTECODE_OPT -DARK_INT set(ICU_ROOT ${PANDA_THIRD_PARTY_SOURCES_DIR}/icu) set(ORIG_CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-implicit-const-int-float-conversion -Wno-unknown-warning-option") -add_subdirectory(${PANDA_THIRD_PARTY_CONFIG_DIR}/icu "${CMAKE_CURRENT_BINARY_DIR}/ark-third-party/icu") +add_subdirectory(${PANDA_THIRD_PARTY_CONFIG_DIR}/icu "${CMAKE_CURRENT_BINARY_DIR}/third_party/icu") set(CMAKE_CXX_FLAGS "${ORIG_CMAKE_CXX_FLAGS}") if(PANDA_WITH_TOOLCHAIN) -- Gitee