diff options
| author | Daan <daanl@outlook.com> | 2021-11-14 15:32:21 -0800 |
|---|---|---|
| committer | Daan <daanl@outlook.com> | 2021-11-14 15:32:21 -0800 |
| commit | 4ce6821c09506d29feabdb8cfc4ac1d94b6574b6 (patch) | |
| tree | a45f0731302b9d3f9cae5f296d6dff7630315f18 | |
| parent | 5e55525e5e0032964fdc0844d67ecce42c4b5a4e (diff) | |
update cmake install for MI_INSTALL_TOPLEVEL
| -rw-r--r-- | cmake/mimalloc-config.cmake | 6 | ||||
| -rw-r--r-- | test/CMakeLists.txt | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/cmake/mimalloc-config.cmake b/cmake/mimalloc-config.cmake index 024c97d..9b0a56d 100644 --- a/cmake/mimalloc-config.cmake +++ b/cmake/mimalloc-config.cmake @@ -4,8 +4,8 @@ if (MIMALLOC_SHARE_DIR MATCHES "/share/") string(REPLACE "/share/" "/lib/" MIMALLOC_LIBRARY_DIR ${MIMALLOC_SHARE_DIR}) string(REPLACE "/share/" "/include/" MIMALLOC_INCLUDE_DIR ${MIMALLOC_SHARE_DIR}) else() - # if MI_INSTALL_TOPLEVEL==ON - set(MIMALLOC_LIBRARY_DIR "${MIMALLOC_SHARE_DIR}/lib") - set(MIMALLOC_INCLUDE_DIR "${MIMALLOC_SHARE_DIR}/include") + # installed with -DMI_INSTALL_TOPLEVEL=ON + string(REPLACE "/lib/cmake" "/lib" MIMALLOC_LIBRARY_DIR "${MIMALLOC_SHARE_DIR}") + string(REPLACE "/lib/cmake" "/include" MIMALLOC_INCLUDE_DIR "${MIMALLOC_SHARE_DIR}") endif() set(MIMALLOC_TARGET_DIR "${MIMALLOC_LIBRARY_DIR}") # legacy diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 7986d2d..13bf32d 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,6 +1,9 @@ cmake_minimum_required(VERSION 3.0) project(mimalloc-test C CXX) +set(CMAKE_C_STANDARD 11) +set(CMAKE_CXX_STANDARD 17) + # Set default build type if (NOT CMAKE_BUILD_TYPE) if ("${CMAKE_BINARY_DIR}" MATCHES ".*(D|d)ebug$") |