From da4b22f37eb8a27bdff9c6bae095ba44dfbb6f99 Mon Sep 17 00:00:00 2001
From: adrien-matta <a.matta@surrey.ac.uk>
Date: Mon, 14 Sep 2015 19:03:41 +0100
Subject: [PATCH] * Adding more npa correction
---
NPAnalysis/Hira2/CMakeLists.txt | 7 -------
NPAnalysis/S1554/CMakeLists.txt | 7 -------
NPAnalysis/Sharc/CMakeLists.txt | 7 -------
NPAnalysis/newHira/CMakeLists.txt | 7 -------
4 files changed, 28 deletions(-)
diff --git a/NPAnalysis/Hira2/CMakeLists.txt b/NPAnalysis/Hira2/CMakeLists.txt
index f0a199fcc..d5c6bef00 100644
--- a/NPAnalysis/Hira2/CMakeLists.txt
+++ b/NPAnalysis/Hira2/CMakeLists.txt
@@ -17,13 +17,6 @@ link_directories( ${ROOT_LIBRARY_DIR})
include_directories( ${NPTOOL_INCLUDE_DIR})
link_directories( ${NPTOOL_LIB_DIR})
-# Get the compilator flag from root to assure consistancy
-EXEC_PROGRAM(${ROOT_CONFIG_EXECUTABLE}
- ARGS "--cflags"
- OUTPUT_VARIABLE root_cflags )
-
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${root_cflags}")
-
# If the compiler is Clang, silence the unrecognised flags
if(${CMAKE_CXX_COMPILER_ID} MATCHES ".*Clang.*")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Qunused-arguments -undefined dynamic_lookup")
diff --git a/NPAnalysis/S1554/CMakeLists.txt b/NPAnalysis/S1554/CMakeLists.txt
index e07924d6a..9da475e9b 100644
--- a/NPAnalysis/S1554/CMakeLists.txt
+++ b/NPAnalysis/S1554/CMakeLists.txt
@@ -15,13 +15,6 @@ link_directories( ${ROOT_LIBRARY_DIR})
include_directories( ${NPTOOL_INCLUDE_DIR})
link_directories( ${NPTOOL_LIB_DIR})
-# Get the compilator flag from root to assure consistancy
-EXEC_PROGRAM(${ROOT_CONFIG_EXECUTABLE}
- ARGS "--cflags"
- OUTPUT_VARIABLE root_cflags )
-
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${root_cflags}")
-
# If the compiler is Clang, silence the unrecognised flags
if(${CMAKE_CXX_COMPILER_ID} MATCHES ".*Clang.*")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Qunused-arguments -undefined dynamic_lookup")
diff --git a/NPAnalysis/Sharc/CMakeLists.txt b/NPAnalysis/Sharc/CMakeLists.txt
index 1d6a34417..aee8f55af 100644
--- a/NPAnalysis/Sharc/CMakeLists.txt
+++ b/NPAnalysis/Sharc/CMakeLists.txt
@@ -15,13 +15,6 @@ link_directories( ${ROOT_LIBRARY_DIR})
include_directories( ${NPTOOL_INCLUDE_DIR})
link_directories( ${NPTOOL_LIB_DIR})
-# Get the compilator flag from root to assure consistancy
-EXEC_PROGRAM(${ROOT_CONFIG_EXECUTABLE}
- ARGS "--cflags"
- OUTPUT_VARIABLE root_cflags )
-
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${root_cflags}")
-
# If the compiler is Clang, silence the unrecognised flags
if(${CMAKE_CXX_COMPILER_ID} MATCHES ".*Clang.*")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Qunused-arguments -undefined dynamic_lookup")
diff --git a/NPAnalysis/newHira/CMakeLists.txt b/NPAnalysis/newHira/CMakeLists.txt
index 08575f4c3..575de4920 100644
--- a/NPAnalysis/newHira/CMakeLists.txt
+++ b/NPAnalysis/newHira/CMakeLists.txt
@@ -15,13 +15,6 @@ link_directories( ${ROOT_LIBRARY_DIR})
include_directories( ${NPTOOL_INCLUDE_DIR})
link_directories( ${NPTOOL_LIB_DIR})
-# Get the compilator flag from root to assure consistancy
-EXEC_PROGRAM(${ROOT_CONFIG_EXECUTABLE}
- ARGS "--cflags"
- OUTPUT_VARIABLE root_cflags )
-
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${root_cflags}")
-
# If the compiler is Clang, silence the unrecognised flags
if(${CMAKE_CXX_COMPILER_ID} MATCHES ".*Clang.*")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Qunused-arguments -undefined dynamic_lookup")
--
GitLab