IAP GITLAB
Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
corsika
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Air Shower Physics
corsika
Commits
4f66134d
Commit
4f66134d
authored
2 years ago
by
Maximilian Reininghaus
Browse files
Options
Downloads
Patches
Plain Diff
fix build when C8_FLUKALIB is undefined
parent
a771abab
No related branches found
No related tags found
1 merge request
!468
Resolve "Add FLUKA"
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
modules/fluka/CMakeLists.txt
+10
-10
10 additions, 10 deletions
modules/fluka/CMakeLists.txt
src/modules/fluka/strip_flukahp.sh
+5
-0
5 additions, 0 deletions
src/modules/fluka/strip_flukahp.sh
tests/modules/CMakeLists.txt
+1
-1
1 addition, 1 deletion
tests/modules/CMakeLists.txt
with
16 additions
and
11 deletions
modules/fluka/CMakeLists.txt
+
10
−
10
View file @
4f66134d
set
(
C8_FLUKALIB CACHE STRING
"path to libflukahp.a"
)
set
(
C8_FLUKALIB CACHE STRING
"path to libflukahp.a"
)
if
(
DEFINED
C8_FLUKALIB
)
if
(
EXISTS
"
${
C8_FLUKALIB
}
"
)
set
(
input_dir
${
PROJECT_SOURCE_DIR
}
/src/modules/fluka
)
set
(
input_dir
${
PROJECT_SOURCE_DIR
}
/src/modules/fluka
)
# we remove flrndm_.o from the original libflukahp.a and save the result as libflukahp-norndm.a
# we remove flrndm_.o from the original libflukahp.a and save the result as libflukahp-norndm.a
add_custom_command
(
OUTPUT
${
CMAKE_BINARY_DIR
}
/libflukahp-norndm.a COMMAND
${
input_dir
}
/strip_flukahp.sh
${
C8_FLUKALIB
}
${
CMAKE_BINARY_DIR
}
)
add_custom_command
(
add_custom_target
(
generate_libfluka-norndm DEPENDS
${
CMAKE_BINARY_DIR
}
/libflukahp-norndm.a
)
OUTPUT
${
CMAKE_CURRENT_BINARY_DIR
}
/libflukahp-norndm.a
COMMAND
${
input_dir
}
/strip_flukahp.sh
${
C8_FLUKALIB
}
${
CMAKE_CURRENT_BINARY_DIR
}
)
add_custom_target
(
generate_libfluka-norndm DEPENDS
${
CMAKE_CURRENT_BINARY_DIR
}
/libflukahp-norndm.a
)
add_library
(
flukahp-norndm STATIC IMPORTED
)
add_library
(
flukahp-norndm STATIC IMPORTED
)
add_dependencies
(
flukahp-norndm generate_libfluka-norndm
)
add_dependencies
(
flukahp-norndm generate_libfluka-norndm
)
set_property
(
TARGET flukahp-norndm PROPERTY IMPORTED_LOCATION
${
CMAKE_BINARY_DIR
}
/libflukahp-norndm.a
)
set_property
(
TARGET flukahp-norndm PROPERTY IMPORTED_LOCATION
${
CMAKE_CURRENT_BINARY_DIR
}
/libflukahp-norndm.a
)
find_library
(
MATH_LIBRARY m
)
find_library
(
MATH_LIBRARY m
)
target_link_libraries
(
flukahp-norndm INTERFACE gfortran
${
MATH_LIBRARY
}
)
target_link_libraries
(
flukahp-norndm INTERFACE gfortran
${
MATH_LIBRARY
}
)
target_include_directories
(
flukahp-norndm INTERFACE
target_include_directories
(
flukahp-norndm INTERFACE
...
@@ -29,12 +33,6 @@ if (DEFINED C8_FLUKALIB)
...
@@ -29,12 +33,6 @@ if (DEFINED C8_FLUKALIB)
$<INSTALL_INTERFACE:include/corsika_modules/fluka>
$<INSTALL_INTERFACE:include/corsika_modules/fluka>
)
)
set_target_properties
(
fluka
PROPERTIES
POSITION_INDEPENDENT_CODE 1
)
install
(
install
(
FILES
FILES
fluka.hpp
fluka.hpp
...
@@ -51,4 +49,6 @@ if (DEFINED C8_FLUKALIB)
...
@@ -51,4 +49,6 @@ if (DEFINED C8_FLUKALIB)
# add fluka to corsika8 build
# add fluka to corsika8 build
add_dependencies
(
CORSIKA8 fluka
)
add_dependencies
(
CORSIKA8 fluka
)
target_link_libraries
(
CORSIKA8 INTERFACE fluka
)
target_link_libraries
(
CORSIKA8 INTERFACE fluka
)
else
()
message
(
"C8_FLUKALIB not set/invalid, building without FLUKA support"
)
endif
()
endif
()
This diff is collapsed.
Click to expand it.
src/modules/fluka/strip_flukahp.sh
+
5
−
0
View file @
4f66134d
...
@@ -14,6 +14,11 @@
...
@@ -14,6 +14,11 @@
flukalibOrig
=
"
$1
"
flukalibOrig
=
"
$1
"
target
=
"
$2
"
target
=
"
$2
"
if
[
!
-r
"
$flukalibOrig
"
]
;
then
echo
"
\"
$flukalibOrig
\"
not readable"
1>&2
exit
1
fi
tmpdir
=
`
mktemp
-d
fluka_objectsXXXXXX
`
tmpdir
=
`
mktemp
-d
fluka_objectsXXXXXX
`
echo
"extracting objects from
$1
into
`
realpath
$tmpdir
`
..."
echo
"extracting objects from
$1
into
`
realpath
$tmpdir
`
..."
...
...
This diff is collapsed.
Click to expand it.
tests/modules/CMakeLists.txt
+
1
−
1
View file @
4f66134d
...
@@ -17,7 +17,7 @@ set (test_modules_sources
...
@@ -17,7 +17,7 @@ set (test_modules_sources
testSophia.cpp
testSophia.cpp
)
)
if
(
DEFINED
C8_FLUKALIB
)
if
(
EXISTS
"
${
C8_FLUKALIB
}
"
)
list
(
APPEND test_modules_sources
"testFluka.cpp"
)
list
(
APPEND test_modules_sources
"testFluka.cpp"
)
endif
()
endif
()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment