diff options
| author | Daan <daanl@outlook.com> | 2022-02-14 16:36:03 -0800 |
|---|---|---|
| committer | Daan <daanl@outlook.com> | 2022-02-14 16:36:03 -0800 |
| commit | 19edc880dae1cd51381a4e59aae74ffd59a108cc (patch) | |
| tree | 188c0bd1b927f36a135b5d284835b7dc578f1b00 /cmake | |
| parent | a1310047c45dc5785e2a1f6e0507bc2f4c73ea9d (diff) | |
| parent | 817569dfad79732233fb86649c89e04387ce02e9 (diff) | |
merge from dev
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/mimalloc-config-version.cmake | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/cmake/mimalloc-config-version.cmake b/cmake/mimalloc-config-version.cmake index 552551d..76b2af6 100644 --- a/cmake/mimalloc-config-version.cmake +++ b/cmake/mimalloc-config-version.cmake @@ -1,6 +1,12 @@ +<<<<<<< HEAD set(mi_version_major 2) set(mi_version_minor 0) set(mi_version_patch 4) +======= +set(mi_version_major 1) +set(mi_version_minor 7) +set(mi_version_patch 5) +>>>>>>> dev set(mi_version ${mi_version_major}.${mi_version_minor}) set(PACKAGE_VERSION ${mi_version}) |