Commit d251fc0a authored by Marco Clemencic's avatar Marco Clemencic
Browse files

made CMake compile flags closer to the CMT ones

parent 0285179e
......@@ -47,6 +47,7 @@ if(VTune_FOUND)
else()
message(WARNING "VTune libraries not found, the module IntelProfiler is disabled")
endif()
# Special handling of unresorlved symbols in GaudiGoogleProfiling.
# The profilers need to have libtcmalloc.so or libprofiler.so pre-loaded to
# work, so it's better if the symbols stay undefined in case somebody tries to
......
......@@ -3,6 +3,7 @@ depends_on_subdirs(GaudiKernel GaudiUtils)
find_package(ROOT COMPONENTS RIO Tree TreePlayer MathCore)
set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS __POOL_COMPATIBILITY)
string(REPLACE "-pedantic" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
gaudi_add_library(RootCnvLib *.cpp
LINK_LIBRARIES GaudiKernel GaudiUtilsLib ROOT
......
......@@ -930,6 +930,7 @@ function(gaudi_add_dictionary dictionary header selection)
gaudi_common_add_build(${ARG_UNPARSED_ARGUMENTS} LIBRARIES ${ARG_LIBRARIES} LINK_LIBRARIES ${ARG_LINK_LIBRARIES} INCLUDE_DIRS ${ARG_INCLUDE_DIRS})
reflex_dictionary(${dictionary} ${header} ${selection} LINK_LIBRARIES ${ARG_LINK_LIBRARIES} OPTIONS ${ARG_OPTIONS})
set_target_properties(${dictionary}Dict PROPERTIES COMPILE_FLAGS "-Wno-overloaded-virtual")
# Notify the project level target
get_property(rootmapname TARGET ${dictionary}Gen PROPERTY ROOTMAPFILE)
......
......@@ -109,11 +109,11 @@ macro(reflex_generate_dictionary dictionary _headerfile _selectionfile)
set(gensrcdict ${dictionary}_dict.cpp)
set(gccxmlopts "--gccxml-compiler ${CMAKE_CXX_COMPILER}")
if(MSVC)
set(gccxmlopts "--gccxmlopt=\"--gccxml-compiler cl\"")
set(gccxmlopts "--gccxml-compiler cl")
else()
#set(gccxmlopts "--gccxmlopt=\'--gccxml-cxxflags -m64 \'")
set(gccxmlopts)
#set(gccxmlopts "${gccxmlopts} -gccxml-cxxflags -m64")
endif()
set(rootmapname ${dictionary}Dict.rootmap)
......@@ -135,6 +135,9 @@ macro(reflex_generate_dictionary dictionary _headerfile _selectionfile)
set(definitions ${definitions} -D${d})
endforeach()
if(gccxmlopts)
set(gccxmlopts "--gccxmlopt=${gccxmlopts}")
endif()
get_filename_component(GCCXML_home ${GCCXML} PATH)
add_custom_command(
OUTPUT ${gensrcdict} ${rootmapname}
......@@ -145,7 +148,6 @@ macro(reflex_generate_dictionary dictionary _headerfile _selectionfile)
# Creating this target at ALL level enables the possibility to generate dictionaries (genreflex step)
# well before the dependent libraries of the dictionary are build
#add_custom_target(${dictionary}Gen ALL DEPENDS ${gensrcdict} ${rootmapname})
add_custom_target(${dictionary}Gen ALL DEPENDS ${gensrcdict} ${rootmapname})
set_property(TARGET ${dictionary}Gen PROPERTY ROOTMAPFILE ${rootmapname})
......
Supports Markdown
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