diff --git a/CMakeLists.txt b/CMakeLists.txt index 66fad6d8..88734360 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -162,6 +162,8 @@ target_include_directories(mimalloc-obj PUBLIC $ ) +install(TARGETS mimalloc-obj EXPORT mimalloc DESTINATION ${mi_install_dir}) + install(FILES $ DESTINATION ${mi_install_dir} RENAME ${mi_basename}${CMAKE_C_OUTPUT_EXTENSION} ) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index dd453458..a9efaff9 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -13,17 +13,25 @@ if (NOT CMAKE_BUILD_TYPE) endif() # Import mimalloc (if installed) -find_package(mimalloc 1.0 REQUIRED) +find_package(mimalloc 1.0 REQUIRED NO_SYSTEM_ENVIRONMENT_PATH) + +message(STATUS "${MIMALLOC_INCLUDE_DIR}") # Tests -add_executable(static-override main-override.c) -target_link_libraries(static-override PUBLIC mimalloc-static) - -add_executable(static-override-cxx main-override.cpp) -target_link_libraries(static-override-cxx PUBLIC mimalloc-static) - add_executable(dynamic-override main-override.c) target_link_libraries(dynamic-override PUBLIC mimalloc) add_executable(dynamic-override-cxx main-override.cpp) target_link_libraries(dynamic-override-cxx PUBLIC mimalloc) + +# with a static library +add_executable(static-override main-override.c) +target_link_libraries(static-override PUBLIC mimalloc-static) + +add_executable(static-override-cxx main-override.cpp) +target_link_libraries(static-override-cxx PUBLIC mimalloc-static) + +# and with a static object file; need to link with pthread explicitly :-( +add_executable(static-override-obj main-override.c $) +target_include_directories(static-override-obj PUBLIC $) +target_link_libraries(static-override-obj PUBLIC pthread)