Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
nptool
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
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository 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
np
nptool
Commits
98f631c7
Commit
98f631c7
authored
4 years ago
by
Adrien Matta
Browse files
Options
Downloads
Patches
Plain Diff
* NPSProcess is no longer a library, but only target object for NPSCore
- Fix issue of compilation on Mac Os
parent
391ce8e3
No related branches found
No related tags found
No related merge requests found
Pipeline
#87647
passed
4 years ago
Stage: build-NPLib
Stage: build-NPSimulation
Stage: test
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
NPSimulation/CMakeLists.txt
+1
-1
1 addition, 1 deletion
NPSimulation/CMakeLists.txt
NPSimulation/Core/CMakeLists.txt
+2
-2
2 additions, 2 deletions
NPSimulation/Core/CMakeLists.txt
NPSimulation/Process/CMakeLists.txt
+3
-3
3 additions, 3 deletions
NPSimulation/Process/CMakeLists.txt
with
6 additions
and
6 deletions
NPSimulation/CMakeLists.txt
+
1
−
1
View file @
98f631c7
...
...
@@ -112,7 +112,7 @@ foreach(subdir ${SUB_DIRECTORY})
endforeach
()
add_executable
(
npsimulation Simulation.cc
)
target_Link_libraries
(
npsimulation
${
ROOT_LIBRARIES
}
${
Geant4_LIBRARIES
}
NPSCore NPSScorers
NPSProcess
)
target_Link_libraries
(
npsimulation
${
ROOT_LIBRARIES
}
${
Geant4_LIBRARIES
}
NPSCore NPSScorers
)
configure_file
(
ressources/macro/gui.mac.in ressources/macro/gui.mac @ONLY
)
configure_file
(
ressources/macro/aliases.mac.in ressources/macro/aliases.mac @ONLY
)
...
...
This diff is collapsed.
Click to expand it.
NPSimulation/Core/CMakeLists.txt
+
2
−
2
View file @
98f631c7
add_library
(
NPSCore SHARED $<TARGET_OBJECTS:NPSEventGenerator> EventAction.cc PrimaryGeneratorAction.cc Target.cc Chamber.cc PrimaryGeneratorActionMessenger.cc NPSVDetector.cc DetectorConstruction.cc MaterialManager.cc DetectorMessenger.cc MyMagneticField.cc SteppingVerbose.cc NPSDetectorFactory.cc RunAction.cc Particle.cc ParticleStack.cc NPSFunction.cc
)
target_link_libraries
(
NPSCore
${
ROOT_LIBRARIES
}
${
Geant4_LIBRARIES
}
${
NPLib_LIBRARIES
}
NPSScorers NPInitialConditions NPInteractionCoordinates
)
add_library
(
NPSCore SHARED $<TARGET_OBJECTS:NPSEventGenerator>
$<TARGET_OBJECTS:NPSProcess>
EventAction.cc PrimaryGeneratorAction.cc Target.cc Chamber.cc PrimaryGeneratorActionMessenger.cc NPSVDetector.cc DetectorConstruction.cc MaterialManager.cc DetectorMessenger.cc MyMagneticField.cc SteppingVerbose.cc NPSDetectorFactory.cc RunAction.cc Particle.cc ParticleStack.cc NPSFunction.cc
)
target_link_libraries
(
NPSCore
${
ROOT_LIBRARIES
}
${
Geant4_LIBRARIES
}
${
NPLib_LIBRARIES
}
NPSScorers NPInitialConditions NPInteractionCoordinates
NPReactionConditions NPFissionConditions
)
This diff is collapsed.
Click to expand it.
NPSimulation/Process/CMakeLists.txt
+
3
−
3
View file @
98f631c7
...
...
@@ -3,14 +3,14 @@ if(Geant4_VERSION_MAJOR GREATER 9)
if
(
Geant4_VERSION_MINOR GREATER 4
)
message
(
"Compiling with NeutronHPphysics"
)
add_library
(
NPSProcess
SHARED
FissionDecay.cc Decay.cc BeamReaction.cc FastDriftElectron.cc NPIonIonInelasticPhysic.cc PhysicsList.cc G4DriftElectron.cc G4IonizationWithDE.cc G4DriftElectronPhysics.cc G4DEAbsorption.cc G4DEAmplification.cc G4DETransport.cc menate_R.cc NeutronHPphysics.cc NeutronHPMessenger.cc
)
add_library
(
NPSProcess
OBJECT
FissionDecay.cc Decay.cc BeamReaction.cc FastDriftElectron.cc NPIonIonInelasticPhysic.cc PhysicsList.cc G4DriftElectron.cc G4IonizationWithDE.cc G4DriftElectronPhysics.cc G4DEAbsorption.cc G4DEAmplification.cc G4DETransport.cc menate_R.cc NeutronHPphysics.cc NeutronHPMessenger.cc
)
add_definitions
(
-DUSE_NEUTRONHP
)
else
()
message
(
"Compiling WITHOUT NeutronHPphysics, install geant4 10.5 or greater for this physics list"
)
add_library
(
NPSProcess
SHARED
FissionDecay.cc Decay.cc BeamReaction.cc FastDriftElectron.cc NPIonIonInelasticPhysic.cc PhysicsList.cc G4DriftElectron.cc G4IonizationWithDE.cc G4DriftElectronPhysics.cc G4DEAbsorption.cc G4DEAmplification.cc G4DETransport.cc menate_R.cc
)
add_library
(
NPSProcess
OBJECT
FissionDecay.cc Decay.cc BeamReaction.cc FastDriftElectron.cc NPIonIonInelasticPhysic.cc PhysicsList.cc G4DriftElectron.cc G4IonizationWithDE.cc G4DriftElectronPhysics.cc G4DEAbsorption.cc G4DEAmplification.cc G4DETransport.cc menate_R.cc
)
endif
()
endif
()
target_link_libraries
(
NPSProcess
${
ROOT_LIBRARIES
}
${
Geant4_LIBRARIES
}
NPSCore
${
NPLib_LIBRARIES
}
NPInitialConditions NPInteractionCoordinates NPReactionConditions NPFissionConditions
)
#
target_link_libraries(NPSProcess ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPSCore ${NPLib_LIBRARIES} NPInitialConditions NPInteractionCoordinates NPReactionConditions NPFissionConditions)
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