blob: 94bfa8a1c53e3c5b5e45d7f69714d127a03654a1 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
$NetBSD: patch-CMakeLists.txt,v 1.2 2022/05/23 19:02:59 plunky Exp $
disable finding the commit hash: we provide it in the Makefile
use pkgsrc mimalloc directly
--- CMakeLists.txt.orig 2021-04-18 09:48:36.000000000 +0000
+++ CMakeLists.txt
@@ -30,7 +30,6 @@ endif()
# NOTE TO PACKAGERS: The embedded git commit hash is critical for rapid bug triage when the builds
# can come from a variety of sources. If you are mirroring the sources or otherwise build when
# the .git directory is not present, please comment the following line:
-include(GetGitCommitHash)
# and instead uncomment the following, adding the complete git hash of the checkout you are using:
# set(GIT_COMMIT_HASH 0000000000000000000000000000000000000000)
@@ -173,13 +172,6 @@ endif()
message(STATUS "Using in-tree libdxfrw")
add_subdirectory(extlib/libdxfrw)
-message(STATUS "Using in-tree mimalloc")
-set(MI_OVERRIDE OFF CACHE BOOL "")
-set(MI_BUILD_SHARED OFF CACHE BOOL "")
-set(MI_BUILD_OBJECT OFF CACHE BOOL "")
-set(MI_BUILD_TESTS OFF CACHE BOOL "")
-add_subdirectory(extlib/mimalloc EXCLUDE_FROM_ALL)
-set(MIMALLOC_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/extlib/mimalloc/include)
if(WIN32 OR APPLE)
# On Win32 and macOS we use vendored packages, since there is little to no benefit
@@ -242,6 +234,7 @@ else()
find_package(ZLIB REQUIRED)
find_package(PNG REQUIRED)
find_package(Freetype REQUIRED)
+ find_package(mimalloc REQUIRED)
pkg_check_modules(CAIRO REQUIRED cairo)
endif()
|
