From 01c9aa1e76857bf22771342dadf87af08979aa33 Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Thu, 9 Aug 2018 10:59:32 -0500 Subject: Update Drop Site options and Coverage settings --- CMakeLists.txt | 11 ++++++++--- CTestConfig.cmake | 21 ++++++++++++++++----- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index eb860d2..4cdb31c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -443,9 +443,14 @@ endif () #----------------------------------------------------------------------------- option (HDF5_ENABLE_COVERAGE "Enable code coverage for Libraries and Programs" OFF) if (HDF5_ENABLE_COVERAGE) - set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage") - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage") - set (LDFLAGS "${LDFLAGS} -fprofile-arcs -ftest-coverage") + set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0 --coverage -fprofile-arcs -ftest-coverage") + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g --coverage -O0 -fprofile-arcs -ftest-coverage") + if (CMAKE_C_COMPILER_ID STREQUAL "GNU") + set (LDFLAGS "${LDFLAGS} -fprofile-arcs -ftest-coverage") + link_libraries (gcov) + else () + set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --coverage") + endif () endif () #----------------------------------------------------------------------------- diff --git a/CTestConfig.cmake b/CTestConfig.cmake index 6bad67e..5b35688 100644 --- a/CTestConfig.cmake +++ b/CTestConfig.cmake @@ -19,12 +19,23 @@ set (CTEST_PROJECT_NAME "HDF5") set (CTEST_NIGHTLY_START_TIME "18:00:00 CST") set (CTEST_DROP_METHOD "http") -if (CDASH_LOCAL) - set (CTEST_DROP_SITE "cdash-internal.hdfgroup.org") - set (CTEST_DROP_LOCATION "/submit.php?project=HDF5Trunk") +if (CTEST_DROP_SITE_INIT) + set (CTEST_DROP_SITE "${CTEST_DROP_SITE_INIT}") else () - set (CTEST_DROP_SITE "cdash.hdfgroup.org") - set (CTEST_DROP_LOCATION "/submit.php?project=HDF5") + if (CDASH_LOCAL) + set (CTEST_DROP_SITE "cdash-internal.hdfgroup.org") + else () + set (CTEST_DROP_SITE "cdash.hdfgroup.org") + endif () +endif () +if (CTEST_DROP_LOCATION_INIT) + set (CTEST_DROP_LOCATION "${CTEST_DROP_LOCATION_INIT}") +else () + if (CDASH_LOCAL) + set (CTEST_DROP_LOCATION "/submit.php?project=HDF5Trunk") + else () + set (CTEST_DROP_LOCATION "/submit.php?project=HDF5") + endif () endif () set (CTEST_DROP_SITE_CDASH TRUE) -- cgit v0.12