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 <psychon@znc.in>
This commit is contained in:
parent
3e75e800ad
commit
96370e32a3
|
@ -365,7 +365,7 @@ add_custom_target(check-integration
|
||||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
|
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
|
||||||
COMMENT "Running integration tests"
|
COMMENT "Running integration tests"
|
||||||
VERBATIM)
|
VERBATIM)
|
||||||
find_program(BUSTED_EXECUTABLE busted)
|
a_find_program(BUSTED_EXECUTABLE busted FALSE)
|
||||||
if(BUSTED_EXECUTABLE)
|
if(BUSTED_EXECUTABLE)
|
||||||
# Keep the arguments in sync with the version below!
|
# Keep the arguments in sync with the version below!
|
||||||
add_custom_target(check-unit ALL
|
add_custom_target(check-unit ALL
|
||||||
|
@ -386,7 +386,7 @@ if(BUSTED_EXECUTABLE)
|
||||||
COMMENT "Running unit tests under LuaCov"
|
COMMENT "Running unit tests under LuaCov"
|
||||||
VERBATIM)
|
VERBATIM)
|
||||||
endif()
|
endif()
|
||||||
find_program(LUACHECK_EXECUTABLE luacheck)
|
a_find_program(LUACHECK_EXECUTABLE luacheck FALSE)
|
||||||
if(LUACHECK_EXECUTABLE)
|
if(LUACHECK_EXECUTABLE)
|
||||||
add_custom_target(luacheck
|
add_custom_target(luacheck
|
||||||
${LUACHECK_EXECUTABLE} lib spec tests themes awesomerc.lua
|
${LUACHECK_EXECUTABLE} lib spec tests themes awesomerc.lua
|
||||||
|
|
|
@ -40,13 +40,13 @@ message(STATUS "Package version will be set to ${version_num}${version_gitsuffix
|
||||||
set(CPACK_PACKAGE_VERSION "${version_num}${version_gitsuffix}")
|
set(CPACK_PACKAGE_VERSION "${version_num}${version_gitsuffix}")
|
||||||
|
|
||||||
if(NOT CPACK_GENERATOR)
|
if(NOT CPACK_GENERATOR)
|
||||||
find_program(rpmbuild_path "rpmbuild")
|
a_find_program(rpmbuild_path "rpmbuild" FALSE)
|
||||||
if(rpmbuild_path)
|
if(rpmbuild_path)
|
||||||
message(STATUS "rpmbuild found, enabling RPM for the 'package' target")
|
message(STATUS "rpmbuild found, enabling RPM for the 'package' target")
|
||||||
list(APPEND CPACK_GENERATOR RPM)
|
list(APPEND CPACK_GENERATOR RPM)
|
||||||
endif(rpmbuild_path)
|
endif(rpmbuild_path)
|
||||||
|
|
||||||
find_program(dpkg_path "dpkg")
|
a_find_program(dpkg_path "dpkg" FALSE)
|
||||||
if (dpkg_path)
|
if (dpkg_path)
|
||||||
message(STATUS "dpkg found, enabling DEB for the 'package' target")
|
message(STATUS "dpkg found, enabling DEB for the 'package' target")
|
||||||
list(APPEND CPACK_GENERATOR DEB)
|
list(APPEND CPACK_GENERATOR DEB)
|
||||||
|
|
Loading…
Reference in New Issue