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
01009e9c
Commit
01009e9c
authored
4 years ago
by
Ralf M Ulrich
Committed by
Ralf Ulrich
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
spdlog with PIC
parent
b4025210
No related branches found
No related tags found
1 merge request
!245
Include proposal process rebase
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.gitmodules
+3
-0
3 additions, 0 deletions
.gitmodules
Processes/Proposal/CMakeLists.txt
+6
-12
6 additions, 12 deletions
Processes/Proposal/CMakeLists.txt
Processes/Proposal/PROPOSAL
+1
-0
1 addition, 0 deletions
Processes/Proposal/PROPOSAL
ThirdParty/CMakeLists.txt
+3
-1
3 additions, 1 deletion
ThirdParty/CMakeLists.txt
with
13 additions
and
13 deletions
.gitmodules
+
3
−
0
View file @
01009e9c
...
...
@@ -6,3 +6,6 @@
path = ThirdParty/spdlog
url = https://github.com/gabime/spdlog.git
shallow = true
[submodule "Processes/Proposal/PROPOSAL"]
path = Processes/Proposal/PROPOSAL
url = https://github.com/tudo-astroparticlephysics/PROPOSAL.git
This diff is collapsed.
Click to expand it.
Processes/Proposal/CMakeLists.txt
+
6
−
12
View file @
01009e9c
# find_package(PROPOSAL REQUIRED ${LIB_INCLUDE})
set
(
ADD_PYTHON OFF
)
# for proposal
set
(
BUILD_TESTING OFF
)
# for proposal
add_subdirectory
(
PROPOSAL
)
unset
(
ADD_PYTHON
)
unset
(
BUILD_TESTING
)
FILE
(
GLOB MODEL_SOURCES *.cc
)
FILE
(
GLOB MODEL_HEADERS *.h
)
...
...
@@ -10,7 +13,6 @@ CORSIKA_COPY_HEADERS_TO_NAMESPACE (ProcessProposal ${MODEL_NAMESPACE} ${MODEL_HE
SET_TARGET_PROPERTIES
(
ProcessProposal PROPERTIES VERSION
${
PROJECT_VERSION
}
SOVERSION 1
# PUBLIC_HEADER "${MODEL_HEADERS}"
)
TARGET_LINK_LIBRARIES
(
...
...
@@ -21,7 +23,7 @@ TARGET_LINK_LIBRARIES (
CORSIKAthirdparty
CORSIKAgeometry
CORSIKAenvironment
${
PROPOSAL
_LIBRARY
}
PROPOSAL
::PROPOSAL
)
TARGET_INCLUDE_DIRECTORIES
(
...
...
@@ -31,16 +33,8 @@ TARGET_INCLUDE_DIRECTORIES (
$<INSTALL_INTERFACE:include/include>
)
TARGET_INCLUDE_DIRECTORIES
(
ProcessProposal
SYSTEM
PUBLIC
${
PROPOSAL_INCLUDE_DIR
}
INTERFACE
${
PROPOSAL_INCLUDE_DIR
}
)
INSTALL
(
TARGETS ProcessProposal
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
# PUBLIC_HEADER DESTINATION include/${MODEL_NAMESPACE}
)
This diff is collapsed.
Click to expand it.
PROPOSAL
@
db516bd3
Subproject commit db516bd34ea00e8f8711b364a49d87e913ccdaaa
This diff is collapsed.
Click to expand it.
ThirdParty/CMakeLists.txt
+
3
−
1
View file @
01009e9c
...
...
@@ -18,7 +18,9 @@ mark_as_advanced (ThirdPartyChoiceValues)
##############################################################################
# Build spdlog
add_subdirectory
(
spdlog
)
set
(
CMAKE_POSITION_INDEPENDENT_CODE ON
)
# this is needed for PROPOSAL... since it is dynamic
add_subdirectory
(
spdlog
)
unset
(
CMAKE_POSITION_INDEPENDENT_CODE
)
##############################################################################
# check for boost: either use C8 or system-level installation
...
...
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