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
aa2fff97
Commit
aa2fff97
authored
3 years ago
by
Adrien Matta
Browse files
Options
Downloads
Patches
Plain Diff
* Fixing NPTOOL_DETLIST issue in NPSimulation
parent
8fcd0a1d
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
NPSimulation/CMakeLists.txt
+5
-5
5 additions, 5 deletions
NPSimulation/CMakeLists.txt
with
5 additions
and
5 deletions
NPSimulation/CMakeLists.txt
+
5
−
5
View file @
aa2fff97
...
@@ -45,13 +45,13 @@ add_definitions(${Geant4_DEFINITIONS})
...
@@ -45,13 +45,13 @@ add_definitions(${Geant4_DEFINITIONS})
configure_file
(
Core/NPSimulationVersion.hh.in Core/NPSimulationVersion.hh @ONLY
)
configure_file
(
Core/NPSimulationVersion.hh.in Core/NPSimulationVersion.hh @ONLY
)
# Detector List
# Detector List
set
(
DETLIST
${
NPLib_DETECTOR_LIST
}
)
set
(
NPTOOL_
DETLIST
${
NPLib_DETECTOR_LIST
}
)
string
(
COMPARE EQUAL
"
${
DETLIST
}
"
""
rdet
)
string
(
COMPARE EQUAL
"
${
NPTOOL_
DETLIST
}
"
""
rdet
)
if
(
rdet
)
if
(
rdet
)
message
(
"Building all detectors"
)
message
(
"Building all detectors"
)
else
()
else
()
message
(
"Building the following detectors
${
DETLIST
}
"
)
message
(
"Building the following detectors
${
NPTOOL_
DETLIST
}
"
)
endif
()
endif
()
# Add root to the link and include directories
# Add root to the link and include directories
...
@@ -84,10 +84,10 @@ MACRO(subdirlist result curdir)
...
@@ -84,10 +84,10 @@ MACRO(subdirlist result curdir)
string
(
REPLACE
"Detectors/"
""
det
${
child
}
)
string
(
REPLACE
"Detectors/"
""
det
${
child
}
)
IF
(
NOT r0 AND NOT r1
)
IF
(
NOT r0 AND NOT r1
)
string
(
COMPARE EQUAL
"
${
DETLIST
}
"
""
r2
)
string
(
COMPARE EQUAL
"
${
NPTOOL_
DETLIST
}
"
""
r2
)
IF
(
r2
)
IF
(
r2
)
LIST
(
APPEND dirlist
${
child
}
)
LIST
(
APPEND dirlist
${
child
}
)
ELSEIF
(
${
DETLIST
}
MATCHES
".*
${
det
}
.*"
)
ELSEIF
(
${
NPTOOL_
DETLIST
}
MATCHES
".*
${
det
}
.*"
)
LIST
(
APPEND dirlist
${
child
}
)
LIST
(
APPEND dirlist
${
child
}
)
ENDIF
()
ENDIF
()
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