From 32d71604a4a3650b18f1d8c12340e5717be2c949 Mon Sep 17 00:00:00 2001 From: TianlongLiang Date: Tue, 17 Mar 2026 16:59:28 +0800 Subject: [PATCH] fix a wamrc compile warning, and enable system include flag for third-party libraries to suppresses corresponding compile warnings --- build-scripts/config_common.cmake | 2 +- core/iwasm/aot/iwasm_aot.cmake | 10 +++++----- core/iwasm/compilation/aot_orc_extra2.cpp | 2 +- core/iwasm/fast-jit/iwasm_fast_jit.cmake | 12 ++++++------ core/iwasm/libraries/lib-rats/lib_rats.cmake | 4 ++-- core/iwasm/libraries/libc-uvwasi/libc_uvwasi.cmake | 8 ++++---- core/iwasm/libraries/simde/simde.cmake | 2 +- tests/fuzz/wasm-mutator-fuzz/CMakeLists.txt | 2 +- tests/unit/aot-stack-frame/CMakeLists.txt | 2 +- tests/unit/aot/CMakeLists.txt | 2 +- tests/unit/compilation/CMakeLists.txt | 2 +- tests/unit/custom-section/CMakeLists.txt | 2 +- tests/unit/linux-perf/CMakeLists.txt | 2 +- tests/unit/memory64/CMakeLists.txt | 2 +- tests/unit/running-modes/CMakeLists.txt | 2 +- tests/unit/runtime-common/CMakeLists.txt | 2 +- tests/unit/wasm-vm/CMakeLists.txt | 2 +- wamr-compiler/CMakeLists.txt | 6 +++--- 18 files changed, 33 insertions(+), 33 deletions(-) diff --git a/build-scripts/config_common.cmake b/build-scripts/config_common.cmake index 234578d306..aeac3d1ece 100644 --- a/build-scripts/config_common.cmake +++ b/build-scripts/config_common.cmake @@ -123,7 +123,7 @@ if (WAMR_BUILD_JIT EQUAL 1) set (LLVM_DIR ${LLVM_BUILD_ROOT}/lib/cmake/llvm) endif () find_package(LLVM REQUIRED CONFIG) - include_directories(${LLVM_INCLUDE_DIRS}) + include_directories(SYSTEM ${LLVM_INCLUDE_DIRS}) add_definitions(${LLVM_DEFINITIONS}) message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}") message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}") diff --git a/core/iwasm/aot/iwasm_aot.cmake b/core/iwasm/aot/iwasm_aot.cmake index e6d56c43f6..1084681aca 100644 --- a/core/iwasm/aot/iwasm_aot.cmake +++ b/core/iwasm/aot/iwasm_aot.cmake @@ -71,8 +71,8 @@ if ((WAMR_BUILD_TARGET STREQUAL "X86_64" OR WAMR_BUILD_TARGET STREQUAL "AMD_64") if (NOT zycore_POPULATED) message ("-- Fetching zycore ..") FetchContent_Populate(zycore) - include_directories("${zycore_SOURCE_DIR}/include") - include_directories("${zycore_BINARY_DIR}") + include_directories(SYSTEM "${zycore_SOURCE_DIR}/include") + include_directories(SYSTEM "${zycore_BINARY_DIR}") add_definitions(-DZYCORE_STATIC_BUILD=1) add_subdirectory(${zycore_SOURCE_DIR} ${zycore_BINARY_DIR} EXCLUDE_FROM_ALL) file (GLOB_RECURSE c_source_zycore ${zycore_SOURCE_DIR}/src/*.c) @@ -92,9 +92,9 @@ if ((WAMR_BUILD_TARGET STREQUAL "X86_64" OR WAMR_BUILD_TARGET STREQUAL "AMD_64") option(ZYDIS_BUILD_EXAMPLES "" OFF) option(ZYDIS_BUILD_MAN "" OFF) option(ZYDIS_BUILD_DOXYGEN "" OFF) - include_directories("${zydis_BINARY_DIR}") - include_directories("${zydis_SOURCE_DIR}/include") - include_directories("${zydis_SOURCE_DIR}/src") + include_directories(SYSTEM "${zydis_BINARY_DIR}") + include_directories(SYSTEM "${zydis_SOURCE_DIR}/include") + include_directories(SYSTEM "${zydis_SOURCE_DIR}/src") add_definitions(-DZYDIS_STATIC_BUILD=1) add_subdirectory(${zydis_SOURCE_DIR} ${zydis_BINARY_DIR} EXCLUDE_FROM_ALL) file (GLOB_RECURSE c_source_zydis ${zydis_SOURCE_DIR}/src/*.c) diff --git a/core/iwasm/compilation/aot_orc_extra2.cpp b/core/iwasm/compilation/aot_orc_extra2.cpp index 6bcfb786b3..2979737e76 100644 --- a/core/iwasm/compilation/aot_orc_extra2.cpp +++ b/core/iwasm/compilation/aot_orc_extra2.cpp @@ -124,7 +124,7 @@ MyCompiler::operator()(llvm::Module &M) M.getModuleIdentifier() + "-jitted-objectbuffer"); #endif - return std::move(ObjBuffer); + return ObjBuffer; } DEFINE_SIMPLE_CONVERSION_FUNCTIONS(llvm::orc::LLLazyJITBuilder, diff --git a/core/iwasm/fast-jit/iwasm_fast_jit.cmake b/core/iwasm/fast-jit/iwasm_fast_jit.cmake index 676258075f..619866598d 100644 --- a/core/iwasm/fast-jit/iwasm_fast_jit.cmake +++ b/core/iwasm/fast-jit/iwasm_fast_jit.cmake @@ -49,7 +49,7 @@ if (WAMR_BUILD_TARGET STREQUAL "X86_64" OR WAMR_BUILD_TARGET STREQUAL "AMD_64") add_definitions(-DASMJIT_NO_INTRINSICS) add_definitions(-DASMJIT_NO_AARCH64) add_definitions(-DASMJIT_NO_AARCH32) - include_directories("${asmjit_SOURCE_DIR}/src") + include_directories(SYSTEM "${asmjit_SOURCE_DIR}/src") add_subdirectory(${asmjit_SOURCE_DIR} ${asmjit_BINARY_DIR} EXCLUDE_FROM_ALL) file (GLOB_RECURSE cpp_source_asmjit ${asmjit_SOURCE_DIR}/src/asmjit/core/*.cpp @@ -67,8 +67,8 @@ if (WAMR_BUILD_TARGET STREQUAL "X86_64" OR WAMR_BUILD_TARGET STREQUAL "AMD_64") FetchContent_Populate(zycore) option(ZYDIS_BUILD_TOOLS "" OFF) option(ZYDIS_BUILD_EXAMPLES "" OFF) - include_directories("${zycore_SOURCE_DIR}/include") - include_directories("${zycore_BINARY_DIR}") + include_directories(SYSTEM "${zycore_SOURCE_DIR}/include") + include_directories(SYSTEM "${zycore_BINARY_DIR}") add_subdirectory(${zycore_SOURCE_DIR} ${zycore_BINARY_DIR} EXCLUDE_FROM_ALL) file (GLOB_RECURSE c_source_zycore ${zycore_SOURCE_DIR}/src/*.c) endif () @@ -83,9 +83,9 @@ if (WAMR_BUILD_TARGET STREQUAL "X86_64" OR WAMR_BUILD_TARGET STREQUAL "AMD_64") FetchContent_Populate(zydis) option(ZYDIS_BUILD_TOOLS "" OFF) option(ZYDIS_BUILD_EXAMPLES "" OFF) - include_directories("${zydis_BINARY_DIR}") - include_directories("${zydis_SOURCE_DIR}/include") - include_directories("${zydis_SOURCE_DIR}/src") + include_directories(SYSTEM "${zydis_BINARY_DIR}") + include_directories(SYSTEM "${zydis_SOURCE_DIR}/include") + include_directories(SYSTEM "${zydis_SOURCE_DIR}/src") add_subdirectory(${zydis_SOURCE_DIR} ${zydis_BINARY_DIR} EXCLUDE_FROM_ALL) file (GLOB_RECURSE c_source_zydis ${zydis_SOURCE_DIR}/src/*.c) endif () diff --git a/core/iwasm/libraries/lib-rats/lib_rats.cmake b/core/iwasm/libraries/lib-rats/lib_rats.cmake index 36bad1c519..d9c63b6df6 100644 --- a/core/iwasm/libraries/lib-rats/lib_rats.cmake +++ b/core/iwasm/libraries/lib-rats/lib_rats.cmake @@ -23,7 +23,7 @@ endif() add_definitions (-DWASM_ENABLE_LIB_RATS=1) -include_directories(${LIB_RATS_DIR} ${SGX_SSL_DIR}/include) +include_directories(SYSTEM ${LIB_RATS_DIR} ${SGX_SSL_DIR}/include) include(FetchContent) @@ -41,7 +41,7 @@ FetchContent_GetProperties(librats) if (NOT librats_POPULATED) message("-- Fetching librats ..") FetchContent_Populate(librats) - include_directories("${librats_SOURCE_DIR}/include") + include_directories(SYSTEM "${librats_SOURCE_DIR}/include") # Prevent the propagation of the CMAKE_C_FLAGS of WAMR into librats set(SAVED_CMAKE_C_FLAGS ${CMAKE_C_FLAGS}) diff --git a/core/iwasm/libraries/libc-uvwasi/libc_uvwasi.cmake b/core/iwasm/libraries/libc-uvwasi/libc_uvwasi.cmake index f197b21d64..bbcb84d392 100644 --- a/core/iwasm/libraries/libc-uvwasi/libc_uvwasi.cmake +++ b/core/iwasm/libraries/libc-uvwasi/libc_uvwasi.cmake @@ -22,7 +22,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") ## libuv find_package(LIBUV QUIET) if (LIBUV_FOUND) - include_directories(${LIBUV_INCLUDE_DIR}) + include_directories(SYSTEM ${LIBUV_INCLUDE_DIR}) else() FetchContent_Declare( libuv @@ -30,7 +30,7 @@ else() GIT_TAG ${LIBUV_VERSION} ) FetchContent_MakeAvailable(libuv) - include_directories("${libuv_SOURCE_DIR}/include") + include_directories(SYSTEM "${libuv_SOURCE_DIR}/include") set (LIBUV_LIBRARIES uv_a) set_target_properties(uv_a PROPERTIES POSITION_INDEPENDENT_CODE 1) endif() @@ -38,7 +38,7 @@ endif() ## uvwasi find_package(UVWASI QUIET) if (UVWASI_FOUND) - include_directories(${UVWASI_INCLUDE_DIR}) + include_directories(SYSTEM ${UVWASI_INCLUDE_DIR}) else() FetchContent_Declare( uvwasi @@ -46,7 +46,7 @@ else() GIT_TAG 392e1f1c1c8a2d2102c9f2e0b9f35959a149d133 ) FetchContent_MakeAvailable(uvwasi) - include_directories("${uvwasi_SOURCE_DIR}/include") + include_directories(SYSTEM "${uvwasi_SOURCE_DIR}/include") set (UVWASI_LIBRARIES uvwasi_a) set_target_properties(uvwasi_a PROPERTIES POSITION_INDEPENDENT_CODE 1) endif() diff --git a/core/iwasm/libraries/simde/simde.cmake b/core/iwasm/libraries/simde/simde.cmake index 60fd6d975d..e9844dd872 100644 --- a/core/iwasm/libraries/simde/simde.cmake +++ b/core/iwasm/libraries/simde/simde.cmake @@ -25,4 +25,4 @@ FetchContent_Declare( message("-- Fetching simde ..") FetchContent_MakeAvailable(simde) -include_directories("${simde_SOURCE_DIR}") +include_directories(SYSTEM "${simde_SOURCE_DIR}") diff --git a/tests/fuzz/wasm-mutator-fuzz/CMakeLists.txt b/tests/fuzz/wasm-mutator-fuzz/CMakeLists.txt index de0f6aebb8..28ffd0feab 100644 --- a/tests/fuzz/wasm-mutator-fuzz/CMakeLists.txt +++ b/tests/fuzz/wasm-mutator-fuzz/CMakeLists.txt @@ -78,7 +78,7 @@ find_package(LLVM REQUIRED CONFIG) message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}") message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}") -include_directories(${LLVM_INCLUDE_DIRS}) +include_directories(SYSTEM ${LLVM_INCLUDE_DIRS}) separate_arguments(LLVM_DEFINITIONS_LIST NATIVE_COMMAND ${LLVM_DEFINITIONS}) add_definitions(${LLVM_DEFINITIONS_LIST}) diff --git a/tests/unit/aot-stack-frame/CMakeLists.txt b/tests/unit/aot-stack-frame/CMakeLists.txt index b20bb67b9a..44b4b4811b 100644 --- a/tests/unit/aot-stack-frame/CMakeLists.txt +++ b/tests/unit/aot-stack-frame/CMakeLists.txt @@ -22,7 +22,7 @@ set (WAMR_BUILD_GC 1) include (../unit_common.cmake) find_package(LLVM REQUIRED CONFIG) -include_directories(${LLVM_INCLUDE_DIRS}) +include_directories(SYSTEM ${LLVM_INCLUDE_DIRS}) add_definitions(${LLVM_DEFINITIONS}) include_directories (${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/tests/unit/aot/CMakeLists.txt b/tests/unit/aot/CMakeLists.txt index e45d4c0032..66fe801b2c 100644 --- a/tests/unit/aot/CMakeLists.txt +++ b/tests/unit/aot/CMakeLists.txt @@ -23,7 +23,7 @@ set (WAMR_BUILD_APP_FRAMEWORK 0) include (../unit_common.cmake) find_package(LLVM REQUIRED CONFIG) -include_directories(${LLVM_INCLUDE_DIRS}) +include_directories(SYSTEM ${LLVM_INCLUDE_DIRS}) add_definitions(${LLVM_DEFINITIONS}) include (${IWASM_DIR}/compilation/iwasm_compl.cmake) diff --git a/tests/unit/compilation/CMakeLists.txt b/tests/unit/compilation/CMakeLists.txt index f6912122d9..00530fbe80 100644 --- a/tests/unit/compilation/CMakeLists.txt +++ b/tests/unit/compilation/CMakeLists.txt @@ -26,7 +26,7 @@ set (WAMR_BUILD_JIT 0) include (../unit_common.cmake) find_package(LLVM REQUIRED CONFIG) -include_directories(${LLVM_INCLUDE_DIRS}) +include_directories(SYSTEM ${LLVM_INCLUDE_DIRS}) add_definitions(${LLVM_DEFINITIONS}) include (${IWASM_DIR}/compilation/iwasm_compl.cmake) diff --git a/tests/unit/custom-section/CMakeLists.txt b/tests/unit/custom-section/CMakeLists.txt index b57fb8bffb..bcceed0a60 100644 --- a/tests/unit/custom-section/CMakeLists.txt +++ b/tests/unit/custom-section/CMakeLists.txt @@ -38,7 +38,7 @@ set (WAMR_BUILD_LOAD_CUSTOM_SECTION 1) include (../unit_common.cmake) find_package(LLVM REQUIRED CONFIG) -include_directories(${LLVM_INCLUDE_DIRS}) +include_directories(SYSTEM ${LLVM_INCLUDE_DIRS}) add_definitions(${LLVM_DEFINITIONS}) include (${IWASM_DIR}/compilation/iwasm_compl.cmake) diff --git a/tests/unit/linux-perf/CMakeLists.txt b/tests/unit/linux-perf/CMakeLists.txt index baf9863c27..6e487836ee 100644 --- a/tests/unit/linux-perf/CMakeLists.txt +++ b/tests/unit/linux-perf/CMakeLists.txt @@ -24,7 +24,7 @@ set (WAMR_BUILD_DUMP_CALL_STACK 1) include (../unit_common.cmake) find_package(LLVM REQUIRED CONFIG) -include_directories(${LLVM_INCLUDE_DIRS}) +include_directories(SYSTEM ${LLVM_INCLUDE_DIRS}) add_definitions(${LLVM_DEFINITIONS}) include (${IWASM_DIR}/compilation/iwasm_compl.cmake) diff --git a/tests/unit/memory64/CMakeLists.txt b/tests/unit/memory64/CMakeLists.txt index b19c9d9cfa..200e263eb9 100644 --- a/tests/unit/memory64/CMakeLists.txt +++ b/tests/unit/memory64/CMakeLists.txt @@ -23,7 +23,7 @@ set(WAMR_BUILD_SHARED_MEMORY 1) include(../unit_common.cmake) find_package(LLVM REQUIRED CONFIG) -include_directories(${LLVM_INCLUDE_DIRS}) +include_directories(SYSTEM ${LLVM_INCLUDE_DIRS}) add_definitions(${LLVM_DEFINITIONS}) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/tests/unit/running-modes/CMakeLists.txt b/tests/unit/running-modes/CMakeLists.txt index d7ebaed095..4509b1add3 100644 --- a/tests/unit/running-modes/CMakeLists.txt +++ b/tests/unit/running-modes/CMakeLists.txt @@ -38,7 +38,7 @@ set(WAMR_BUILD_REF_TYPES 1) include(../unit_common.cmake) find_package(LLVM REQUIRED CONFIG) -include_directories(${LLVM_INCLUDE_DIRS}) +include_directories(SYSTEM ${LLVM_INCLUDE_DIRS}) add_definitions(${LLVM_DEFINITIONS}) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/tests/unit/runtime-common/CMakeLists.txt b/tests/unit/runtime-common/CMakeLists.txt index 9ef07ff50c..a46079b18f 100644 --- a/tests/unit/runtime-common/CMakeLists.txt +++ b/tests/unit/runtime-common/CMakeLists.txt @@ -19,7 +19,7 @@ set (WAMR_BUILD_MULTI_MODULE 1) include(../unit_common.cmake) find_package(LLVM REQUIRED CONFIG) -include_directories(${LLVM_INCLUDE_DIRS}) +include_directories(SYSTEM ${LLVM_INCLUDE_DIRS}) add_definitions(${LLVM_DEFINITIONS}) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/tests/unit/wasm-vm/CMakeLists.txt b/tests/unit/wasm-vm/CMakeLists.txt index aeaac0b3f7..3cc45f5c2e 100644 --- a/tests/unit/wasm-vm/CMakeLists.txt +++ b/tests/unit/wasm-vm/CMakeLists.txt @@ -20,7 +20,7 @@ add_definitions (-Dattr_container_free=free) include (../unit_common.cmake) find_package(LLVM REQUIRED CONFIG) -include_directories(${LLVM_INCLUDE_DIRS}) +include_directories(SYSTEM ${LLVM_INCLUDE_DIRS}) add_definitions(${LLVM_DEFINITIONS}) include_directories (${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/wamr-compiler/CMakeLists.txt b/wamr-compiler/CMakeLists.txt index 7690417356..7d7b824375 100644 --- a/wamr-compiler/CMakeLists.txt +++ b/wamr-compiler/CMakeLists.txt @@ -176,7 +176,7 @@ if (NOT WAMR_BUILD_WITH_CUSTOM_LLVM) endif () find_package(LLVM REQUIRED CONFIG) -include_directories(${LLVM_INCLUDE_DIRS}) +include_directories(SYSTEM ${LLVM_INCLUDE_DIRS}) add_definitions(${LLVM_DEFINITIONS}) message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}") @@ -184,8 +184,8 @@ message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}") if (WAMR_BUILD_DEBUG_AOT EQUAL 1) if(LLVM_BUILD_MAIN_SRC_DIR) - include_directories(${LLVM_BUILD_MAIN_SRC_DIR}/../lldb/include) - include_directories(${LLVM_BUILD_BINARY_DIR}/tools/lldb/include) + include_directories(SYSTEM ${LLVM_BUILD_MAIN_SRC_DIR}/../lldb/include) + include_directories(SYSTEM ${LLVM_BUILD_BINARY_DIR}/tools/lldb/include) endif() link_directories(${LLVM_LIBRARY_DIRS}) find_library(lib_lldb NAMES lldb HINTS ${LLVM_LIBRARY_DIRS} REQUIRED)