diff --git a/.pkg b/.pkg index e0ac0be..3a8b605 100644 --- a/.pkg +++ b/.pkg @@ -41,7 +41,7 @@ [mimalloc] url=git@github.com:motis-project/mimalloc.git branch=master - commit=0087f000848de31b0090cb6f282348bd2fd3a9b8 + commit=2a557cafb2e9e7c872358a83a63c62a7e14330b3 [rapidjson] url=git@github.com:motis-project/rapidjson.git branch=master diff --git a/.pkg.lock b/.pkg.lock index 55038ef..a4928d2 100644 --- a/.pkg.lock +++ b/.pkg.lock @@ -1,18 +1,18 @@ -15844668971328567782 -cista de453ae4f0a82729af8a9dd57ee5a8f19c5c5af5 -zlib d1c943390ba4f97aa2f50bedc629b6d29027fa0e -boost 60cae66449fa3c9599b2b7d3d5d44c65301ed3a3 +8900990051304848502 +cista 5b2ca78d1af99941ea41e195dc3a29b4f05e1b77 +zlib-ng 68ab3e2d80253ec5dc3c83691d9ff70477b32cd3 +boost 73549ebca677fe6214202a1ab580362b4f80e653 conf f9bf4bd83bf55a2170725707e526cbacc45dcc66 expat 636c9861e8e7c119f3626d1e6c260603ab624516 fmt edb385ac526c24bc917ec4a41bb0edb28f0ca59e doctest 70e8f76437b76dd5e9c0a2eb9b907df190ab71a0 googletest 34a46558609e05865c197f0260ab36daa7cbbb6e utl 538a11dec577de7238c7640491b3d4e091a33e08 -geo 66b34885c7e96e29ddb78a84ae3ab43302ed94e4 +geo 5d99aeb10674a41a82d7c78f850abfd9605bf6e1 libosmium 6e6d6b3081cc8bdf25dda89730e25c36eb995516 -mimalloc 0087f000848de31b0090cb6f282348bd2fd3a9b8 -libressl 390253a44ceef00eb620c38606588414326e9f23 -net 44674d2f3917e20b7019a0f7254d332522c36fb7 +mimalloc 2a557cafb2e9e7c872358a83a63c62a7e14330b3 +libressl 39c1bf084d5c179d7bbce7ba902fffbebff0ee15 +net 75611343512242c64a5b3f50f3a660a17298339d protozero 8c9f3fa97c2cfdceef86d0b61818ae98e9328f29 rapidjson e7a1ac95c7840c6f4351abead02b1f7a02874197 LuaJIT babeae2c3311bed245ee86f3e35a1f244e3da60b @@ -24,6 +24,6 @@ res 7d97784ba785ce8a2677ea77164040fde484fb04 pbf-sdf-fonts 91b369e4eb8a618e0a83b0c04b1b08632ea872c4 sol2 3427b4412516c776226a751c13bfb95bb57bc61a variant 5aa73631dc969087c77433a5cdef246303051f69 -tiles ef9dbbb09353ce5064c5f6ffe605efa7e19e24d7 -unordered_dense c11595a7743d20622637584bddf77243d72ae152 +tiles f7208d4e05661abbf09e4f284de0112a445f6b0a +unordered_dense b33b037377ca966bbdd9cccc3417e46e88f83bfb rtree.c 6ed73a7dc4f1184f2b5b2acd8ac1c2b28a273057 diff --git a/CMakeLists.txt b/CMakeLists.txt index e40bd42..46354ae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,6 +23,11 @@ endif () option(OSR_MIMALLOC "use mimalloc" OFF) +if (OSR_MIMALLOC) + set(CISTA_USE_MIMALLOC ON) + set(TILES_MIMALLOC ON) +endif() + if (NOT DEFINED CMAKE_MSVC_RUNTIME_LIBRARY) if (OSR_MIMALLOC) set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL") @@ -145,6 +150,7 @@ target_link_libraries(osr-test gtest osr) # --- MIMALLOC --- if (OSR_MIMALLOC) target_link_libraries(osr-extract ${osr-mimalloc-lib}) + target_link_libraries(osr-backend ${osr-mimalloc-lib}) if (WIN32) add_custom_command( TARGET osr-extract POST_BUILD