awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #833 from psychon/cmake-output 

More cmake output
This commit is contained in:
Daniel Hahler 2016-04-18 00:34:51 +02:00
parent 3fe85a8f05 7d866318c4
commit 8cfdc0c593
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -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

8
Packaging.cmake
View File

@ -40,16 +40,20 @@ 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)
else(rpmbuild_path)
message(STATUS "The 'package' target will not build a 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)
else(dpkg_path)
message(STATUS "The 'package' target will not build a DEB")
endif(dpkg_path) endif(dpkg_path)
endif(NOT CPACK_GENERATOR) endif(NOT CPACK_GENERATOR)