diff --git a/Framework/Utilities/CMakeLists.txt b/Framework/Utilities/CMakeLists.txt index 763c534f1c6df580d04211e0d29f87588758418a..ae19a82b992210f6bb17e618fd1f3d27196c64de 100644 --- a/Framework/Utilities/CMakeLists.txt +++ b/Framework/Utilities/CMakeLists.txt @@ -4,7 +4,7 @@ try_compile (HAS_FEENABLEEXCEPT "${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/try_feenableexcept.cc") if (HAS_FEENABLEEXCEPT) set (CORSIKA_FENV "CorsikaFenvDefault.cc") - set_property(DIRECTORY ${CMAKE_HOME_DIRECTORY} APPEND PROPERTY COMPILE_DEFINITIONS "HAS_FEENABLEEXCEPT") + set_property(DIRECTORY ${CMAKE_SOURCE_DIR} APPEND PROPERTY COMPILE_DEFINITIONS "HAS_FEENABLEEXCEPT") else () if (APPLE) set (CORSIKA_FENV "CorsikaFenvOSX.cc") diff --git a/ThirdParty/CMakeLists.txt b/ThirdParty/CMakeLists.txt index 4eb0c17439854330bd88ee7c3589ca2c0cddf07d..f19fd9c9b6a2e8127e1310064170f456f7531899 100644 --- a/ThirdParty/CMakeLists.txt +++ b/ThirdParty/CMakeLists.txt @@ -9,4 +9,14 @@ target_include_directories (CORSIKAthirdparty SYSTEM install (DIRECTORY phys DESTINATION include/ThirdParty/) install (DIRECTORY catch2 DESTINATION include/ThirdParty/) -install (DIRECTORY boost DESTINATION include/ThirdParty/boost/) \ No newline at end of file +install (DIRECTORY boost DESTINATION include/ThirdParty/boost/) + +install( + DIRECTORY lcov/bin + DESTINATION share/tools/lcov/ + USE_SOURCE_PERMISSIONS + PATTERN "example" EXCLUDE + PATTERN "man" EXCLUDE + PATTERN "test" EXCLUDE + PATTERN "rpm" EXCLUDE +) diff --git a/Tools/coverage.sh b/Tools/coverage.sh index 75feeffcaf95b59379b03723bccca9785497ad72..ab3c7801d11315691a77b648468adf54a00b5e80 100755 --- a/Tools/coverage.sh +++ b/Tools/coverage.sh @@ -4,8 +4,8 @@ if [ -z $GCOV ]; then GCOV=gcov fi -PROJECT_DIR="$(dirname $0)/../" -LCOV_DIR="${PROJECT_DIR}/ThirdParty/lcov" +PROJECT_DIR="$(dirname $0)/" +LCOV_DIR="${PROJECT_DIR}/lcov/" # LCOV="$LCOV_EXE --gcov-tool=${GCOV} --rc lcov_branch_coverage=1" LCOV="${LCOV_DIR}/bin/lcov --gcov-tool=${GCOV}" # no branch coverage