diff options
| author | Friedrich W. H. Kossebau <kossebau@kde.org> | 2017-06-17 15:19:58 +0200 |
|---|---|---|
| committer | Friedrich W. H. Kossebau <kossebau@kde.org> | 2017-06-17 19:54:04 +0200 |
| commit | ecfd2edc99e0b59ba1dfdb342b81e970985916a9 (patch) | |
| tree | 61e7bbc6d164a8aa1e7dde9d9c5fd00ed581583d | |
| parent | 9e81ef2b1a9f5b2e8049a704b5dcc7922e3eb339 (diff) | |
| download | extra-cmake-modules-ecfd2edc99e0b59ba1dfdb342b81e970985916a9.tar.gz extra-cmake-modules-ecfd2edc99e0b59ba1dfdb342b81e970985916a9.tar.bz2 | |
Drop perl as dep for ecm_add_qch, not needed/used
Cmp. https://bugzilla.gnome.org/show_bug.cgi?id=783759
| -rw-r--r-- | modules/ECMAddQch.cmake | 12 | ||||
| -rw-r--r-- | modules/ECMQchDoxygen.config.in | 1 |
2 files changed, 1 insertions, 12 deletions
diff --git a/modules/ECMAddQch.cmake b/modules/ECMAddQch.cmake index 3e853cb9..a1b515be 100644 --- a/modules/ECMAddQch.cmake +++ b/modules/ECMAddQch.cmake @@ -131,7 +131,7 @@ # CONFIG_TEMPLATE specifies a custom cmake template file for the config file # that is created to control the execution of the API dox generation tool. # The following CMake variables need to be used: -# ECM_QCH_DOXYGEN_PERL_EXECUTABLE, ECM_QCH_DOXYGEN_QHELPGENERATOR_EXECUTABLE, +# ECM_QCH_DOXYGEN_QHELPGENERATOR_EXECUTABLE, # ECM_QCH_DOXYGEN_FILEPATH, ECM_QCH_DOXYGEN_TAGFILE. # The following CMake variables can be used: # ECM_QCH_DOXYGEN_PROJECTNAME, ECM_QCH_DOXYGEN_PROJECTVERSION, @@ -427,12 +427,6 @@ function(ecm_add_qch target_name) endif() # find required tools - # TODO: check with doxygen author if perl is really still required, PERL_PATH seems unused in doxygen - find_package(Perl) - set_package_properties(Perl PROPERTIES - PURPOSE "Needed for API dox QCH file generation" - TYPE OPTIONAL - ) if (NOT DOXYGEN_PATCHED_JSFILESADDED) set(REQUIRED_DOXYGEN_VERSION 1.8.13) endif() @@ -451,9 +445,6 @@ function(ecm_add_qch target_name) DESCRIPTION "Part of Qt5 tools" ) set(_missing_tools) - if (NOT PERL_FOUND) - list(APPEND _missing_tools "Perl") - endif() if (NOT DOXYGEN_FOUND) list(APPEND _missing_tools "Doxygen") endif() @@ -600,7 +591,6 @@ function(ecm_add_qch target_name) else() set(ECM_QCH_DOXYGEN_QUIET "YES") endif() - set(ECM_QCH_DOXYGEN_PERL_EXECUTABLE "${PERL_EXECUTABLE}") set(ECM_QCH_DOXYGEN_QHELPGENERATOR_EXECUTABLE ${QHelpGenerator_EXECUTABLE}) # finally create doxygen config file diff --git a/modules/ECMQchDoxygen.config.in b/modules/ECMQchDoxygen.config.in index a00ad1a2..17ac74a4 100644 --- a/modules/ECMQchDoxygen.config.in +++ b/modules/ECMQchDoxygen.config.in @@ -156,7 +156,6 @@ SKIP_FUNCTION_MACROS = YES ALLEXTERNALS = NO EXTERNAL_GROUPS = YES TAGFILES = @ECM_QCH_DOXYGEN_TAGFILES@ -PERL_PATH = @ECM_QCH_DOXYGEN_PERL_EXECUTABLE@ #--------------------------------------------------------------------------- # Configuration options related to the dot tool #--------------------------------------------------------------------------- |