Skip to content

Commit 14d84ec

Browse files
TianlongLiangTianlongLiang
authored
fix a wamrc compile warning, and enable system include flag for third-party libraries to suppresses corresponding compile warnings (#4875)
1 parent c3a78cd commit 14d84ec

File tree

18 files changed

+33
-33
lines changed

18 files changed

+33
-33
lines changed

‎build-scripts/config_common.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ if (WAMR_BUILD_JIT EQUAL 1)
123123
set (LLVM_DIR ${LLVM_BUILD_ROOT}/lib/cmake/llvm)
124124
endif ()
125125
find_package(LLVM REQUIRED CONFIG)
126-
include_directories(${LLVM_INCLUDE_DIRS})
126+
include_directories(SYSTEM ${LLVM_INCLUDE_DIRS})
127127
add_definitions(${LLVM_DEFINITIONS})
128128
message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
129129
message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")

‎core/iwasm/aot/iwasm_aot.cmake‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ if ((WAMR_BUILD_TARGET STREQUAL "X86_64" OR WAMR_BUILD_TARGET STREQUAL "AMD_64")
7171
if (NOT zycore_POPULATED)
7272
message ("-- Fetching zycore ..")
7373
FetchContent_Populate(zycore)
74-
include_directories("${zycore_SOURCE_DIR}/include")
75-
include_directories("${zycore_BINARY_DIR}")
74+
include_directories(SYSTEM "${zycore_SOURCE_DIR}/include")
75+
include_directories(SYSTEM "${zycore_BINARY_DIR}")
7676
add_definitions(-DZYCORE_STATIC_BUILD=1)
7777
add_subdirectory(${zycore_SOURCE_DIR} ${zycore_BINARY_DIR} EXCLUDE_FROM_ALL)
7878
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")
9292
option(ZYDIS_BUILD_EXAMPLES "" OFF)
9393
option(ZYDIS_BUILD_MAN "" OFF)
9494
option(ZYDIS_BUILD_DOXYGEN "" OFF)
95-
include_directories("${zydis_BINARY_DIR}")
96-
include_directories("${zydis_SOURCE_DIR}/include")
97-
include_directories("${zydis_SOURCE_DIR}/src")
95+
include_directories(SYSTEM "${zydis_BINARY_DIR}")
96+
include_directories(SYSTEM "${zydis_SOURCE_DIR}/include")
97+
include_directories(SYSTEM "${zydis_SOURCE_DIR}/src")
9898
add_definitions(-DZYDIS_STATIC_BUILD=1)
9999
add_subdirectory(${zydis_SOURCE_DIR} ${zydis_BINARY_DIR} EXCLUDE_FROM_ALL)
100100
file (GLOB_RECURSE c_source_zydis ${zydis_SOURCE_DIR}/src/*.c)

‎core/iwasm/compilation/aot_orc_extra2.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ MyCompiler::operator()(llvm::Module &M)
124124
M.getModuleIdentifier() + "-jitted-objectbuffer");
125125
#endif
126126

127-
return std::move(ObjBuffer);
127+
return ObjBuffer;
128128
}
129129

130130
DEFINE_SIMPLE_CONVERSION_FUNCTIONS(llvm::orc::LLLazyJITBuilder,

‎core/iwasm/fast-jit/iwasm_fast_jit.cmake‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ if (WAMR_BUILD_TARGET STREQUAL "X86_64" OR WAMR_BUILD_TARGET STREQUAL "AMD_64")
4949
add_definitions(-DASMJIT_NO_INTRINSICS)
5050
add_definitions(-DASMJIT_NO_AARCH64)
5151
add_definitions(-DASMJIT_NO_AARCH32)
52-
include_directories("${asmjit_SOURCE_DIR}/src")
52+
include_directories(SYSTEM "${asmjit_SOURCE_DIR}/src")
5353
add_subdirectory(${asmjit_SOURCE_DIR} ${asmjit_BINARY_DIR} EXCLUDE_FROM_ALL)
5454
file (GLOB_RECURSE cpp_source_asmjit
5555
${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")
6767
FetchContent_Populate(zycore)
6868
option(ZYDIS_BUILD_TOOLS "" OFF)
6969
option(ZYDIS_BUILD_EXAMPLES "" OFF)
70-
include_directories("${zycore_SOURCE_DIR}/include")
71-
include_directories("${zycore_BINARY_DIR}")
70+
include_directories(SYSTEM "${zycore_SOURCE_DIR}/include")
71+
include_directories(SYSTEM "${zycore_BINARY_DIR}")
7272
add_subdirectory(${zycore_SOURCE_DIR} ${zycore_BINARY_DIR} EXCLUDE_FROM_ALL)
7373
file (GLOB_RECURSE c_source_zycore ${zycore_SOURCE_DIR}/src/*.c)
7474
endif ()
@@ -83,9 +83,9 @@ if (WAMR_BUILD_TARGET STREQUAL "X86_64" OR WAMR_BUILD_TARGET STREQUAL "AMD_64")
8383
FetchContent_Populate(zydis)
8484
option(ZYDIS_BUILD_TOOLS "" OFF)
8585
option(ZYDIS_BUILD_EXAMPLES "" OFF)
86-
include_directories("${zydis_BINARY_DIR}")
87-
include_directories("${zydis_SOURCE_DIR}/include")
88-
include_directories("${zydis_SOURCE_DIR}/src")
86+
include_directories(SYSTEM "${zydis_BINARY_DIR}")
87+
include_directories(SYSTEM "${zydis_SOURCE_DIR}/include")
88+
include_directories(SYSTEM "${zydis_SOURCE_DIR}/src")
8989
add_subdirectory(${zydis_SOURCE_DIR} ${zydis_BINARY_DIR} EXCLUDE_FROM_ALL)
9090
file (GLOB_RECURSE c_source_zydis ${zydis_SOURCE_DIR}/src/*.c)
9191
endif ()

‎core/iwasm/libraries/lib-rats/lib_rats.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ endif()
2323

2424
add_definitions (-DWASM_ENABLE_LIB_RATS=1)
2525

26-
include_directories(${LIB_RATS_DIR} ${SGX_SSL_DIR}/include)
26+
include_directories(SYSTEM ${LIB_RATS_DIR} ${SGX_SSL_DIR}/include)
2727

2828
include(FetchContent)
2929

@@ -41,7 +41,7 @@ FetchContent_GetProperties(librats)
4141
if (NOT librats_POPULATED)
4242
message("-- Fetching librats ..")
4343
FetchContent_Populate(librats)
44-
include_directories("${librats_SOURCE_DIR}/include")
44+
include_directories(SYSTEM "${librats_SOURCE_DIR}/include")
4545

4646
# Prevent the propagation of the CMAKE_C_FLAGS of WAMR into librats
4747
set(SAVED_CMAKE_C_FLAGS ${CMAKE_C_FLAGS})

‎core/iwasm/libraries/libc-uvwasi/libc_uvwasi.cmake‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,31 +22,31 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
2222
## libuv
2323
find_package(LIBUV QUIET)
2424
if (LIBUV_FOUND)
25-
include_directories(${LIBUV_INCLUDE_DIR})
25+
include_directories(SYSTEM ${LIBUV_INCLUDE_DIR})
2626
else()
2727
FetchContent_Declare(
2828
libuv
2929
GIT_REPOSITORY https://github.com/libuv/libuv.git
3030
GIT_TAG ${LIBUV_VERSION}
3131
)
3232
FetchContent_MakeAvailable(libuv)
33-
include_directories("${libuv_SOURCE_DIR}/include")
33+
include_directories(SYSTEM "${libuv_SOURCE_DIR}/include")
3434
set (LIBUV_LIBRARIES uv_a)
3535
set_target_properties(uv_a PROPERTIES POSITION_INDEPENDENT_CODE 1)
3636
endif()
3737

3838
## uvwasi
3939
find_package(UVWASI QUIET)
4040
if (UVWASI_FOUND)
41-
include_directories(${UVWASI_INCLUDE_DIR})
41+
include_directories(SYSTEM ${UVWASI_INCLUDE_DIR})
4242
else()
4343
FetchContent_Declare(
4444
uvwasi
4545
GIT_REPOSITORY https://github.com/nodejs/uvwasi.git
4646
GIT_TAG 392e1f1c1c8a2d2102c9f2e0b9f35959a149d133
4747
)
4848
FetchContent_MakeAvailable(uvwasi)
49-
include_directories("${uvwasi_SOURCE_DIR}/include")
49+
include_directories(SYSTEM "${uvwasi_SOURCE_DIR}/include")
5050
set (UVWASI_LIBRARIES uvwasi_a)
5151
set_target_properties(uvwasi_a PROPERTIES POSITION_INDEPENDENT_CODE 1)
5252
endif()

‎core/iwasm/libraries/simde/simde.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ FetchContent_Declare(
2525

2626
message("-- Fetching simde ..")
2727
FetchContent_MakeAvailable(simde)
28-
include_directories("${simde_SOURCE_DIR}")
28+
include_directories(SYSTEM "${simde_SOURCE_DIR}")

‎tests/fuzz/wasm-mutator-fuzz/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ find_package(LLVM REQUIRED CONFIG)
7878
message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
7979
message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
8080

81-
include_directories(${LLVM_INCLUDE_DIRS})
81+
include_directories(SYSTEM ${LLVM_INCLUDE_DIRS})
8282
separate_arguments(LLVM_DEFINITIONS_LIST NATIVE_COMMAND ${LLVM_DEFINITIONS})
8383
add_definitions(${LLVM_DEFINITIONS_LIST})
8484

‎tests/unit/aot-stack-frame/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ set (WAMR_BUILD_GC 1)
2222
include (../unit_common.cmake)
2323

2424
find_package(LLVM REQUIRED CONFIG)
25-
include_directories(${LLVM_INCLUDE_DIRS})
25+
include_directories(SYSTEM ${LLVM_INCLUDE_DIRS})
2626
add_definitions(${LLVM_DEFINITIONS})
2727

2828
include_directories (${CMAKE_CURRENT_SOURCE_DIR})

‎tests/unit/aot/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ set (WAMR_BUILD_APP_FRAMEWORK 0)
2323
include (../unit_common.cmake)
2424

2525
find_package(LLVM REQUIRED CONFIG)
26-
include_directories(${LLVM_INCLUDE_DIRS})
26+
include_directories(SYSTEM ${LLVM_INCLUDE_DIRS})
2727
add_definitions(${LLVM_DEFINITIONS})
2828

2929
include (${IWASM_DIR}/compilation/iwasm_compl.cmake)

0 commit comments

Comments
 (0)