message(STATUS "SHLIB : ${SHLIB}")
message(STATUS "SYSLIBS : ${SYSLIBS}")
message(STATUS "CINTFLAGS : ${CINTFLAGS}")
+ message(STATUS "CMAKE_Fortran_FLAGS : ${CMAKE_Fortran_FLAGS}")
+ message(STATUS "CMAKE_CXX_FLAGS : ${CMAKE_CXX_FLAGS}")
+ message(STATUS "CMAKE_C_FLAGS : ${CMAKE_C_FLAGS}")
+ message(STATUS "CMAKE_SHARED_LINKER_FLAGS : ${CMAKE_SHARED_LINKER_FLAGS}")
+ message(STATUS "CMAKE_MODULE_LINKER_FLAGS : ${CMAKE_MODULE_LINKER_FLAGS}")
+ message(STATUS "CMAKE_EXE_LINKER_FLAGS : ${CMAKE_EXE_LINKER_FLAGS}")
endif(ALICEDEV STREQUAL "YES")
endmacro(ALICE_DevFlagsOutput)
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}")
+ string(REPLACE "-std=c++11" " " RCFLAGS "${RCFLAGS}")
set(CFLAGS "${CFLAGS} ${RCFLAGS}")
set(SOFLAGS "${SOFLAGS} ${RLFLAGS}")
set(LDFLAGS "${LDFLAGS} ${RLFLAGS}")
set(PSHLIBS)
set(PDS)
+ set(saveEINCLUDE)
+
endmacro(ALICE_ResetPackage)
function(ALICE_SetPackageVariable _var ext setvalue unsetvalue )
endfunction(ALICE_SetPackageVariable)
macro(ALICE_BuildPackage)
+ # message(STATUS " ${PACKAGE}")
list(APPEND EINCLUDE STEER)
+ # Needed for PAR files - we need to do this before path
+ # expansion so that the PAR files do not contain references to
+ # specific directories but depend solely on ALICE_ROOT
+ string(REPLACE ";" " " saveEINCLUDE "${EINCLUDE}")
+ # set(saveEINCLUDE "${EINCLUDE}")
+ # message(STATUS "saveEINCLUDE=${saveEINCLUDE} EINCLUDE=${EINCLUDE}")
ALICE_SetPackageVariable(PFFLAGS "FFLAGS" "${PACKFFLAGS}" "${FFLAGS}")
ALICE_SetPackageVariable(PCFLAGS "CFLAGS" "${PACKCFLAGS}" "${CFLAGS}")
list(APPEND PMALIBS ${PACKAGE}-static)
list(APPEND ALLALIBS ${PACKAGE}-static)
list(APPEND BINLIBS ${PACKAGE})
+ # Do not link against other libraries when creating a library
+ # set(PELIBS)
else()
list(APPEND ALLEXECS ${PACKAGE})
endif(lib)
set(${MODULE}INC "${EINCLUDE}" PARENT_SCOPE)
list(APPEND INCLUDEFILES ${PEXPORTDEST})
if(WITHDICT)
- ALICE_SetPackageVariable(PDS "DS" "G__${PACKAGE}.cxx" "G__${PACKAGE}.cxx")
+ # Replace dots in file name with underscores, or rootcint will
+ # write invalid code (namespace names with dots in them)
+ string(REPLACE "." "_" ESC_PACKAGE ${PACKAGE})
+ ALICE_SetPackageVariable(PDS "DS" "G__${ESC_PACKAGE}.cxx" "G__${ESC_PACKAGE}.cxx")
ALICE_GenerateDictionary()
else()
if(lib)
macro(ALICE_BuildModule)
-
+ # message(STATUS "${MODULE}")
+ execute_process(COMMAND ${CMAKE_COMMAND} -E echo_append "-- ${MODULE}:")
add_definitions(-D_MODULE_="${MODULE}")
foreach(PACKAGEFILE ${PACKAGES})
set(lib)
string(REGEX MATCH "CMakebin" bin "${PACKAGEFILE}")
get_filename_component(PACKAGE ${PACKAGEFILE} NAME)
string(REGEX REPLACE "^CMake(lib|bin)(.*)\\.pkg" "\\2" PACKAGE "${PACKAGE}")
+ execute_process(COMMAND ${CMAKE_COMMAND} -E echo_append " ${PACKAGE}")
if(ALICEDEV)
message("Adding package ${PACKAGE} in ${MODULE}")
endif(ALICEDEV)
endif(NOT EXCLUDEPACKAGE)
endforeach(PACKAGEFILE)
ALICE_CheckModule()
+ execute_process(COMMAND ${CMAKE_COMMAND} -E echo " done")
endmacro(ALICE_BuildModule)
macro(ALICE_GenerateDictionary)
separate_arguments(DCINTHDRS)
separate_arguments(DDH)
# Format neccesary arguments
+ set(ROOT6_ALPHA "5.99.1")
+ string(REGEX REPLACE "/0*" "." ROOT_DOTVERSION ${ROOT_VERSION})
+ if(ROOT_DOTVERSION VERSION_GREATER ROOT6_ALPHA)
+ # For current ROOT6-alpha - without proper PCM support - we need to
+ # give the _full_ path for all include paths, so that libCling can
+ # later attach those to the internal include path of the interpreter
+ # and so that the interpreter can parse the header files.
+ #
+ # THIS SHOULD BE A TEMPORARY HACK!
+ ALICE_Format(DINC "-I${PROJECT_SOURCE_DIR}/" ""
+ "${DINC};${CMAKE_INCLUDE_EXPORT_DIRECTORY}")
+ else()
ALICE_Format(DINC "-I" "" "${DINC};${CMAKE_INCLUDE_EXPORT_DIRECTORY}")
+ endif(ROOT_DOTVERSION VERSION_GREATER ROOT6_ALPHA)
set_source_files_properties(${PDS} PROPERTIES GENERATED TRUE)
set_source_files_properties(${PDS} PROPERTIES COMPILE_FLAGS "-w")
add_custom_command(OUTPUT ${PDS}
macro(ALICE_BuildLibrary)
- ALICE_DevFlagsOutput()
set(CMAKE_CXX_FLAGS "${PEDEFINE} ${PCXXFLAGS}")
set(CMAKE_C_FLAGS "${PEDEFINE} ${PCFLAGS}")
- set(CMAKE_Fortran_FLAGS ${PEDEFINE} ${PFFLAGS})
+ set(CMAKE_Fortran_FLAGS "${PEDEFINE} ${PFFLAGS}")
set(CMAKE_SHARED_LINKER_FLAGS ${PSOFLAGS})
set(CMAKE_MODULE_LINKER_FLAGS ${PLDFLAGS})
+ ALICE_DevFlagsOutput()
separate_arguments(PINC)
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})
set_target_properties(${PACKAGE} PROPERTIES SUFFIX .so)
macro(ALICE_BuildExecutable)
- ALICE_DevFlagsOutput()
set(CMAKE_CXX_FLAGS "${PEDEFINE} ${PCXXFLAGS} ${EXEFLAGS}")
set(CMAKE_C_FLAGS "${PEDEFINE} ${PCFLAGS} ${EXEFLAGS}")
set(CMAKE_Fortran_FLAGS "${PEDEFINE} ${PFFLAGS} ${EXEFLAGS}")
set(CMAKE_SHARED_LINKER_FLAGS ${PSOFLAGS})
set(CMAKE_MODULE_LINKER_FLAGS ${PLDFLAGS})
+ set(CMAKE_EXE_LINKER_FLAGS ${PLDFLAGS})
+ ALICE_DevFlagsOutput()
separate_arguments(PINC)
separate_arguments(EINCLUDE)
set(HEADERS ${EXPORT})
set(_headersdep)
foreach(header ${HEADERS})
- add_custom_command(OUTPUT ${PEXPORTDEST}/${header}
- COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/${MODULE}/${header} ${PEXPORTDEST}/${header}
+ get_filename_component( header_name ${header} NAME )
+ add_custom_command(OUTPUT ${PEXPORTDEST}/${header_name}
+ COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/${MODULE}/${header} ${PEXPORTDEST}/${header_name}
DEPENDS ${CMAKE_SOURCE_DIR}/${MODULE}/${header})
- list(APPEND _headersdep ${PEXPORTDEST}/${header})
+ list(APPEND _headersdep ${PEXPORTDEST}/${header_name})
install(FILES ${header} DESTINATION include)
endforeach(header)
add_custom_target(${PACKAGE}-headers DEPENDS ${_headersdep})
set(PCLASSES)
foreach (class ${PCINTCLASSES})
get_filename_component(classname ${class} NAME)
- set(PCLASSES ${PCLASSES} "\\n#pragma link C++ class ${classname}+;")
+ # set(PCLASSES ${PCLASSES} "\\n#pragma link C++ class ${classname}+;")
+ set(PCLASSES ${PCLASSES} "${classname}")
endforeach(class)
add_custom_command(OUTPUT ${PDAL}
- COMMAND echo "// Auto generated file - do not edit" > ${PDAL}
- COMMAND echo "#ifdef __CINT__" >> ${PDAL}
- COMMAND echo "#pragma link off all globals;" >> ${PDAL}
- COMMAND echo "#pragma link off all classes;" >> ${PDAL}
- COMMAND echo "#pragma link off all functions;" >> ${PDAL}
- COMMAND echo "${PCLASSES}" >> ${PDAL}
- COMMAND echo "#endif // __CINT__" >> ${PDAL}
- DEPENDS ${PCINTHDRS}
- VERBATIM)
-
+ COMMAND sh ${CMAKE_SOURCE_DIR}/cmake/GenerateLinkDef.sh ${PCLASSES} > ${PDAL}
+ DEPENDS ${PCINTHDRS} ${CMAKE_SOURCE_DIR}/cmake/GenerateLinkDef.sh)
endmacro(ALICE_GenerateLinkDef)
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
- COMMAND sed -e 's/include .\(ROOTSYS\)\\/test\\/Makefile.arch/include Makefile.arch/\; s/PACKAGE = .*/PACKAGE = ${PACKAGE}/\; s,SRCS *=.*,SRCS = ${SRCS},\;' < Makefile | sed -e 's,HDRS *=.*,HDRS = ${HDRS},\; s,FSRCS *=.*,FSRCS = ${FSRCS},\; s,DHDR *=.*,DHDR = ${DHDR},' > ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE}/Makefile
- COMMAND cp -pR ${ROOTSYS}/test/Makefile.arch ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE}/Makefile.arch
+ COMMAND sed -e 's,include ..ROOTSYS./\\\(etc\\|test\\\)/Makefile.arch,include Makefile.arch,\; s/PACKAGE = .*/PACKAGE = ${PACKAGE}/\; s,SRCS *=.*,SRCS = ${SRCS},\;' < Makefile | sed -e 's,HDRS *=.*,HDRS = ${HDRS},\; s,FSRCS *=.*,FSRCS = ${FSRCS},\; s,DHDR *=.*,DHDR = ${DHDR},\; s,EINCLUDE *:=.*,EINCLUDE := ${saveEINCLUDE},' > ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE}/Makefile
+ COMMAND cp -pR `root-config --etcdir`/Makefile.arch ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE}/Makefile.arch
COMMAND cp -pR PROOF-INF.${PACKAGE} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE}/PROOF-INF
# COMMAND cp -pR lib${PACKAGE}.pkg ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE}
COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_CURRENT_BINARY_DIR} tar --exclude=.svn -czhf ${CMAKE_BINARY_DIR}/${PACKAGE}.par ${PACKAGE}
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff