merge from dev

This commit is contained in:
daan 2021-12-15 08:48:17 -08:00
commit 83f8451e62

View file

@ -227,32 +227,33 @@ if(WIN32)
else() else()
find_library(MI_LIBPTHREAD pthread) find_library(MI_LIBPTHREAD pthread)
if (MI_LIBPTHREAD) if (MI_LIBPTHREAD)
list(APPEND mi_libraries ${MI_LIBPTHREAD}) list(APPEND mi_libraries ${MI_LIBPTHREAD})
endif() endif()
find_library(MI_LIBRT rt) find_library(MI_LIBRT rt)
if(MI_LIBRT) if(MI_LIBRT)
list(APPEND mi_libraries ${MI_LIBRT}) list(APPEND mi_libraries ${MI_LIBRT})
endif()
find_library(MI_LIBATOMIC atomic)
if (MI_LIBATOMIC OR MI_USE_LIBATOMIC)
list(APPEND mi_libraries atomic)
endif() endif()
if(MI_DEBUG_TRACE) if(MI_DEBUG_TRACE)
find_library(MI_LIBEXECINFO NAMES execinfo) find_library(MI_LIBEXECINFO execinfo)
if (MI_LIBEXECINFO) if (MI_LIBEXECINFO)
list(APPEND mi_libraries ${MI_LIBEXECINFO}) list(APPEND mi_libraries ${MI_LIBEXECINFO})
endif() endif()
endif() endif()
endif()
endif()
if (MI_USE_LIBATOMIC)
list(APPEND mi_libraries atomic)
endif() endif()
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# Install and output names # Install and output names
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
set(mi_install_libdir "${CMAKE_INSTALL_LIBDIR}") # for dynamic/shared library and symlinks # dynamic/shared library and symlinks always go to /usr/local/lib equivalent
set(mi_install_libdir "${CMAKE_INSTALL_LIBDIR}")
# install at top level or use versioned directories for side-by-side installation? # static libraries and object files, includes, and cmake config files
# are either installed at top level, or use versioned directories for side-by-side installation (default)
if (MI_INSTALL_TOPLEVEL) if (MI_INSTALL_TOPLEVEL)
set(mi_install_objdir "${CMAKE_INSTALL_LIBDIR}") set(mi_install_objdir "${CMAKE_INSTALL_LIBDIR}")
set(mi_install_incdir "${CMAKE_INSTALL_INCLUDEDIR}") set(mi_install_incdir "${CMAKE_INSTALL_INCLUDEDIR}")