Skip to content

Commit 5e55525

Browse files
authored
Merge pull request #483 from joy4eg/install-dirs-dev
cmake: removed hardcoded names for top level configuration
2 parents 9c9c3a0 + 0ead911 commit 5e55525

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

CMakeLists.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ option(MI_CHECK_FULL "Use full internal invariant checking in DEBUG mode
2525
option(MI_INSTALL_TOPLEVEL "Install directly into $CMAKE_INSTALL_PREFIX instead of PREFIX/lib/mimalloc-version" OFF)
2626
option(MI_USE_LIBATOMIC "Explicitly link with -latomic (on older systems)" OFF)
2727

28+
include(GNUInstallDirs)
2829
include("cmake/mimalloc-config-version.cmake")
2930

3031
set(mi_sources
@@ -230,9 +231,9 @@ endif()
230231
# -----------------------------------------------------------------------------
231232

232233
if (MI_INSTALL_TOPLEVEL)
233-
set(mi_install_libdir "lib")
234-
set(mi_install_incdir "include")
235-
set(mi_install_cmakedir "cmake")
234+
set(mi_install_libdir "${CMAKE_INSTALL_LIBDIR}")
235+
set(mi_install_incdir "${CMAKE_INSTALL_INCLUDEDIR}")
236+
set(mi_install_cmakedir "${CMAKE_INSTALL_LIBDIR}/cmake/mimalloc")
236237
else()
237238
set(mi_install_libdir "lib/mimalloc-${mi_version}")
238239
set(mi_install_incdir "include/mimalloc-${mi_version}")

0 commit comments

Comments
 (0)