correct event rejection and initialisation

[u/mrichter/AliRoot.git] / cmake / ALICE_CMake.cmake

diff --git a/cmake/ALICE_CMake.cmake b/cmake/ALICE_CMake.cmake
index 2e3ec7dd5cc8380114a338cbf07cd14b47622257..2eb39c6a556733b0188c3b68a358c166225a2f7a 100644 (file)
--- a/cmake/ALICE_CMake.cmake
+++ b/cmake/ALICE_CMake.cmake
@@ -5,7 +5,7 @@
 # Author: Johny Jose (johny.jose@cern.ch)
 #         Port of previous Makefile build to cmake
 
-cmake_minimum_required(VERSION 2.8.4 FATAL_ERROR)
+cmake_minimum_required(VERSION 2.8.8 FATAL_ERROR)
 
 macro(ALICE_DevFlagsOutput)
 
@@ -135,6 +135,10 @@ macro(ALICE_ConfigureCompiler)
   endif(ALIPROFILE STREQUAL "YES")
 
   ALICE_RootConfig(RCFLAGS --auxcflags)
+  if ( CMAKE_CXX_COMPILER MATCHES "clang") 
+  string(REPLACE "-pthread" " " RCFLAGS "${RCFLAGS}")
+  endif ( CMAKE_CXX_COMPILER MATCHES "clang") 
+
   ALICE_RootConfig(RLFLAGS --ldflags)
 
   set(CXXFLAGS "${CXXFLAGS} ${RCFLAGS}")
@@ -450,7 +454,7 @@ macro(ALICE_BuildLibrary)
   include_directories(SYSTEM ${ROOTINCDIR})
   include_directories(${PINC})  
   include_directories(${EINCLUDE})
-  include_directories(${CMAKE_INCLUDE_EXPORT_DIRECTORY})
+  include_directories(${CMAKE_INCLUDE_EXPORT_DIRECTORY}/FromTemplate)
   include_directories(${CMAKE_SOURCE_DIR})
   
   add_library(${PACKAGE} SHARED ${PCS} ${PFS} ${PS} ${PDS})
@@ -609,14 +613,14 @@ macro(ALICE_BuildPAR)
   
   if(EXISTS ${CMAKE_SOURCE_DIR}/${MODULE}/PROOF-INF.${PACKAGE})
     set(PARSRCS)
-    foreach(file ${SRCS} ${HDRS} ${FSRCS} ${DHDR})
+    foreach(file ${SRCS} ${HDRS} ${FSRCS} ${DHDR} ${OTHERS} )
       get_filename_component(srcdir ${file} PATH)
       add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE}/${file}-par                         
                          COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE}/${srcdir}
                          COMMAND cp -pR ${file} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE}/${file}
                          WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
       list(APPEND PARSRCS ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE}/${file}-par)
-    endforeach(file ${SRCS} ${HDRS} ${FSRCS} ${DHDR})
+    endforeach(file ${SRCS} ${HDRS} ${FSRCS} ${DHDR} ${OTHERS} )
     
     # message(STATUS "saveEINCLUDE=${saveEINCLUDE}")
     add_custom_target(${PACKAGE}.par