From 4ae80cb820ff32e26c0845e355778417ecf9abf3 Mon Sep 17 00:00:00 2001
From: adrien matta <matta@lpccaen.in2p3.fr>
Date: Tue, 17 Jul 2018 11:12:05 +0200
Subject: [PATCH] * Fixing NPMULTITHREADING option handling and message
---
NPLib/CMakeLists.txt | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/NPLib/CMakeLists.txt b/NPLib/CMakeLists.txt
index c6cdab947..fd1349561 100644
--- a/NPLib/CMakeLists.txt
+++ b/NPLib/CMakeLists.txt
@@ -19,12 +19,18 @@ configure_file(Core/NPLibVersion.h.in Core/NPLibVersion.h @ONLY)
set(DETLIST ${ETLIST})
#activate Multithreading (on by default)
-if(NOT NPMULTITHREADING)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNPMULTITHREADING=0")
+if(NOT DEFINED NPMULTITHREADING)
+ set(NPMULTITHREADING 1)
+ else()
+ set(NPMULTITHREADING ${NPMULTITHREADING})
+endif()
+
+if(NPMULTITHREADING)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNPMULTITHREADING=1")
message("Building application with MultiThreading Support")
else()
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNPMULTITHREADING=1")
- message("Building application with MutilThreading Support")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNPMULTITHREADING=0")
+ message("Building application with no MutilThreading Support")
endif()
--
GitLab