Skip to content

Commit 94a369c

Browse files
authored
Merge pull request #1591 from lukaszstolarczuk/jemalloc-gcc-pragma
Target jemalloc dirs for UMF as SYSTEM
2 parents 5d093ed + 95ac779 commit 94a369c

1 file changed

Lines changed: 7 additions & 3 deletions

File tree

src/CMakeLists.txt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2023-2025 Intel Corporation
1+
# Copyright (C) 2023-2026 Intel Corporation
22
# Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
33
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
44

@@ -74,8 +74,6 @@ if(UMF_POOL_JEMALLOC_ENABLED)
7474
set(UMF_LIBS ${UMF_LIBS} ${JEMALLOC_LIBRARIES})
7575
set(UMF_PRIVATE_LIBRARY_DIRS ${UMF_PRIVATE_LIBRARY_DIRS}
7676
${JEMALLOC_LIBRARY_DIRS})
77-
set(UMF_PRIVATE_INCLUDE_DIRS ${UMF_PRIVATE_INCLUDE_DIRS}
78-
${JEMALLOC_INCLUDE_DIRS})
7977
set(UMF_COMMON_COMPILE_DEFINITIONS ${UMF_COMMON_COMPILE_DEFINITIONS}
8078
"UMF_POOL_JEMALLOC_ENABLED=1")
8179
endif()
@@ -147,6 +145,12 @@ else()
147145
endif()
148146

149147
target_include_directories(umf PRIVATE ${UMF_PRIVATE_INCLUDE_DIRS})
148+
if(UMF_POOL_JEMALLOC_ENABLED)
149+
# Add jemalloc include dirs as SYSTEM to avoid warnings from jemalloc
150+
# headers
151+
target_include_directories(umf SYSTEM PRIVATE ${JEMALLOC_INCLUDE_DIRS})
152+
endif()
153+
150154
target_link_directories(umf PRIVATE ${UMF_PRIVATE_LIBRARY_DIRS})
151155
target_compile_definitions(umf PRIVATE ${UMF_COMMON_COMPILE_DEFINITIONS})
152156

0 commit comments

Comments
 (0)