pyrox.dev
lol
python3Packages.dm-tree: Fix build
authored by
Zig Uana
and committed by
Martin Weinelt
0bf42f0b
be83a2ed
+8
-8
pkgs/development/python-modules/dm-tree/cmake.patch
+8
-8
pkgs/development/python-modules/dm-tree/cmake.patch
···
1
1
diff --git a/tree/CMakeLists.txt b/tree/CMakeLists.txt
2
-
index 8f9946c..b9d6e9b 100644
2
+
index 4fd1b1a..f0d072b 100644
3
3
--- a/tree/CMakeLists.txt
4
4
+++ b/tree/CMakeLists.txt
5
-
@@ -50,70 +50,80 @@ if(APPLE)
5
+
@@ -50,70 +50,79 @@ if(APPLE)
6
6
set (CMAKE_FIND_FRAMEWORK LAST)
7
7
endif()
8
8
9
9
-# Fetch pybind to be able to use pybind11_add_module symbol.
10
-
-set(PYBIND_VER v2.6.2)
10
+
-set(PYBIND_VER v2.10.1)
11
11
-include(FetchContent)
12
12
-FetchContent_Declare(
13
13
- pybind11
···
42
42
+
43
43
+if (NOT pybind11_FOUND)
44
44
+ # Fetch pybind to be able to use pybind11_add_module symbol.
45
-
+ set(PYBIND_VER v2.6.2)
45
+
+ set(PYBIND_VER v2.10.1)
46
46
+ include(FetchContent)
47
47
+ FetchContent_Declare(
48
48
+ pybind11
···
69
69
# Define pybind11 tree module.
70
70
pybind11_add_module(_tree tree.h tree.cc)
71
71
-add_dependencies(_tree abseil-cpp)
72
-
73
-
-if (WIN32 OR MSVC)
74
-
- set(ABSEIL_LIB_PREF "absl")
75
-
- set(LIB_SUFF "lib")
72
+
-
76
73
+find_package(absl)
77
74
+
78
75
+if (NOT absl_FOUND)
···
115
112
+ set(LIB_SUFF "a")
116
113
+ endif()
117
114
+
115
+
-if (WIN32 OR MSVC)
116
+
- set(ABSEIL_LIB_PREF "absl")
117
+
- set(LIB_SUFF "lib")
118
118
+ # Link abseil static libs.
119
119
+ # We don't use find_library here to force cmake to build abseil before linking.
120
120
+ set(ABSEIL_LIBS int128 raw_hash_set raw_logging_internal strings throw_delegate)