diff options
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/FindIntltool.cmake | 2 | ||||
| -rw-r--r-- | cmake/GCov.cmake | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cmake/FindIntltool.cmake b/cmake/FindIntltool.cmake index 45318c4..69ffab9 100644 --- a/cmake/FindIntltool.cmake +++ b/cmake/FindIntltool.cmake @@ -17,7 +17,7 @@ if (INTLTOOL_MERGE_FOUND) ${INTLTOOL_MERGE_EXECUTABLE} --desktop-style ${CMAKE_SOURCE_DIR}/${po_dir} ${CMAKE_CURRENT_SOURCE_DIR}/${desktop_id}.desktop.in ${desktop_id}.desktop ) - install (FILES ${CMAKE_CURRENT_BINARY_DIR}/geary.desktop DESTINATION /usr/share/applications) + install (FILES ${CMAKE_CURRENT_BINARY_DIR}/geary.desktop DESTINATION /usr/share/applications) endmacro (INTLTOOL_MERGE_DESKTOP desktop_id po_dir) endif (INTLTOOL_MERGE_FOUND) diff --git a/cmake/GCov.cmake b/cmake/GCov.cmake index 81c0c40..9a5086e 100644 --- a/cmake/GCov.cmake +++ b/cmake/GCov.cmake @@ -12,7 +12,7 @@ if (CMAKE_BUILD_TYPE MATCHES coverage) message(STATUS "Gcovr found, can generate XML coverage info.") add_custom_target (coverage-xml WORKING_DIRECTORY ${CMAKE_BINARY_DIR} - COMMAND "${GCOVR_EXECUTABLE}" --exclude="test.*" -x -r "${CMAKE_SOURCE_DIR}" + COMMAND "${GCOVR_EXECUTABLE}" --exclude="test.*" -x -r "${CMAKE_SOURCE_DIR}" --object-directory=${CMAKE_BINARY_DIR} -o coverage.xml) endif() @@ -36,7 +36,7 @@ if (CMAKE_BUILD_TYPE MATCHES coverage) COMMAND ${CMAKE_COMMAND} -E echo "") #COMMAND "${LCOV_EXECUTABLE}" --directory ${CMAKE_BINARY_DIR} --capture --output-file coverage.info --no-checksum #COMMAND "${GENHTML_EXECUTABLE}" --prefix ${CMAKE_BINARY_DIR} --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info - #COMMAND ${CMAKE_COMMAND} -E echo "\\#define foo \\\"bar\\\"" + #COMMAND ${CMAKE_COMMAND} -E echo "\\#define foo \\\"bar\\\"" #) endif() endif() |