Skip to content

Commit 1feb612

Browse files
daanxdaanx
committed
make all includes relative
1 parent e2c095f commit 1feb612

21 files changed

+63
-63
lines changed

‎CMakeLists.txt

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -263,10 +263,7 @@ if(MI_BUILD_SHARED)
263263
target_compile_definitions(mimalloc PRIVATE ${mi_defines} MI_SHARED_LIB MI_SHARED_LIB_EXPORT)
264264
target_compile_options(mimalloc PRIVATE ${mi_cflags})
265265
target_link_libraries(mimalloc PUBLIC ${mi_libraries})
266-
target_include_directories(mimalloc PUBLIC
267-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
268-
$<INSTALL_INTERFACE:${mi_install_incdir}>
269-
)
266+
target_include_directories(mimalloc PUBLIC $<INSTALL_INTERFACE:${mi_install_incdir}>)
270267
if(WIN32)
271268
# On windows copy the mimalloc redirection dll too.
272269
if(CMAKE_SIZEOF_VOID_P EQUAL 4)
@@ -292,10 +289,7 @@ if (MI_BUILD_STATIC)
292289
target_compile_definitions(mimalloc-static PRIVATE ${mi_defines} MI_STATIC_LIB)
293290
target_compile_options(mimalloc-static PRIVATE ${mi_cflags})
294291
target_link_libraries(mimalloc-static PUBLIC ${mi_libraries})
295-
target_include_directories(mimalloc-static PUBLIC
296-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
297-
$<INSTALL_INTERFACE:${mi_install_incdir}>
298-
)
292+
target_include_directories(mimalloc-static PUBLIC $<INSTALL_INTERFACE:${mi_install_incdir}>)
299293
if(WIN32)
300294
# When building both static and shared libraries on Windows, a static library should use a
301295
# different output name to avoid the conflict with the import library of a shared one.
@@ -332,10 +326,7 @@ if (MI_BUILD_OBJECT)
332326
set_property(TARGET mimalloc-obj PROPERTY POSITION_INDEPENDENT_CODE ON)
333327
target_compile_definitions(mimalloc-obj PRIVATE ${mi_defines})
334328
target_compile_options(mimalloc-obj PRIVATE ${mi_cflags})
335-
target_include_directories(mimalloc-obj PUBLIC
336-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
337-
$<INSTALL_INTERFACE:${mi_install_incdir}>
338-
)
329+
target_include_directories(mimalloc-obj PUBLIC $<INSTALL_INTERFACE:${mi_install_incdir}>)
339330

340331
# the following seems to lead to cmake warnings/errors on some systems, disable for now :-(
341332
# install(TARGETS mimalloc-obj EXPORT mimalloc DESTINATION ${mi_install_libdir})

‎ide/vs2019/mimalloc-override-test.vcxproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,8 @@
177177
</PostBuildEvent>
178178
</ItemDefinitionGroup>
179179
<ItemGroup>
180-
<ClCompile Include="..\..\test\main-override.cpp" />
180+
<ClCompile Include="..\..\test\rtest\src\main.cxx" />
181+
<ClCompile Include="..\..\test\rtest\src\memory_storage.cxx" />
181182
</ItemGroup>
182183
<ItemGroup>
183184
<ProjectReference Include="mimalloc-override.vcxproj">

‎ide/vs2019/mimalloc-override.vcxproj

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,8 @@
9494
<Optimization>Disabled</Optimization>
9595
<SDLCheck>true</SDLCheck>
9696
<ConformanceMode>true</ConformanceMode>
97-
<AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
97+
<AdditionalIncludeDirectories>
98+
</AdditionalIncludeDirectories>
9899
<PreprocessorDefinitions>MI_SHARED_LIB;MI_SHARED_LIB_EXPORT;MI_MALLOC_OVERRIDE;%(PreprocessorDefinitions);</PreprocessorDefinitions>
99100
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
100101
<SupportJustMyCode>false</SupportJustMyCode>
@@ -122,7 +123,8 @@
122123
<Optimization>Disabled</Optimization>
123124
<SDLCheck>true</SDLCheck>
124125
<ConformanceMode>true</ConformanceMode>
125-
<AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
126+
<AdditionalIncludeDirectories>
127+
</AdditionalIncludeDirectories>
126128
<PreprocessorDefinitions>MI_DEBUG=3;MI_SHARED_LIB;MI_SHARED_LIB_EXPORT;MI_MALLOC_OVERRIDE;%(PreprocessorDefinitions);</PreprocessorDefinitions>
127129
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
128130
<SupportJustMyCode>false</SupportJustMyCode>
@@ -151,7 +153,8 @@
151153
<FunctionLevelLinking>true</FunctionLevelLinking>
152154
<IntrinsicFunctions>true</IntrinsicFunctions>
153155
<ConformanceMode>true</ConformanceMode>
154-
<AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
156+
<AdditionalIncludeDirectories>
157+
</AdditionalIncludeDirectories>
155158
<PreprocessorDefinitions>MI_SHARED_LIB;MI_SHARED_LIB_EXPORT;MI_MALLOC_OVERRIDE;%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
156159
<AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
157160
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
@@ -183,7 +186,8 @@
183186
<FunctionLevelLinking>true</FunctionLevelLinking>
184187
<IntrinsicFunctions>true</IntrinsicFunctions>
185188
<ConformanceMode>true</ConformanceMode>
186-
<AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
189+
<AdditionalIncludeDirectories>
190+
</AdditionalIncludeDirectories>
187191
<PreprocessorDefinitions>MI_SHARED_LIB;MI_SHARED_LIB_EXPORT;MI_MALLOC_OVERRIDE;%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
188192
<AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
189193
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

‎ide/vs2019/mimalloc.vcxproj

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,8 @@
9696
<Optimization>Disabled</Optimization>
9797
<SDLCheck>true</SDLCheck>
9898
<ConformanceMode>true</ConformanceMode>
99-
<AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
99+
<AdditionalIncludeDirectories>
100+
</AdditionalIncludeDirectories>
100101
<PreprocessorDefinitions>MI_DEBUG=3;%(PreprocessorDefinitions);</PreprocessorDefinitions>
101102
<CompileAs>CompileAsCpp</CompileAs>
102103
<SupportJustMyCode>false</SupportJustMyCode>
@@ -115,7 +116,8 @@
115116
<Optimization>Disabled</Optimization>
116117
<SDLCheck>true</SDLCheck>
117118
<ConformanceMode>true</ConformanceMode>
118-
<AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
119+
<AdditionalIncludeDirectories>
120+
</AdditionalIncludeDirectories>
119121
<PreprocessorDefinitions>MI_DEBUG=3;%(PreprocessorDefinitions);</PreprocessorDefinitions>
120122
<CompileAs>CompileAsCpp</CompileAs>
121123
<SupportJustMyCode>false</SupportJustMyCode>
@@ -142,7 +144,8 @@
142144
<Optimization>MaxSpeed</Optimization>
143145
<FunctionLevelLinking>true</FunctionLevelLinking>
144146
<ConformanceMode>true</ConformanceMode>
145-
<AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
147+
<AdditionalIncludeDirectories>
148+
</AdditionalIncludeDirectories>
146149
<PreprocessorDefinitions>%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
147150
<AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
148151
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
@@ -170,7 +173,8 @@
170173
<Optimization>MaxSpeed</Optimization>
171174
<FunctionLevelLinking>true</FunctionLevelLinking>
172175
<ConformanceMode>true</ConformanceMode>
173-
<AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
176+
<AdditionalIncludeDirectories>
177+
</AdditionalIncludeDirectories>
174178
<PreprocessorDefinitions>%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
175179
<AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
176180
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

‎include/mimalloc-types.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ terms of the MIT license. A copy of the license can be found in the file
1010

1111
#include <stddef.h> // ptrdiff_t
1212
#include <stdint.h> // uintptr_t, uint16_t, etc
13-
#include <mimalloc-atomic.h> // _Atomic
13+
#include "mimalloc-atomic.h" // _Atomic
1414

1515
#ifdef _MSC_VER
1616
#pragma warning(disable:4214) // bitfield is not int

‎src/alloc-aligned.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ terms of the MIT license. A copy of the license can be found in the file
55
"LICENSE" at the root of this distribution.
66
-----------------------------------------------------------------------------*/
77

8-
#include "mimalloc.h"
9-
#include "mimalloc-internal.h"
8+
#include "../include/mimalloc.h"
9+
#include "../include/mimalloc-internal.h"
1010

1111
#include <string.h> // memset
1212

‎src/alloc-override-osx.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ terms of the MIT license. A copy of the license can be found in the file
55
"LICENSE" at the root of this distribution.
66
-----------------------------------------------------------------------------*/
77

8-
#include "mimalloc.h"
9-
#include "mimalloc-internal.h"
8+
#include "../include/mimalloc.h"
9+
#include "../include/mimalloc-internal.h"
1010

1111
#if defined(MI_MALLOC_OVERRIDE)
1212

‎src/alloc-posix.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ terms of the MIT license. A copy of the license can be found in the file
99
// mi prefixed publi definitions of various Posix, Unix, and C++ functions
1010
// for convenience and used when overriding these functions.
1111
// ------------------------------------------------------------------------
12-
#include "mimalloc.h"
13-
#include "mimalloc-internal.h"
12+
#include "../include/mimalloc.h"
13+
#include "../include/mimalloc-internal.h"
1414

1515
// ------------------------------------------------------
1616
// Posix & Unix functions definitions

‎src/alloc.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ This is free software; you can redistribute it and/or modify it under the
44
terms of the MIT license. A copy of the license can be found in the file
55
"LICENSE" at the root of this distribution.
66
-----------------------------------------------------------------------------*/
7-
#include "mimalloc.h"
8-
#include "mimalloc-internal.h"
9-
#include "mimalloc-atomic.h"
7+
#include "../include/mimalloc.h"
8+
#include "../include/mimalloc-internal.h"
9+
#include "../include/mimalloc-atomic.h"
1010

1111
#include <string.h> // memset, strlen
1212
#include <stdlib.h> // malloc, exit

‎src/arena.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ blocks of 2GiB (64*32MiB) and no object can cross the boundary. This
2525
can lead to fragmentation but fortunately most objects will be regions
2626
of 256MiB in practice.
2727
-----------------------------------------------------------------------------*/
28-
#include "mimalloc.h"
29-
#include "mimalloc-internal.h"
30-
#include "mimalloc-atomic.h"
28+
#include "../include/mimalloc.h"
29+
#include "../include/mimalloc-internal.h"
30+
#include "../include/mimalloc-atomic.h"
3131

3232
#include <string.h> // memset
3333
#include <errno.h> // ENOMEM

0 commit comments

Comments
 (0)