From 96370e32a3ee9e22e800065d0d7854643b8adbe4 Mon Sep 17 00:00:00 2001 From: Uli Schlachter Date: Sun, 17 Apr 2016 16:10:18 +0200 Subject: [PATCH] Use a_find_program() instead of find_program() a_find_program() prints some status, making it easier to see what was found and was not. Signed-off-by: Uli Schlachter --- CMakeLists.txt | 4 ++-- Packaging.cmake | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 69b823c0..14a06e02 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -365,7 +365,7 @@ add_custom_target(check-integration WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} COMMENT "Running integration tests" VERBATIM) -find_program(BUSTED_EXECUTABLE busted) +a_find_program(BUSTED_EXECUTABLE busted FALSE) if(BUSTED_EXECUTABLE) # Keep the arguments in sync with the version below! add_custom_target(check-unit ALL @@ -386,7 +386,7 @@ if(BUSTED_EXECUTABLE) COMMENT "Running unit tests under LuaCov" VERBATIM) endif() -find_program(LUACHECK_EXECUTABLE luacheck) +a_find_program(LUACHECK_EXECUTABLE luacheck FALSE) if(LUACHECK_EXECUTABLE) add_custom_target(luacheck ${LUACHECK_EXECUTABLE} lib spec tests themes awesomerc.lua diff --git a/Packaging.cmake b/Packaging.cmake index 404a6ca7..e676ae25 100644 --- a/Packaging.cmake +++ b/Packaging.cmake @@ -40,13 +40,13 @@ message(STATUS "Package version will be set to ${version_num}${version_gitsuffix set(CPACK_PACKAGE_VERSION "${version_num}${version_gitsuffix}") if(NOT CPACK_GENERATOR) - find_program(rpmbuild_path "rpmbuild") + a_find_program(rpmbuild_path "rpmbuild" FALSE) if(rpmbuild_path) message(STATUS "rpmbuild found, enabling RPM for the 'package' target") list(APPEND CPACK_GENERATOR RPM) endif(rpmbuild_path) - find_program(dpkg_path "dpkg") + a_find_program(dpkg_path "dpkg" FALSE) if (dpkg_path) message(STATUS "dpkg found, enabling DEB for the 'package' target") list(APPEND CPACK_GENERATOR DEB)