]> git.uio.no Git - u/mrichter/AliRoot.git/commitdiff
Suppressed root warnings from HLT.
authorjjose <jjose@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 25 Aug 2010 10:56:50 +0000 (10:56 +0000)
committerjjose <jjose@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 25 Aug 2010 10:56:50 +0000 (10:56 +0000)
cmake/modules/CreateHLTSubCMakeFiles.cmake

index 75483fb866f163d60df7aa3c6c51f6f351a00ac2..973dba22f7b3c46ed7c0f1f8dd53a62dafbffe87 100644 (file)
@@ -517,7 +517,7 @@ Macro(CreateHLTMainCMakeFile path)
       file(APPEND ${FileName} "\${CMAKE_SOURCE_DIR}/${file}\n")
     EndIf(file MATCHES "^.*[$].*$")
   endforeach(file ${EINCLUDE_SUBDIR})
-  file(APPEND ${FileName} "\${ROOT_INCLUDE_DIR}\n")
+  
 
   if(${_dir} STREQUAL STEER OR ${_dir} STREQUAL TPC OR ${_dir} STREQUAL ALIROOT) 
     file(APPEND ${FileName} "\${CMAKE_BINARY_DIR}/STEER\n")
@@ -529,6 +529,7 @@ Macro(CreateHLTMainCMakeFile path)
 
   file(APPEND ${FileName} ")\n\n")
   file(APPEND ${FileName} "include_directories(\${INCLUDE_DIRECTORIES})\n\n")
+  file(APPEND ${FileName} "include_directories(SYSTEM \${ROOT_INCLUDE_DIR})\n\n")
   file(APPEND ${FileName} "set(LINK_DIRECTORIES\n")
   file(APPEND ${FileName} "\${ROOT_LIBRARY_DIR}\n")
   file(APPEND ${FileName} ")\n\n")
@@ -1242,8 +1243,6 @@ Macro(CreateHLTMainCMakeFile path)
       file(APPEND ${FileName} "\${CMAKE_SOURCE_DIR}/${file}\n")
     EndIf(file MATCHES "^.*[$].*$")
   endforeach(file ${EINCLUDE_SUBDIR})
-  file(APPEND ${FileName} "\${ROOT_INCLUDE_DIR}\n")
-
   if(${_dir} STREQUAL STEER OR ${_dir} STREQUAL TPC OR ${_dir} STREQUAL ALIROOT) 
     file(APPEND ${FileName} "\${CMAKE_BINARY_DIR}/STEER\n")
   endif(${_dir} STREQUAL STEER OR ${_dir} STREQUAL TPC OR ${_dir} STREQUAL ALIROOT) 
@@ -1254,6 +1253,7 @@ Macro(CreateHLTMainCMakeFile path)
 
   file(APPEND ${FileName} ")\n\n")
   file(APPEND ${FileName} "include_directories(\${INCLUDE_DIRECTORIES})\n\n")
+  file(APPEND ${FileName} "include_directories(SYSTEM \${ROOT_INCLUDE_DIR})\n\n")
   file(APPEND ${FileName} "set(LINK_DIRECTORIES\n")
   file(APPEND ${FileName} "\${ROOT_LIBRARY_DIR}\n")
   file(APPEND ${FileName} ")\n\n")