Skip to content

Commit 2e3325f

Browse files
authored
Merge pull request #913 from KFilipek/ctl-base
CTL: Add a CTL sources to the UMF
2 parents 7ae4fe1 + abb24e7 commit 2e3325f

File tree

9 files changed

+1076
-2
lines changed

9 files changed

+1076
-2
lines changed

cmake/helpers.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,9 +232,9 @@ function(add_umf_target_compile_options name)
232232
PRIVATE -fPIC
233233
-Wall
234234
-Wextra
235-
-Wpedantic
236235
-Wformat-security
237-
-Wcast-qual
236+
-Wno-cast-qual # TODO: remove this when const qualifier drop
237+
# will be solved in CTL
238238
$<$<CXX_COMPILER_ID:GNU>:-fdiagnostics-color=auto>)
239239
if(CMAKE_BUILD_TYPE STREQUAL "Release")
240240
target_compile_definitions(${name} PRIVATE -D_FORTIFY_SOURCE=2)

src/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ add_subdirectory(coarse)
2727

2828
set(UMF_LIBS $<BUILD_INTERFACE:umf_utils> $<BUILD_INTERFACE:coarse>)
2929

30+
set(CTL_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/ctl/ctl.c)
31+
3032
if(LINUX)
3133
set(BA_SOURCES ${BA_SOURCES}
3234
${CMAKE_CURRENT_SOURCE_DIR}/base_alloc/base_alloc_linux.c)
@@ -46,6 +48,7 @@ set(HWLOC_DEPENDENT_SOURCES topology.c)
4648

4749
set(UMF_SOURCES
4850
${BA_SOURCES}
51+
${CTL_SOURCES}
4952
libumf.c
5053
ipc.c
5154
ipc_cache.c

0 commit comments

Comments
 (0)