From cafbeb130cf074887d5291a45bf2ca77e55c8ec4 Mon Sep 17 00:00:00 2001
From: ralfulrich <ralf.ulrich@kit.edu>
Date: Mon, 17 Jun 2019 06:25:42 +0200
Subject: [PATCH] fixed order in cmake files
---
CMakeLists.txt | 32 +++++++++++++++++++------------
Framework/Geometry/CMakeLists.txt | 10 +++++-----
2 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2ab53f79a..234cc565d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -121,38 +121,46 @@ if (WITH_PYTHIA)
find_package (Pythia8) # optional
endif (WITH_PYTHIA)
-# order of subdirectories
+# include potential ThirdParty code provided with CORSIKA
add_subdirectory (ThirdParty)
-add_subdirectory (Framework)
-add_subdirectory (Environment)
-add_subdirectory (Stack)
-add_subdirectory (Setup)
-add_subdirectory (Processes)
-add_subdirectory (Documentation)
-add_subdirectory (Main)
-add_subdirectory (Tools)
-if (WITH_COAST)
- add_subdirectory (COAST)
-endif ()
# check for Eigen3: either use ThirdParty/eigen3 or system-level installation
if (WITH_EIGEN3)
string (TOLOWER ${WITH_EIGEN3} WITH_EIGEN3_LOWER)
if (WITH_EIGEN3_LOWER EQUAL "system")
find_package (Eigen3 REQUIRED)
+ message ("opt1")
else ()
list (APPEND CMAKE_MODULE_PATH "${WITH_EIGEN3}/cmake")
set (EIGEN3_INCLUDE_DIR "${WITH_EIGEN3}" CACHE PATH "eigen3 directory")
find_package (Eigen3 REQUIRED)
+ message ("opt2")
endif ()
else (WITH_EIGEN3)
list (APPEND CMAKE_MODULE_PATH "${LOCAL_Eigen3_VERSION}/cmake")
set (EIGEN3_INCLUDE_DIR "${LOCAL_Eigen3_VERSION}" CACHE PATH "eigen3 directory")
find_package (Eigen3 REQUIRED)
+ message ("op3")
endif (WITH_EIGEN3)
# some final info output
message ("Use eigen3 version: ${EIGEN3_VERSION} from ${EIGEN3_INCLUDE_DIR}")
+
+# order of subdirectories
+add_subdirectory (Framework)
+add_subdirectory (Environment)
+add_subdirectory (Stack)
+add_subdirectory (Setup)
+add_subdirectory (Processes)
+add_subdirectory (Documentation)
+add_subdirectory (Main)
+add_subdirectory (Tools)
+if (WITH_COAST)
+ add_subdirectory (COAST)
+endif ()
+
+
+# final summary output
include (FeatureSummary)
feature_summary (WHAT ALL)
diff --git a/Framework/Geometry/CMakeLists.txt b/Framework/Geometry/CMakeLists.txt
index 39d4fb984..252e64e68 100644
--- a/Framework/Geometry/CMakeLists.txt
+++ b/Framework/Geometry/CMakeLists.txt
@@ -45,15 +45,15 @@ target_link_libraries (
target_include_directories (
CORSIKAgeometry
- SYSTEM
- PUBLIC ${EIGEN3_INCLUDE_DIR}
+ INTERFACE
+ $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
+ $<INSTALL_INTERFACE:include/include>
)
target_include_directories (
CORSIKAgeometry
- INTERFACE
- $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
- $<INSTALL_INTERFACE:include/include>
+ SYSTEM
+ PUBLIC "${EIGEN3_INCLUDE_DIR}"
)
install (
--
GitLab