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
Admin message
Gitlab has been updated. More info
here
and
there
.
Show more breadcrumbs
np
nptool
Commits
60606bc3
Commit
60606bc3
authored
7 years ago
by
Adrien Matta
Browse files
Options
Downloads
Patches
Plain Diff
* Fixing compilation issue with Modular Leaf on recent Mac Os X
parent
ca1ed4c4
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
NPLib/Detectors/ModularLeaf/CMakeLists.txt
+2
-1
2 additions, 1 deletion
NPLib/Detectors/ModularLeaf/CMakeLists.txt
NPLib/Detectors/ModularLeaf/TModularLeafPhysics.cxx
+1
-1
1 addition, 1 deletion
NPLib/Detectors/ModularLeaf/TModularLeafPhysics.cxx
with
3 additions
and
2 deletions
NPLib/Detectors/ModularLeaf/CMakeLists.txt
+
2
−
1
View file @
60606bc3
add_library
(
NPModularLeaf SHARED TModularLeafPhysics.cxx
)
add_custom_command
(
OUTPUT TModularLeafPhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TModularLeafPhysics.h TModularLeafPhysicsDict.cxx TModularLeafPhysics.rootmap libNPModularLeaf.dylib DEPENDS TModularLeafPhysics.h
)
add_library
(
NPModularLeaf SHARED TModularLeafPhysics.cxx TModularLeafPhysicsDict.cxx
)
target_link_libraries
(
NPModularLeaf
${
ROOT_LIBRARIES
}
NPCore
)
target_link_libraries
(
NPModularLeaf
${
ROOT_LIBRARIES
}
NPCore
)
install
(
FILES TModularLeafPhysics.h DESTINATION
${
CMAKE_INCLUDE_OUTPUT_DIRECTORY
}
)
install
(
FILES TModularLeafPhysics.h DESTINATION
${
CMAKE_INCLUDE_OUTPUT_DIRECTORY
}
)
This diff is collapsed.
Click to expand it.
NPLib/Detectors/ModularLeaf/TModularLeafPhysics.cxx
+
1
−
1
View file @
60606bc3
...
@@ -176,6 +176,6 @@ class proxy_modularleaf{
...
@@ -176,6 +176,6 @@ class proxy_modularleaf{
}
}
};
};
proxy_modularleaf
p
;
proxy_modularleaf
p
_modularleaf
;
}
}
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