mirror of
https://github.com/microsoft/mimalloc.git
synced 2025-05-19 05:29:32 +03:00
remove MI_USE_LIBATOMIC and properly find libatomic
This commit is contained in:
parent
81a771161e
commit
5141e4df24
1 changed files with 4 additions and 8 deletions
|
@ -33,8 +33,8 @@ option(MI_NO_THP "Disable transparent huge pages support on Linux/And
|
||||||
|
|
||||||
# deprecated options
|
# deprecated options
|
||||||
option(MI_CHECK_FULL "Use full internal invariant checking in DEBUG mode (deprecated, use MI_DEBUG_FULL instead)" OFF)
|
option(MI_CHECK_FULL "Use full internal invariant checking in DEBUG mode (deprecated, use MI_DEBUG_FULL instead)" OFF)
|
||||||
option(MI_USE_LIBATOMIC "Explicitly link with -latomic (on older systems) (deprecated and detected automatically)" OFF)
|
|
||||||
|
|
||||||
|
include(CheckLinkerFlag)
|
||||||
include(CheckIncludeFiles)
|
include(CheckIncludeFiles)
|
||||||
include(GNUInstallDirs)
|
include(GNUInstallDirs)
|
||||||
include("cmake/mimalloc-config-version.cmake")
|
include("cmake/mimalloc-config-version.cmake")
|
||||||
|
@ -354,13 +354,9 @@ else()
|
||||||
list(APPEND mi_libraries ${MI_LIBRT})
|
list(APPEND mi_libraries ${MI_LIBRT})
|
||||||
set(pc_libraries "${pc_libraries} -lrt")
|
set(pc_libraries "${pc_libraries} -lrt")
|
||||||
endif()
|
endif()
|
||||||
find_library(MI_LIBATOMIC atomic)
|
check_linker_flag(C "-latomic" MI_NEED_LIBATOMIC)
|
||||||
if (NOT MI_LIBATOMIC AND MI_USE_LIBATOMIC)
|
if (MI_NEED_LIBATOMIC)
|
||||||
set(MI_LIBATOMIC atomic)
|
list(APPEND mi_libraries -latomic)
|
||||||
endif()
|
|
||||||
if (MI_LIBATOMIC)
|
|
||||||
list(APPEND mi_libraries ${MI_LIBATOMIC})
|
|
||||||
set(pc_libraries "${pc_libraries} -latomic")
|
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue