IAP GITLAB

Skip to content
Snippets Groups Projects
Commit af99a43e authored by Ralf Ulrich's avatar Ralf Ulrich
Browse files

Merge branch 'coast_fix' into 'master'

Coast fix

See merge request AirShowerPhysics/corsika!151
parents 20f26a72 e78c44f6
No related branches found
No related tags found
No related merge requests found
...@@ -129,18 +129,15 @@ if (WITH_EIGEN3) ...@@ -129,18 +129,15 @@ if (WITH_EIGEN3)
string (TOLOWER ${WITH_EIGEN3} WITH_EIGEN3_LOWER) string (TOLOWER ${WITH_EIGEN3} WITH_EIGEN3_LOWER)
if (WITH_EIGEN3_LOWER EQUAL "system") if (WITH_EIGEN3_LOWER EQUAL "system")
find_package (Eigen3 REQUIRED) find_package (Eigen3 REQUIRED)
message ("opt1")
else () else ()
list (APPEND CMAKE_MODULE_PATH "${WITH_EIGEN3}/cmake") list (APPEND CMAKE_MODULE_PATH "${WITH_EIGEN3}/cmake")
set (EIGEN3_INCLUDE_DIR "${WITH_EIGEN3}" CACHE PATH "eigen3 directory") set (EIGEN3_INCLUDE_DIR "${WITH_EIGEN3}" CACHE PATH "eigen3 directory")
find_package (Eigen3 REQUIRED) find_package (Eigen3 REQUIRED)
message ("opt2")
endif () endif ()
else (WITH_EIGEN3) else (WITH_EIGEN3)
list (APPEND CMAKE_MODULE_PATH "${LOCAL_Eigen3_VERSION}/cmake") list (APPEND CMAKE_MODULE_PATH "${LOCAL_Eigen3_VERSION}/cmake")
set (EIGEN3_INCLUDE_DIR "${LOCAL_Eigen3_VERSION}" CACHE PATH "eigen3 directory") set (EIGEN3_INCLUDE_DIR "${LOCAL_Eigen3_VERSION}" CACHE PATH "eigen3 directory")
find_package (Eigen3 REQUIRED) find_package (Eigen3 REQUIRED)
message ("op3")
endif (WITH_EIGEN3) endif (WITH_EIGEN3)
# some final info output # some final info output
......
...@@ -13,8 +13,6 @@ ...@@ -13,8 +13,6 @@
#include <corsika/particles/ParticleProperties.h> #include <corsika/particles/ParticleProperties.h>
#include <bitset2/bitset2.hpp>
#include <map> #include <map>
namespace corsika::coast { namespace corsika::coast {
......
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