From 0056b9dd13dba32a37a628db0dc24493b344fb0a Mon Sep 17 00:00:00 2001 From: Marcus Burghardt Date: Thu, 23 May 2024 12:21:35 +0200 Subject: [PATCH] Move find_python_modules calls after find_program --- CMakeLists.txt | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3dc1ad56895..24e47b02902 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -144,6 +144,19 @@ endif() find_package(PythonInterp REQUIRED) find_package(OpenSCAP REQUIRED) +find_program(ANSIBLE_LINT_EXECUTABLE NAMES ansible-lint) +find_program(ANSIBLE_PLAYBOOK_EXECUTABLE NAMES ansible-playbook) +find_program(BATS_EXECUTABLE NAMES bats) +find_program(GIT_EXECUTABLE NAMES git) +find_program(GREP_EXECUTABLE NAMES grep) +find_program(LINKCHECKER_EXECUTABLE NAMES linkchecker) +find_program(PYTHON3_EXECUTABLE NAMES python3) +find_program(SED_EXECUTABLE NAMES sed REQUIRED) +find_program(SHELLCHECK_EXECUTABLE NAMES shellcheck) +find_program(XMLLINT_EXECUTABLE NAMES xmllint REQUIRED) +find_program(XSLTPROC_EXECUTABLE NAMES xsltproc REQUIRED) +find_program(YAMLLINT_EXECUTABLE NAMES yamllint) + message(STATUS "") message(STATUS "Find Python Modules:") set(Python_ADDITIONAL_VERSIONS 3 2) @@ -179,19 +192,6 @@ find_python_module(prometheus_client) find_python_module(requests) find_python_module(trestle) -find_program(ANSIBLE_LINT_EXECUTABLE NAMES ansible-lint) -find_program(ANSIBLE_PLAYBOOK_EXECUTABLE NAMES ansible-playbook) -find_program(BATS_EXECUTABLE NAMES bats) -find_program(GIT_EXECUTABLE NAMES git) -find_program(GREP_EXECUTABLE NAMES grep) -find_program(LINKCHECKER_EXECUTABLE NAMES linkchecker) -find_program(PYTHON3_EXECUTABLE NAMES python3) -find_program(SED_EXECUTABLE NAMES sed REQUIRED) -find_program(SHELLCHECK_EXECUTABLE NAMES shellcheck) -find_program(XMLLINT_EXECUTABLE NAMES xmllint REQUIRED) -find_program(XSLTPROC_EXECUTABLE NAMES xsltproc REQUIRED) -find_program(YAMLLINT_EXECUTABLE NAMES yamllint) - if(NOT SSG_TARGET_OVAL_VERSION VERSION_EQUAL "5.11") message(WARNING "You are targeting OVAL version ${SSG_TARGET_OVAL_VERSION}. In SSG we support/test 5.11 only!") endif()