IAP GITLAB

Skip to content
Snippets Groups Projects
Commit 897f1a8c authored by Lukas Nellen's avatar Lukas Nellen :footprints:
Browse files

Merge branch 'code-and-cmake-cleanup' into 'master'

Code and cmake cleanup

See merge request AirShowerPhysics/corsika!94

Tested manually in different containers to verify version compatibility.
parents 70f7c7ee 1ce1e7fb
No related branches found
No related tags found
No related merge requests found
...@@ -44,8 +44,14 @@ target_link_libraries ( ...@@ -44,8 +44,14 @@ target_link_libraries (
target_include_directories ( target_include_directories (
CORSIKAgeometry CORSIKAgeometry
SYSTEM
PUBLIC ${EIGEN3_INCLUDE_DIR} PUBLIC ${EIGEN3_INCLUDE_DIR}
INTERFACE ${EIGEN3_INCLUDE_DIR} INTERFACE ${EIGEN3_INCLUDE_DIR}
)
target_include_directories (
CORSIKAgeometry
INTERFACE
$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include> $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
$<INSTALL_INTERFACE:include/include> $<INSTALL_INTERFACE:include/include>
) )
......
...@@ -27,7 +27,7 @@ set_target_properties ( ...@@ -27,7 +27,7 @@ set_target_properties (
PROPERTIES PROPERTIES
VERSION ${PROJECT_VERSION} VERSION ${PROJECT_VERSION}
SOVERSION 1 SOVERSION 1
PUBLIC_HEADER "${MODEL_HEADERS}" # PUBLIC_HEADER "${MODEL_HEADERS}"
) )
# target dependencies on other libraries (also the header onlys) # target dependencies on other libraries (also the header onlys)
...@@ -48,17 +48,12 @@ target_include_directories ( ...@@ -48,17 +48,12 @@ target_include_directories (
$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include> $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
$<INSTALL_INTERFACE:include/include> $<INSTALL_INTERFACE:include/include>
) )
# do it again, since we want -isystem for pythia exteranls
target_include_directories (
ProcessPythia
SYSTEM PUBLIC
${PYTHIA8_INCLUDE_DIR}
)
target_include_directories ( target_include_directories (
ProcessPythia ProcessPythia
PRIVATE SYSTEM
${PYTHIA8_INCLUDE_DIR} PUBLIC ${PYTHIA8_INCLUDE_DIR}
INTERFACE ${PYTHIA8_INCLUDE_DIR}
) )
install ( install (
......
...@@ -15,6 +15,8 @@ ...@@ -15,6 +15,8 @@
#include <corsika/particles/ParticleProperties.h> #include <corsika/particles/ParticleProperties.h>
#include <corsika/process/DecayProcess.h> #include <corsika/process/DecayProcess.h>
#include <vector>
namespace corsika::process { namespace corsika::process {
namespace sibyll { namespace sibyll {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment