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

* Fixing the DETLIST token

        - It is now called NPTOOL_DETLIST to avoid confusion
parent c8399b29
No related branches found
No related tags found
No related merge requests found
Pipeline #163296 failed
......@@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 3.0)
include(CheckCXXCompilerFlag)
project(NPLib CXX)
set(CMAKE_BUILD_TYPE Release)
set (CMAKE_CXX_STANDARD 20)
# Setting the policy to match Cmake version
cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
......@@ -36,13 +36,12 @@ configure_file(scripts/build_dict.sh.in scripts/build_dict.sh @ONLY)
configure_file(Core/NPLibVersion.h.in Core/NPLibVersion.h @ONLY)
set(DETLIST ${ETLIST})
string(COMPARE EQUAL "${DETLIST}" "" rdet)
string(COMPARE EQUAL "${NPTOOL_DETLIST}" "" rdet)
if(rdet)
message("Building all detectors")
else()
message("Building the following detectors ${DETLIST}")
message("Building the following detectors ${NPTOOL_DETLIST}")
endif()
set(CMAKE_BINARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )
......@@ -61,10 +60,10 @@ MACRO(subdirlist result curdir)
string(REPLACE "Detectors/" "" det ${child})
IF(NOT r0 AND NOT r1)
string(COMPARE EQUAL "${DETLIST}" "" r2)
string(COMPARE EQUAL "${NPTOOL_DETLIST}" "" r2)
IF(r2)
LIST(APPEND dirlist ${child})
ELSEIF(${DETLIST} MATCHES ".*${det}.*" )
ELSEIF(${NPTOOL_DETLIST} MATCHES ".*${det}.*" )
LIST(APPEND dirlist ${child})
ENDIF()
ENDIF()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment