diff options
| author | daan <daanl@outlook.com> | 2019-11-22 09:28:48 -0800 |
|---|---|---|
| committer | daan <daanl@outlook.com> | 2019-11-22 09:28:48 -0800 |
| commit | 24b768363efa415f74ba25d53c6fdae55c1aa24c (patch) | |
| tree | 831b50edf1696be64c8081e8914e19296ddca4d9 | |
| parent | 31fbe9793df3a264ad3e7b74428dc1fa5e3aa667 (diff) | |
bump version to 1.3 for further development
| -rw-r--r-- | cmake/mimalloc-config-version.cmake | 2 | ||||
| -rw-r--r-- | ide/vs2019/mimalloc-override.vcxproj.filters | 6 | ||||
| -rw-r--r-- | ide/vs2019/mimalloc.vcxproj.filters | 6 | ||||
| -rw-r--r-- | include/mimalloc.h | 2 | ||||
| -rw-r--r-- | test/CMakeLists.txt | 2 |
5 files changed, 15 insertions, 3 deletions
diff --git a/cmake/mimalloc-config-version.cmake b/cmake/mimalloc-config-version.cmake index 9d78b5a..f64948d 100644 --- a/cmake/mimalloc-config-version.cmake +++ b/cmake/mimalloc-config-version.cmake @@ -1,5 +1,5 @@ set(mi_version_major 1) -set(mi_version_minor 2) +set(mi_version_minor 3) set(mi_version ${mi_version_major}.${mi_version_minor}) set(PACKAGE_VERSION ${mi_version}) diff --git a/ide/vs2019/mimalloc-override.vcxproj.filters b/ide/vs2019/mimalloc-override.vcxproj.filters index bc1e4c6..b2dea4e 100644 --- a/ide/vs2019/mimalloc-override.vcxproj.filters +++ b/ide/vs2019/mimalloc-override.vcxproj.filters @@ -40,6 +40,12 @@ <ClCompile Include="..\..\src\stats.c"> <Filter>Source Files</Filter> </ClCompile> + <ClCompile Include="..\..\src\arena.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\bitmap.inc.c"> + <Filter>Source Files</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="$(ProjectDir)..\..\include\mimalloc.h"> diff --git a/ide/vs2019/mimalloc.vcxproj.filters b/ide/vs2019/mimalloc.vcxproj.filters index b2282df..0cce0c4 100644 --- a/ide/vs2019/mimalloc.vcxproj.filters +++ b/ide/vs2019/mimalloc.vcxproj.filters @@ -43,6 +43,12 @@ <ClCompile Include="..\..\src\stats.c"> <Filter>Source Files</Filter> </ClCompile> + <ClCompile Include="..\..\src\arena.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\bitmap.inc.c"> + <Filter>Source Files</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="$(ProjectDir)..\..\include\mimalloc.h"> diff --git a/include/mimalloc.h b/include/mimalloc.h index f727a99..2944de8 100644 --- a/include/mimalloc.h +++ b/include/mimalloc.h @@ -8,7 +8,7 @@ terms of the MIT license. A copy of the license can be found in the file #ifndef MIMALLOC_H #define MIMALLOC_H -#define MI_MALLOC_VERSION 120 // major + 2 digits minor +#define MI_MALLOC_VERSION 130 // major + 2 digits minor // ------------------------------------------------------ // Compiler specific attributes diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index a80dde5..ed20488 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -13,7 +13,7 @@ if (NOT CMAKE_BUILD_TYPE) endif() # Import mimalloc (if installed) -find_package(mimalloc 1.2 REQUIRED NO_SYSTEM_ENVIRONMENT_PATH) +find_package(mimalloc 1.3 REQUIRED NO_SYSTEM_ENVIRONMENT_PATH) message(STATUS "Found mimalloc installed at: ${MIMALLOC_TARGET_DIR}") # overriding with a dynamic library |