songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7199 from sloriot/CGAL-doc_python_pkg_filter 

pkg_filter use detected python version

# Conflicts:
#	Documentation/doc/CMakeLists.txt
This commit is contained in:
Laurent Rineau 2023-01-27 20:55:07 +01:00
parent 6b0c4bdcc8 271cad9d3d
commit 7998432056
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Documentation/doc/CMakeLists.txt
View File

@ -26,14 +26,9 @@ else()
set(CGAL_ROOT "${CMAKE_SOURCE_DIR}") set(CGAL_ROOT "${CMAKE_SOURCE_DIR}")
endif() endif()
find_package(Doxygen) find_package(Doxygen REQUIRED)
find_package(Python3 REQUIRED COMPONENTS Interpreter) find_package(Python3 REQUIRED COMPONENTS Interpreter)
if(NOT DOXYGEN_FOUND)
message(WARNING "Cannot build the documentation without Doxygen!")
return()
endif()
#starting from cmake 3.9 the usage of DOXYGEN_EXECUTABLE is deprecated #starting from cmake 3.9 the usage of DOXYGEN_EXECUTABLE is deprecated
if(TARGET Doxygen::doxygen) if(TARGET Doxygen::doxygen)
get_property( get_property(

2
Documentation/doc/scripts/pkglist_filter
View File

@ -1,3 +1,3 @@
#!/bin/sh #!/bin/sh
exec ${PYTHON_EXECUTABLE} ${CMAKE_BINARY_DIR}/pkglist_filter.py "$1" exec ${Python3_EXECUTABLE} ${CMAKE_BINARY_DIR}/pkglist_filter.py "$1"

2
Documentation/doc/scripts/pkglist_filter.bat
View File

@ -1,6 +1,6 @@
@echo off @echo off
:go :go
${PYTHON_EXECUTABLE} ${CMAKE_BINARY_DIR}/pkglist_filter.py %1 ${Python3_EXECUTABLE} ${CMAKE_BINARY_DIR}/pkglist_filter.py %1
@echo on @echo on