IAP GITLAB
Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
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
Package registry
Model registry
Operate
Environments
Terraform modules
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
Pranav Sampathkumar
corsika
Commits
ceb513da
Commit
ceb513da
authored
4 years ago
by
Ralf M Ulrich
Browse files
Options
Downloads
Patches
Plain Diff
adapt to new corsika-data
parent
c17a8101
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
ThirdParty/CMakeLists.txt
+10
-29
10 additions, 29 deletions
ThirdParty/CMakeLists.txt
with
10 additions
and
29 deletions
ThirdParty/CMakeLists.txt
+
10
−
29
View file @
ceb513da
...
...
@@ -228,14 +228,6 @@ endif (NOT (${USE_CONEX_C8} IN_LIST ThirdPartyChoiceValues))
message
(
STATUS
"USE_CONEX_C8='
${
USE_CONEX_C8
}
'"
)
add_library
(
C8::ext::conex STATIC IMPORTED GLOBAL
)
# this is from the corsika-data/readLib submodule:
get_directory_property
(
Boost_IOSTREAMS_FOUND DIRECTORY
${
CORSIKA_DATA
}
/readLib DEFINITION Boost_IOSTREAMS_FOUND
)
set
(
conex_boost
""
)
set
(
boost_lib
"boost_iostreams"
)
if
(
NOT Boost_IOSTREAMS_FOUND
)
set
(
conex_boost
"NO_BOOST=1"
)
set
(
boost_lib
""
)
endif
(
NOT Boost_IOSTREAMS_FOUND
)
if
(
"x_
${
USE_CONEX_C8
}
"
STREQUAL
"x_SYSTEM"
)
find_package
(
CONEX REQUIRED
)
...
...
@@ -260,7 +252,7 @@ else ()
SOURCE_DIR
${
CMAKE_CURRENT_BINARY_DIR
}
/cxroot/source
INSTALL_DIR
${
CMAKE_CURRENT_BINARY_DIR
}
/cxroot/source
CONFIGURE_COMMAND
""
BUILD_COMMAND make CX_NO_ROOT=1 CORSIKA_8=1
${
conex_boost
}
CORSIKA_DATA=
${
CORSIKA_DATA
}
all
BUILD_COMMAND make CX_NO_ROOT=1 CORSIKA_8=1 CORSIKA_DATA=
${
CORSIKA_DATA
}
all
INSTALL_COMMAND
""
BUILD_IN_SOURCE ON
EXCLUDE_FROM_ALL TRUE
...
...
@@ -278,26 +270,15 @@ else ()
endif
()
if
(
Boost_IOSTREAMS_FOUND
)
set_target_properties
(
C8::ext::conex PROPERTIES
IMPORTED_LOCATION
${
CONEX_PREFIX
}
/lib/
${
CMAKE_SYSTEM_NAME
}
/libCONEXsibyll.a
IMPORTED_NO_SONAME 1
SKIP_BUILD_RPATH FALSE
IMPORTED_LINK_INTERFACE_LIBRARIES boost_iostreams
INTERFACE_INCLUDE_DIRECTORIES
$<BUILD_INTERFACE:
${
CONEX_INCLUDE_DIR
}
>
)
else
(
Boost_IOSTREAMS_FOUND
)
set_target_properties
(
C8::ext::conex PROPERTIES
IMPORTED_LOCATION
${
CONEX_PREFIX
}
/lib/
${
CMAKE_SYSTEM_NAME
}
/libCONEXsibyll.a
IMPORTED_NO_SONAME 1
SKIP_BUILD_RPATH FALSE
INTERFACE_INCLUDE_DIRECTORIES
$<BUILD_INTERFACE:
${
CONEX_INCLUDE_DIR
}
>
)
endif
(
Boost_IOSTREAMS_FOUND
)
set_target_properties
(
C8::ext::conex PROPERTIES
IMPORTED_LOCATION
${
CONEX_PREFIX
}
/lib/
${
CMAKE_SYSTEM_NAME
}
/libCONEXsibyll.a
IMPORTED_NO_SONAME 1
SKIP_BUILD_RPATH FALSE
IMPORTED_LINK_INTERFACE_LIBRARIES bz2
INTERFACE_INCLUDE_DIRECTORIES
$<BUILD_INTERFACE:
${
CONEX_INCLUDE_DIR
}
>
)
# libz needed for cnpy, used for SaveHistograms
...
...
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