summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2018-08-09 16:09:36 (GMT)
committerLarry Knox <lrknox@hdfgroup.org>2018-08-09 16:09:36 (GMT)
commit9c52453657e6e5409aebc40a5997e5eea4e23958 (patch)
tree6d361ba9040e4126ae1a4095dc3db748393e046f
parentb5c6121a5d288264f9207fa48cbb132715ea546a (diff)
parent01c9aa1e76857bf22771342dadf87af08979aa33 (diff)
downloadhdf5-9c52453657e6e5409aebc40a5997e5eea4e23958.zip
hdf5-9c52453657e6e5409aebc40a5997e5eea4e23958.tar.gz
hdf5-9c52453657e6e5409aebc40a5997e5eea4e23958.tar.bz2
Merge pull request #1185 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '01c9aa1e76857bf22771342dadf87af08979aa33': Update Drop Site options and Coverage settings
-rw-r--r--CMakeLists.txt11
-rw-r--r--CTestConfig.cmake21
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)