Skip to content

Commit 4ce6821

Browse files
committed
update cmake install for MI_INSTALL_TOPLEVEL
1 parent 5e55525 commit 4ce6821

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

cmake/mimalloc-config.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ if (MIMALLOC_SHARE_DIR MATCHES "/share/")
44
string(REPLACE "/share/" "/lib/" MIMALLOC_LIBRARY_DIR ${MIMALLOC_SHARE_DIR})
55
string(REPLACE "/share/" "/include/" MIMALLOC_INCLUDE_DIR ${MIMALLOC_SHARE_DIR})
66
else()
7-
# if MI_INSTALL_TOPLEVEL==ON
8-
set(MIMALLOC_LIBRARY_DIR "${MIMALLOC_SHARE_DIR}/lib")
9-
set(MIMALLOC_INCLUDE_DIR "${MIMALLOC_SHARE_DIR}/include")
7+
# installed with -DMI_INSTALL_TOPLEVEL=ON
8+
string(REPLACE "/lib/cmake" "/lib" MIMALLOC_LIBRARY_DIR "${MIMALLOC_SHARE_DIR}")
9+
string(REPLACE "/lib/cmake" "/include" MIMALLOC_INCLUDE_DIR "${MIMALLOC_SHARE_DIR}")
1010
endif()
1111
set(MIMALLOC_TARGET_DIR "${MIMALLOC_LIBRARY_DIR}") # legacy

test/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
cmake_minimum_required(VERSION 3.0)
22
project(mimalloc-test C CXX)
33

4+
set(CMAKE_C_STANDARD 11)
5+
set(CMAKE_CXX_STANDARD 17)
6+
47
# Set default build type
58
if (NOT CMAKE_BUILD_TYPE)
69
if ("${CMAKE_BINARY_DIR}" MATCHES ".*(D|d)ebug$")

0 commit comments

Comments
 (0)