mirror of https://github.com/CGAL/cgal
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:
commit
7998432056
|
|
@ -26,14 +26,9 @@ else()
|
|||
set(CGAL_ROOT "${CMAKE_SOURCE_DIR}")
|
||||
endif()
|
||||
|
||||
find_package(Doxygen)
|
||||
find_package(Doxygen REQUIRED)
|
||||
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
|
||||
if(TARGET Doxygen::doxygen)
|
||||
get_property(
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
#!/bin/sh
|
||||
|
||||
exec ${PYTHON_EXECUTABLE} ${CMAKE_BINARY_DIR}/pkglist_filter.py "$1"
|
||||
exec ${Python3_EXECUTABLE} ${CMAKE_BINARY_DIR}/pkglist_filter.py "$1"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
@echo off
|
||||
|
||||
:go
|
||||
${PYTHON_EXECUTABLE} ${CMAKE_BINARY_DIR}/pkglist_filter.py %1
|
||||
${Python3_EXECUTABLE} ${CMAKE_BINARY_DIR}/pkglist_filter.py %1
|
||||
|
||||
@echo on
|
||||
|
|
|
|||
Loading…
Reference in New Issue