Skip to content

Commit 4ba32c3

Browse files
daanxdaanx
committed
Revert "make all includes relative"
This reverts commit 1feb612.
1 parent 1feb612 commit 4ba32c3

21 files changed

+63
-63
lines changed

‎CMakeLists.txt

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,10 @@ 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 $<INSTALL_INTERFACE:${mi_install_incdir}>)
266+
target_include_directories(mimalloc PUBLIC
267+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
268+
$<INSTALL_INTERFACE:${mi_install_incdir}>
269+
)
267270
if(WIN32)
268271
# On windows copy the mimalloc redirection dll too.
269272
if(CMAKE_SIZEOF_VOID_P EQUAL 4)
@@ -289,7 +292,10 @@ if (MI_BUILD_STATIC)
289292
target_compile_definitions(mimalloc-static PRIVATE ${mi_defines} MI_STATIC_LIB)
290293
target_compile_options(mimalloc-static PRIVATE ${mi_cflags})
291294
target_link_libraries(mimalloc-static PUBLIC ${mi_libraries})
292-
target_include_directories(mimalloc-static PUBLIC $<INSTALL_INTERFACE:${mi_install_incdir}>)
295+
target_include_directories(mimalloc-static PUBLIC
296+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
297+
$<INSTALL_INTERFACE:${mi_install_incdir}>
298+
)
293299
if(WIN32)
294300
# When building both static and shared libraries on Windows, a static library should use a
295301
# different output name to avoid the conflict with the import library of a shared one.
@@ -326,7 +332,10 @@ if (MI_BUILD_OBJECT)
326332
set_property(TARGET mimalloc-obj PROPERTY POSITION_INDEPENDENT_CODE ON)
327333
target_compile_definitions(mimalloc-obj PRIVATE ${mi_defines})
328334
target_compile_options(mimalloc-obj PRIVATE ${mi_cflags})
329-
target_include_directories(mimalloc-obj PUBLIC $<INSTALL_INTERFACE:${mi_install_incdir}>)
335+
target_include_directories(mimalloc-obj PUBLIC
336+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
337+
$<INSTALL_INTERFACE:${mi_install_incdir}>
338+
)
330339

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

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

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

‎ide/vs2019/mimalloc-override.vcxproj

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,7 @@
9494
<Optimization>Disabled</Optimization>
9595
<SDLCheck>true</SDLCheck>
9696
<ConformanceMode>true</ConformanceMode>
97-
<AdditionalIncludeDirectories>
98-
</AdditionalIncludeDirectories>
97+
<AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
9998
<PreprocessorDefinitions>MI_SHARED_LIB;MI_SHARED_LIB_EXPORT;MI_MALLOC_OVERRIDE;%(PreprocessorDefinitions);</PreprocessorDefinitions>
10099
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
101100
<SupportJustMyCode>false</SupportJustMyCode>
@@ -123,8 +122,7 @@
123122
<Optimization>Disabled</Optimization>
124123
<SDLCheck>true</SDLCheck>
125124
<ConformanceMode>true</ConformanceMode>
126-
<AdditionalIncludeDirectories>
127-
</AdditionalIncludeDirectories>
125+
<AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
128126
<PreprocessorDefinitions>MI_DEBUG=3;MI_SHARED_LIB;MI_SHARED_LIB_EXPORT;MI_MALLOC_OVERRIDE;%(PreprocessorDefinitions);</PreprocessorDefinitions>
129127
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
130128
<SupportJustMyCode>false</SupportJustMyCode>
@@ -153,8 +151,7 @@
153151
<FunctionLevelLinking>true</FunctionLevelLinking>
154152
<IntrinsicFunctions>true</IntrinsicFunctions>
155153
<ConformanceMode>true</ConformanceMode>
156-
<AdditionalIncludeDirectories>
157-
</AdditionalIncludeDirectories>
154+
<AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
158155
<PreprocessorDefinitions>MI_SHARED_LIB;MI_SHARED_LIB_EXPORT;MI_MALLOC_OVERRIDE;%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
159156
<AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
160157
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
@@ -186,8 +183,7 @@
186183
<FunctionLevelLinking>true</FunctionLevelLinking>
187184
<IntrinsicFunctions>true</IntrinsicFunctions>
188185
<ConformanceMode>true</ConformanceMode>
189-
<AdditionalIncludeDirectories>
190-
</AdditionalIncludeDirectories>
186+
<AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
191187
<PreprocessorDefinitions>MI_SHARED_LIB;MI_SHARED_LIB_EXPORT;MI_MALLOC_OVERRIDE;%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
192188
<AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
193189
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

‎ide/vs2019/mimalloc.vcxproj

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,7 @@
9696
<Optimization>Disabled</Optimization>
9797
<SDLCheck>true</SDLCheck>
9898
<ConformanceMode>true</ConformanceMode>
99-
<AdditionalIncludeDirectories>
100-
</AdditionalIncludeDirectories>
99+
<AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
101100
<PreprocessorDefinitions>MI_DEBUG=3;%(PreprocessorDefinitions);</PreprocessorDefinitions>
102101
<CompileAs>CompileAsCpp</CompileAs>
103102
<SupportJustMyCode>false</SupportJustMyCode>
@@ -116,8 +115,7 @@
116115
<Optimization>Disabled</Optimization>
117116
<SDLCheck>true</SDLCheck>
118117
<ConformanceMode>true</ConformanceMode>
119-
<AdditionalIncludeDirectories>
120-
</AdditionalIncludeDirectories>
118+
<AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
121119
<PreprocessorDefinitions>MI_DEBUG=3;%(PreprocessorDefinitions);</PreprocessorDefinitions>
122120
<CompileAs>CompileAsCpp</CompileAs>
123121
<SupportJustMyCode>false</SupportJustMyCode>
@@ -144,8 +142,7 @@
144142
<Optimization>MaxSpeed</Optimization>
145143
<FunctionLevelLinking>true</FunctionLevelLinking>
146144
<ConformanceMode>true</ConformanceMode>
147-
<AdditionalIncludeDirectories>
148-
</AdditionalIncludeDirectories>
145+
<AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
149146
<PreprocessorDefinitions>%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
150147
<AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
151148
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
@@ -173,8 +170,7 @@
173170
<Optimization>MaxSpeed</Optimization>
174171
<FunctionLevelLinking>true</FunctionLevelLinking>
175172
<ConformanceMode>true</ConformanceMode>
176-
<AdditionalIncludeDirectories>
177-
</AdditionalIncludeDirectories>
173+
<AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
178174
<PreprocessorDefinitions>%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
179175
<AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
180176
<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 "../include/mimalloc.h"
9-
#include "../include/mimalloc-internal.h"
8+
#include "mimalloc.h"
9+
#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 "../include/mimalloc.h"
9-
#include "../include/mimalloc-internal.h"
8+
#include "mimalloc.h"
9+
#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 "../include/mimalloc.h"
13-
#include "../include/mimalloc-internal.h"
12+
#include "mimalloc.h"
13+
#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 "../include/mimalloc.h"
8-
#include "../include/mimalloc-internal.h"
9-
#include "../include/mimalloc-atomic.h"
7+
#include "mimalloc.h"
8+
#include "mimalloc-internal.h"
9+
#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 "../include/mimalloc.h"
29-
#include "../include/mimalloc-internal.h"
30-
#include "../include/mimalloc-atomic.h"
28+
#include "mimalloc.h"
29+
#include "mimalloc-internal.h"
30+
#include "mimalloc-atomic.h"
3131

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

0 commit comments

Comments
 (0)