nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-29 02:13:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

python3Packages.dm-tree: Fix build

Browse Source
This commit is contained in:
Zig Uana 2023-01-17 17:35:02 -07:00 committed by Martin Weinelt
parent be83a2edc0
commit 0bf42f0b9b
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/python-modules/dm-tree/cmake.patch
View File

@ -1,13 +1,13 @@
diff --git a/tree/CMakeLists.txt b/tree/CMakeLists.txt diff --git a/tree/CMakeLists.txt b/tree/CMakeLists.txt
index 8f9946c..b9d6e9b 100644 index 4fd1b1a..f0d072b 100644
--- a/tree/CMakeLists.txt --- a/tree/CMakeLists.txt
+++ b/tree/CMakeLists.txt +++ b/tree/CMakeLists.txt
@@ -50,70 +50,80 @@ if(APPLE) @@ -50,70 +50,79 @@ if(APPLE)
set (CMAKE_FIND_FRAMEWORK LAST) set (CMAKE_FIND_FRAMEWORK LAST)
endif() endif()
-# Fetch pybind to be able to use pybind11_add_module symbol. -# Fetch pybind to be able to use pybind11_add_module symbol.
-set(PYBIND_VER v2.6.2) -set(PYBIND_VER v2.10.1)
-include(FetchContent) -include(FetchContent)
-FetchContent_Declare( -FetchContent_Declare(
- pybind11 - pybind11
@ -42,7 +42,7 @@ index 8f9946c..b9d6e9b 100644
+ +
+if (NOT pybind11_FOUND) +if (NOT pybind11_FOUND)
+ # Fetch pybind to be able to use pybind11_add_module symbol. + # Fetch pybind to be able to use pybind11_add_module symbol.
+ set(PYBIND_VER v2.6.2) + set(PYBIND_VER v2.10.1)
+ include(FetchContent) + include(FetchContent)
+ FetchContent_Declare( + FetchContent_Declare(
+ pybind11 + pybind11
@ -69,10 +69,7 @@ index 8f9946c..b9d6e9b 100644
# Define pybind11 tree module. # Define pybind11 tree module.
pybind11_add_module(_tree tree.h tree.cc) pybind11_add_module(_tree tree.h tree.cc)
-add_dependencies(_tree abseil-cpp) -add_dependencies(_tree abseil-cpp)
-
-if (WIN32 OR MSVC)
- set(ABSEIL_LIB_PREF "absl")
- set(LIB_SUFF "lib")
+find_package(absl) +find_package(absl)
+ +
+if (NOT absl_FOUND) +if (NOT absl_FOUND)
@ -115,6 +112,9 @@ index 8f9946c..b9d6e9b 100644
+ set(LIB_SUFF "a") + set(LIB_SUFF "a")
+ endif() + endif()
+ +
-if (WIN32 OR MSVC)
- set(ABSEIL_LIB_PREF "absl")
- set(LIB_SUFF "lib")
+ # Link abseil static libs. + # Link abseil static libs.
+ # We don't use find_library here to force cmake to build abseil before linking. + # We don't use find_library here to force cmake to build abseil before linking.
+ set(ABSEIL_LIBS int128 raw_hash_set raw_logging_internal strings throw_delegate) + set(ABSEIL_LIBS int128 raw_hash_set raw_logging_internal strings throw_delegate)