Merge branch 'dev' of https://github.com/AliceO2Group/AliceO2

ihrivnac · ihrivnac · commit 581b93525099 · 2014-12-09T16:50:45.000+01:00
diff --git a/devices/aliceHLTwrapper/CMakeLists.txt b/devices/aliceHLTwrapper/CMakeLists.txt
@@ -5,6 +5,9 @@ set(INCLUDE_DIRECTORIES
   ${FAIRROOT_INCLUDE_DIR}
   ${AlFa_DIR}/include
   ${CMAKE_SOURCE_DIR}/devices/aliceHLTwrapper
+  ${FAIRROOT_INCLUDE_DIR}
+  ${AlFa_DIR}/include
+  ${CMAKE_SOURCE_DIR}/devices/aliceHLTwrapper
 )
 
 include_directories(${INCLUDE_DIRECTORIES})

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,9 @@ set(INCLUDE_DIRECTORIES`
`5`	`5`	`${FAIRROOT_INCLUDE_DIR}`
`6`	`6`	`${AlFa_DIR}/include`
`7`	`7`	`${CMAKE_SOURCE_DIR}/devices/aliceHLTwrapper`
	`8`	`+ ${FAIRROOT_INCLUDE_DIR}`
	`9`	`+ ${AlFa_DIR}/include`
	`10`	`+ ${CMAKE_SOURCE_DIR}/devices/aliceHLTwrapper`
`8`	`11`	`)`
`9`	`12`
`10`	`13`	`include_directories(${INCLUDE_DIRECTORIES})`