[BACK]Return to patch-CMakeLists.txt CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / ham / uhd / patches
File: [cvs.NetBSD.org] / pkgsrc / ham / uhd / patches / patch-CMakeLists.txt (download)

Revision 1.3, Wed Apr 8 08:07:17 2020 UTC (4 years ago) by adam
Branch: MAIN
CVS Tags: pkgsrc-2021Q3-base, pkgsrc-2021Q3, pkgsrc-2021Q2-base, pkgsrc-2021Q2, pkgsrc-2021Q1-base, pkgsrc-2021Q1, pkgsrc-2020Q4-base, pkgsrc-2020Q4, pkgsrc-2020Q3-base, pkgsrc-2020Q3, pkgsrc-2020Q2-base, pkgsrc-2020Q2
Changes since 1.2: +19 -5 lines 

uhd: fix building when py-numpy is also installed; docs/CMakeLists.txt is not necessary any more

$NetBSD: patch-CMakeLists.txt,v 1.3 2020/04/08 08:07:17 adam Exp $

Allow overrides on PKG_MAN_DIR.
https://github.com/EttusResearch/uhd/issues/301

Do not use Numpy.

--- CMakeLists.txt.orig	2020-01-01 04:21:49.000000000 +0000
+++ CMakeLists.txt
@@ -124,8 +124,9 @@ endif()
 if(NOT DEFINED PKG_DOC_DIR)
     set(PKG_DOC_DIR share/doc/uhd)
 endif()
+if(NOT DEFINED PKG_MAN_DIR)
 set(PKG_MAN_DIR share/man/man1)
-
+endif()
 ########################################################################
 # UHD config files
 ########################################################################
@@ -329,11 +330,6 @@ PYTHON_CHECK_MODULE(
     HAVE_PYTHON_MODULE_REQUESTS
 )
 
-PYTHON_CHECK_MODULE(
-    "numpy ${NUMPY_MIN_VERSION} or greater"
-    "numpy" "LooseVersion(numpy.__version__) >= LooseVersion('${NUMPY_MIN_VERSION}')"
-    HAVE_PYTHON_MODULE_NUMPY
-)
 
 ########################################################################
 # Create Uninstall Target