Commit ff555f77 authored by Stezowski Olivier's avatar Stezowski Olivier
Browse files

Merge branch 'Cubix' into 'preprod'

Modification of the method to generate the dictionary, to be compatible to...

See merge request IPNL_GAMMA/gammaware!30
parents a0e9da2f fce6c5ee
Pipeline #22128 passed with stages
in 6 minutes and 44 seconds
......@@ -21,34 +21,23 @@ MESSAGE("[GW] + root/gui/${PROJECT_NAME}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -pthread -Wno-unused-parameter -Wno-sign-compare" )
#Set ROOT
set (ROOT_FIND_COMPONENTS Core MathCore Hist Gui Gpad Graf RIO Matrix Physics Thread MultiProc Spectrum)
find_file(ROOT_CONFIG ROOTConfig.cmake HINTS $ENV{ROOTSYS} ${ROOTSYS} ${ROOT_DIR} NO_DEFAULT_PATH PATH_SUFFIXES cmake)
if (ROOT_CONFIG)
include(${ROOT_CONFIG})
include(${ROOT_USE_FILE})
if(ROOT_LIBRARIES AND ROOT_INCLUDE_DIRS)
set(ROOT_FOUND TRUE)
endif()
else()
message(STATUS "ROOTConfig.cmake not found, trying to use FindROOT.cmake...")
find_package(ROOT REQUIRED COMPONENTS Core MathCore Hist Gui Gpad Graf RIO Matrix Physics Thread MultiProc Spectrum)
INCLUDE_DIRECTORIES( ${ROOT_INCLUDE_DIR} )
LINK_DIRECTORIES( ${ROOT_LIBRARY_DIR} )
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ROOT_CXX_FLAGS}" )
endif()
if(ROOT_FOUND)
include_directories(${ROOT_INCLUDE_DIRS})
else()
message(ERROR ": ROOT not found !!!")
endif()
#set (ROOT_FIND_COMPONENTS Core MathCore Hist Gui Gpad Graf RIO Matrix Physics Thread MultiProc Spectrum)
# find_file(ROOT_CONFIG ROOTConfig.cmake HINTS $ENV{ROOTSYS} ${ROOTSYS} ${ROOT_DIR} NO_DEFAULT_PATH PATH_SUFFIXES cmake)
#if (ROOT_CONFIG)
# include(${ROOT_CONFIG})
# include(${ROOT_USE_FILE})
# if(ROOT_LIBRARIES AND ROOT_INCLUDE_DIRS)
# set(ROOT_FOUND TRUE)
# endif()
######################
### Link libraries ###
######################
# root
INCLUDE_DIRECTORIES( ${ROOT_INCLUDE_DIR} )
LINK_DIRECTORIES( ${ROOT_LIBRARY_DIR} )
SET(EXTRA_EXTERNAL_LIBRARIES ${EXTRA_EXTERNAL_LIBRARIES} Core MathCore Hist Gui Gpad Graf RIO Matrix Physics Thread MultiProc Spectrum)
# gw
......@@ -76,7 +65,7 @@ file(GLOB database ${CMAKE_CURRENT_SOURCE_DIR}/DataBase)
### Root dictionary ###
#######################
ROOT_GENERATE_DICTIONARY(G__${Lib_NAME} ${headers} LINKDEF ${SourceDir}/LinkDef.h )
ROOT_GENERATE_DICTIONARY(G__${Lib_NAME} ${headers} MODULE ${Lib_NAME} LINKDEF ${SourceDir}/LinkDef.h )
#####################
### Cubix Library ###
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment