diff options
author | Petr Mrázek <peterix@gmail.com> | 2014-04-21 23:33:00 +0200 |
---|---|---|
committer | Petr Mrázek <peterix@gmail.com> | 2014-04-21 23:33:00 +0200 |
commit | 9d724e0fe4bfb7b7940f3f0c9719affd22a18722 (patch) | |
tree | c73e9566e134d2b78e6f1b8bce3c32159b17675f /tests/CMakeLists.txt | |
parent | a9dfe6d7ec949954b07facff71ee6023e0ced9ee (diff) | |
parent | a00fb1e8da505768b491e5f4d6266784fb1a27c9 (diff) | |
download | MultiMC-9d724e0fe4bfb7b7940f3f0c9719affd22a18722.tar MultiMC-9d724e0fe4bfb7b7940f3f0c9719affd22a18722.tar.gz MultiMC-9d724e0fe4bfb7b7940f3f0c9719affd22a18722.tar.lz MultiMC-9d724e0fe4bfb7b7940f3f0c9719affd22a18722.tar.xz MultiMC-9d724e0fe4bfb7b7940f3f0c9719affd22a18722.zip |
Merge remote-tracking branch 'origin/feature_cmake_style' into develop
Conflicts:
CMakeLists.txt
Diffstat (limited to 'tests/CMakeLists.txt')
-rw-r--r-- | tests/CMakeLists.txt | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 2236e8fc..3b2b8b74 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -8,7 +8,7 @@ macro(add_unit_test name) unset(srcs) foreach(arg ${testname} ${ARGN}) list(APPEND srcs ${CMAKE_CURRENT_SOURCE_DIR}/${arg}) - if (WIN32) + if(WIN32) list(APPEND srcs ${CMAKE_CURRENT_SOURCE_DIR}/test.rc) endif() endforeach() @@ -30,19 +30,19 @@ add_unit_test(DownloadUpdateTask tst_DownloadUpdateTask.cpp) # Tests END # set(COVERAGE_SOURCE_DIRS - ${MMC_SRC}/logic/* - ${MMC_SRC}/logic/auth/* - ${MMC_SRC}/logic/auth/flows/* - ${MMC_SRC}/logic/lists/* - ${MMC_SRC}/logic/net/* - ${MMC_SRC}/logic/tasks/* - ${MMC_SRC}/gui/* - ${MMC_SRC}/gui/dialogs/* - ${MMC_SRC}/gui/widgets/* - ${MMC_SRC}/depends/settings/include/* - ${MMC_SRC}/depends/settings/src/* - ${MMC_SRC}/depends/util/include/* - ${MMC_SRC}/depends/util/src/* + ${MMC_SRC}/logic/* + ${MMC_SRC}/logic/auth/* + ${MMC_SRC}/logic/auth/flows/* + ${MMC_SRC}/logic/lists/* + ${MMC_SRC}/logic/net/* + ${MMC_SRC}/logic/tasks/* + ${MMC_SRC}/gui/* + ${MMC_SRC}/gui/dialogs/* + ${MMC_SRC}/gui/widgets/* + ${MMC_SRC}/depends/settings/include/* + ${MMC_SRC}/depends/settings/src/* + ${MMC_SRC}/depends/util/include/* + ${MMC_SRC}/depends/util/src/* ) if(MultiMC_CODE_COVERAGE) @@ -51,7 +51,7 @@ if(MultiMC_CODE_COVERAGE) foreach(test ${MultiMC_TESTS}) add_custom_target(MultiMC_RUN_TEST_${test} - COMMAND lcov -d ${CMAKE_CURRENT_BINARY_DIR} -z -q # clean test + COMMAND lcov -d ${CMAKE_CURRENT_BINARY_DIR} -z -q # clean test && lcov -d ${MMC_BIN} -z -q # clean common && lcov -d ${MMC_BIN}/depends/settings/CMakeFiles/libSettings.dir -z -q # clean settings && lcov -d ${MMC_BIN}/depends/utils/CMakeFiles/libUtil.dir -z -q # clean utils @@ -64,23 +64,23 @@ if(MultiMC_CODE_COVERAGE) -a coverage_${test}.info -a coverage_common.info -a coverage_settings.info -a coverage_utils.info -o coverage_${test}-combined.info # combine test and common && lcov -q --checksum -b ${MMC_SRC} --list-full-path --extract coverage_${test}-combined.info ${COVERAGE_SOURCE_DIRS} -o coverage_${test}-stripped.info # strip - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - VERBATIM - DEPENDS ${test} - COMMENT "Running ${test}..." + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + VERBATIM + DEPENDS ${test} + COMMENT "Running ${test}..." ) list(APPEND MultiMC_TEST_COVERAGE_FILES coverage_${test}-stripped.info) list(APPEND MultiMC_RUN_TESTS MultiMC_RUN_TEST_${test}) endforeach(test) add_custom_target(MultiMC_GENERATE_COVERAGE - DEPENDS ${MultiMC_RUN_TESTS} - COMMENT "Generating coverage files..." + DEPENDS ${MultiMC_RUN_TESTS} + COMMENT "Generating coverage files..." ) add_custom_target(MultiMC_GENERATE_COVERAGE_HTML - COMMAND genhtml -t "MultiMC 5 Test Coverage" --num-spaces 4 --demangle-cpp --legend -o ${MMC_SRC}/html/coverage ${MultiMC_TEST_COVERAGE_FILES} - DEPENDS MultiMC_GENERATE_COVERAGE - COMMENT "Generating test coverage html..." + COMMAND genhtml -t "MultiMC 5 Test Coverage" --num-spaces 4 --demangle-cpp --legend -o ${MMC_SRC}/html/coverage ${MultiMC_TEST_COVERAGE_FILES} + DEPENDS MultiMC_GENERATE_COVERAGE + COMMENT "Generating test coverage html..." ) add_custom_target(MultiMC_RUN_TESTS DEPENDS MultiMC_GENERATE_COVERAGE_HTML) endif(MultiMC_CODE_COVERAGE) |