From 6e14591a8b71c15ac5e92c866c5ea1c6accedd8d Mon Sep 17 00:00:00 2001 From: rdb Date: Wed, 5 Oct 2022 13:57:12 +0200 Subject: [PATCH] CMake: Don't link to mimalloc if it is not enabled --- dtool/src/dtoolbase/CMakeLists.txt | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dtool/src/dtoolbase/CMakeLists.txt b/dtool/src/dtoolbase/CMakeLists.txt index 72d69b7e07..cd2e8a1fc3 100644 --- a/dtool/src/dtoolbase/CMakeLists.txt +++ b/dtool/src/dtoolbase/CMakeLists.txt @@ -94,12 +94,16 @@ add_component_library(p3dtoolbase NOINIT SYMBOL BUILDING_DTOOL_DTOOLBASE target_include_directories(p3dtoolbase PUBLIC $ $) -target_link_libraries(p3dtoolbase PKG::EIGEN PKG::THREADS PKG::MIMALLOC) +target_link_libraries(p3dtoolbase PKG::EIGEN PKG::THREADS) target_interrogate(p3dtoolbase ${P3DTOOLBASE_SOURCES} EXTENSIONS ${P3DTOOLBASE_IGATEEXT}) -if(HAVE_MIMALLOC AND CMAKE_CXX_COMPILER_ID MATCHES "^(GNU|Clang)$") - # Do not re-export symbols from these libraries. - target_link_options(p3dtoolbase PRIVATE "LINKER:--exclude-libs,libmimalloc.a") +if(HAVE_MIMALLOC AND USE_MEMORY_MIMALLOC) + target_link_libraries(p3dtoolbase PKG::MIMALLOC) + + if(CMAKE_CXX_COMPILER_ID MATCHES "^(GNU|Clang)$") + # Do not re-export symbols from these libraries. + target_link_options(p3dtoolbase PRIVATE "LINKER:--exclude-libs,libmimalloc.a") + endif() endif() if(NOT BUILD_METALIBS)