From f8ef1e8743beff8afd59aa25a780ca190533be77 Mon Sep 17 00:00:00 2001
From: ralfulrich <ralf.ulrich@kit.edu>
Date: Tue, 30 Apr 2019 23:34:10 +0200
Subject: [PATCH] path
---
Framework/Utilities/CMakeLists.txt | 2 +-
ThirdParty/CMakeLists.txt | 12 +++++++++++-
Tools/coverage.sh | 4 ++--
3 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/Framework/Utilities/CMakeLists.txt b/Framework/Utilities/CMakeLists.txt
index 763c534f..ae19a82b 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 4eb0c174..f19fd9c9 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 75feeffc..ab3c7801 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
--
GitLab