Skip to content

[cxxmodules] Don't generate C++ modules for clingutil STL dicts. #1457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vgvassilev merged 1 commit into from
Dec 14, 2017
Merged

[cxxmodules] Don't generate C++ modules for clingutil STL dicts. #1457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions cmake/modules/RootNewMacros.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -881,10 +881,11 @@ endfunction()
# LINKDEF LinkDef.h LinkDef2.h : linkdef files, default value is "LinkDef.h"
# DICTIONARY_OPTIONS option : options passed to rootcling
# INSTALL_OPTIONS option : options passed to install headers
# NO_MODULE : don't generate a C++ module for this package
# )
#---------------------------------------------------------------------------------------------------
function(ROOT_STANDARD_LIBRARY_PACKAGE libname)
set(options NO_INSTALL_HEADERS STAGE1 NO_HEADERS NO_SOURCES OBJECT_LIBRARY)
set(options NO_INSTALL_HEADERS STAGE1 NO_HEADERS NO_SOURCES OBJECT_LIBRARY NO_MODULE)
set(oneValueArgs)
set(multiValueArgs DEPENDENCIES HEADERS SOURCES BUILTINS LIBRARIES DICTIONARY_OPTIONS LINKDEF INSTALL_OPTIONS)
CMAKE_PARSE_ARGUMENTS(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
Expand Down Expand Up @@ -917,8 +918,15 @@ function(ROOT_STANDARD_LIBRARY_PACKAGE libname)
set(STAGE1_FLAG "STAGE1")
endif()

# Don't pass the MODULE arg to ROOT_GENERATE_DICTIONARY when
# NO_MODULE is set.
set(MODULE_GEN_ARG MODULE ${libname})
if(ARG_NO_MODULE)
set(MODULE_GEN_ARG)
endif()

ROOT_GENERATE_DICTIONARY(G__${libname} ${ARG_HEADERS}
MODULE ${libname}
${MODULE_GEN_ARG}
${STAGE1_FLAG}
LINKDEF ${ARG_LINKDEF}
OPTIONS ${ARG_DICTIONARY_OPTIONS}
Expand Down
2 changes: 1 addition & 1 deletion core/clingutils/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ foreach(dict ${stldicts})
string(REPLACE "complex" "root_std_complex.h" header ${header})
string(REPLACE "multi" "" header ${header})
ROOT_STANDARD_LIBRARY_PACKAGE(${dict}Dict
NO_SOURCES NO_INSTALL_HEADERS
NO_SOURCES NO_INSTALL_HEADERS NO_MODULE
STAGE1
HEADERS ${header}
LINKDEF src/${dict}Linkdef.h
Expand Down