Skip to content
Snippets Groups Projects
Commit aa2fff97 authored by Adrien Matta's avatar Adrien Matta :skull_crossbones:
Browse files

* Fixing NPTOOL_DETLIST issue in NPSimulation

parent 8fcd0a1d
No related branches found
No related tags found
No related merge requests found
...@@ -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()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment