Mirror/FairMQ
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairMQ.git synced 2025-10-13 08:41:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change code to be able to use ROOT6

Browse Source 
Use correct dependencies for ROOT5 and ROOT6
Changes to create rootmap files also for ROOT6.

Add the std namespace to all occurrences of any stream class.
Probably some using directive in the header files of ROOT6 is not present any longer.

Create the pcm files correctly and copy them into the lib directory.
Install the pcm files correctly in CMAKE_INSTALL_PREFIX.

Add default parameters for Run function.
Otherwise macros will crash with ROOT6 when no parameters are defined when calling Run function.
Cling is here more strict then Cint.

Replace the occurrence of '//' by '/' in pathes which are defined via environment variables.
Otherwise macros will crash when used with ROOT6. Cling is more strict then Cint.

Correctly cast variables. This is needed when macros are executed with ROOT6. Cling is more strict then Cint.

Correctly initialize the TObjString in macros.
Define include directories which don't belong to our project as SYSTEM include directories.
For these directories no warnings will be created.

Automatic loading of the libraries with ROOT6 on Apple search for libraries with extension dylib.
Older versions of ROOT expect the extension so. Depending on the ROOT version the correct extension is choosen.

Install also rootmap files to final library destination.
This commit is contained in:
Florian Uhlig 2015-05-07 14:29:58 +02:00
parent 7fa785a8f4
commit ccd04fc54b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fairmq/CMakeLists.txt
View File

@ -8,7 +8,6 @@
Set(INCLUDE_DIRECTORIES Set(INCLUDE_DIRECTORIES
${CMAKE_SOURCE_DIR}/fairmq ${CMAKE_SOURCE_DIR}/fairmq
${CMAKE_SOURCE_DIR}/fairmq/devices ${CMAKE_SOURCE_DIR}/fairmq/devices
${CMAKE_SOURCE_DIR}/fairmq/examples/req-rep
${CMAKE_SOURCE_DIR}/fairmq/tools ${CMAKE_SOURCE_DIR}/fairmq/tools
) )
@ -19,6 +18,7 @@ Set(SYSTEM_INCLUDE_DIRECTORIES
If(PROTOBUF_FOUND) If(PROTOBUF_FOUND)
Set(INCLUDE_DIRECTORIES Set(INCLUDE_DIRECTORIES
${INCLUDE_DIRECTORIES} ${INCLUDE_DIRECTORIES}
${CMAKE_SOURCE_DIR}/fairmq/examples/req-rep
# # following directory is only for protobuf tests and is not essential part of FairMQ # # following directory is only for protobuf tests and is not essential part of FairMQ
#${CMAKE_SOURCE_DIR}/fairmq/prototest #${CMAKE_SOURCE_DIR}/fairmq/prototest
) )