Bas Couwenberg pushed to branch master at Debian GIS Project / saga


Commits:
63c1b649 by Bas Couwenberg at 2023-12-21T13:55:40+01:00
Replace python.patch with upstream changes.

- - - - -


1 changed file:

- debian/patches/python.patch


Changes:

=====================================
debian/patches/python.patch
=====================================
@@ -1,15 +1,20 @@
-Description: Fix PySAGA installation path.
-Author: Bas Couwenberg <[email protected]>
-Forwarded: https://sourceforge.net/p/saga-gis/bugs/314/
+Description:: cmake, PySAGA: make PySAGA installation path configurable 
(-DPYTHON_INSTALL_DIR=directory); if not given, we default to ; see also 
[bugs:#314]
+Author: Volker Wichmann <[email protected]>
+Origin: 
https://sourceforge.net/p/saga-gis/code/ci/da8a96282b6c37dda805cc4732055d8168b556f2/
+Bug: https://sourceforge.net/p/saga-gis/bugs/314/
 
 --- a/saga-gis/src/saga_core/saga_api/saga_api_python/CMakeLists.txt
 +++ b/saga-gis/src/saga_core/saga_api/saga_api_python/CMakeLists.txt
-@@ -74,7 +74,7 @@ if(SWIG_FOUND)
+@@ -74,7 +74,11 @@ if(SWIG_FOUND)
                        )
                else()
                        set_property(TARGET saga_api_python PROPERTY 
OUTPUT_NAME saga_api)
 -                      set(PYTHON_INSTALL_DIR 
${CMAKE_INSTALL_LIBDIR}/python${Python_VERSION_MAJOR}.${Python_VERSION_MINOR}/site-packages)
-+                      set(PYTHON_INSTALL_DIR ${Python_SITEARCH})
++
++                      if(NOT PYTHON_INSTALL_DIR)
++                              set(PYTHON_INSTALL_DIR ${Python_SITEARCH} CACHE 
STRING "PySAGA installation path")
++                      endif()
++
                        option(WITH_PYTHON_PKG "PySAGA package installation (if 
not checked API modules become installed directly in Python's 
site/dist-packages folder)" ON)
  
                        if(WITH_PYTHON_PKG)



View it on GitLab: 
https://salsa.debian.org/debian-gis-team/saga/-/commit/63c1b649d178fc35238ea5b77af0775aa2b2d010

-- 
View it on GitLab: 
https://salsa.debian.org/debian-gis-team/saga/-/commit/63c1b649d178fc35238ea5b77af0775aa2b2d010
You're receiving this email because of your account on salsa.debian.org.


_______________________________________________
Pkg-grass-devel mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to