Skip to content
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

Jump to bottom

[cmake] use only source dirs as include paths when building ROOT #5181

Merged
merged 64 commits into from Apr 22, 2020
Merged

[cmake] use only source dirs as include paths when building ROOT #5181

merged 64 commits into from Apr 22, 2020

Conversation

linev
Copy link
Member

@linev linev commented Mar 19, 2020 •
edited

Fully exclude ${CMAKE_BUILD_DIR)/include from includes paths when buiding ROOT libraries

Several generated files placed first to ${CMAKE_BUILD_DIR)/ginclude and then copied to include.

Dictionary generation still uses only ${CMAKE_BUILD_DIR)/include, otherwise cling complains about similar includes in different places. Once problem with cling fixed, source dirs can be used for it as well

@linev linev self-assigned this Mar 19, 2020
@phsft-bot
Copy link
Collaborator

Starting build on ROOT-performance-centos7-multicore/default, ROOT-fedora27/noimt, ROOT-fedora29/python3, ROOT-fedora30/cxx14, ROOT-ubuntu16/nortcxxmod, ROOT-ubuntu18.04-i386/cxx14, mac1014/cxx17, windows10/cxx14
How to customize builds

@phsft-bot
Copy link
Collaborator

Build failed on ROOT-performance-centos7-multicore/default.
See console output.

Errors:

@phsft-bot
Copy link
Collaborator

Build failed on ROOT-fedora30/cxx14.
See console output.

Errors:

@phsft-bot
Copy link
Collaborator

Build failed on ROOT-fedora27/noimt.
See console output.

Errors:

@phsft-bot
Copy link
Collaborator

Build failed on ROOT-fedora29/python3.
See console output.

Errors:

@phsft-bot
Copy link
Collaborator

Starting build on ROOT-performance-centos7-multicore/default, ROOT-fedora27/noimt, ROOT-fedora29/python3, ROOT-fedora30/cxx14, ROOT-ubuntu16/nortcxxmod, ROOT-ubuntu18.04-i386/cxx14, mac1014/cxx17, windows10/cxx14
How to customize builds

@phsft-bot
Copy link
Collaborator

Build failed on ROOT-performance-centos7-multicore/default.
See console output.

Errors:

@phsft-bot
Copy link
Collaborator

Build failed on ROOT-fedora30/cxx14.
See console output.

Errors:

@phsft-bot
Copy link
Collaborator

Build failed on ROOT-fedora29/python3.
See console output.

Errors:

@phsft-bot
Copy link
Collaborator

Build failed on ROOT-fedora27/noimt.
See console output.

Errors:

@phsft-bot
Copy link
Collaborator

Build failed on ROOT-ubuntu16/nortcxxmod.
See console output.

Errors:

@phsft-bot
Copy link
Collaborator

Build failed on windows10/cxx14.
See console output.

Errors:

@phsft-bot
Copy link
Collaborator

Starting build on ROOT-performance-centos7-multicore/default, ROOT-fedora27/noimt, ROOT-fedora29/python3, ROOT-fedora30/cxx14, ROOT-ubuntu16/nortcxxmod, ROOT-ubuntu18.04-i386/cxx14, mac1014/cxx17, windows10/cxx14
How to customize builds

@phsft-bot
Copy link
Collaborator

Build failed on ROOT-fedora29/python3.
See console output.

Errors:

@phsft-bot
Copy link
Collaborator

Build failed on ROOT-fedora30/cxx14.
See console output.

Errors:

@phsft-bot
Copy link
Collaborator

Build failed on ROOT-fedora27/noimt.
See console output.

Errors:

@phsft-bot
Copy link
Collaborator

Build failed on ROOT-ubuntu16/nortcxxmod.
See console output.

Errors:

@phsft-bot
Copy link
Collaborator

Build failed on ROOT-performance-centos7-multicore/default.
See console output.

Errors:

@phsft-bot
Copy link
Collaborator

Build failed on windows10/cxx14.
See console output.

Errors:

linev and others added 23 commits April 22, 2020 11:14
@linev
[cmake] do not use INCLUDES arg for ROOT libs
7518eec 
Always provide them via target_include_directoris
@linev
[cmake] provide proper rules for generated files
86ebf98 
ginclude/RConfigure.h created during configure and have to be copied
into include/ directory.
ginclude/RGitCommit.h created in core/CMakeLists.txt and also copied
into include/ directory.
Files from ginclude/ used for INSTALL
@linev
[cmake] do not generate rootmap for MULTIDICT files
5aabfa7 
These was happening for G__Smatrix32 and G__GenVector32
@linev
[cmake] fully rely on target_include_directories property
e18006f 
It has PUBLIC section, which can be used to extract necessary
dependency for all libraries
@linev
[cmake] let reduce includes for dict generation
e6c4f4e 
When rootmap generated, all includes paths are stored
in the dictionary. For several very basic dictionaries
from clingutils one can reduce them, otherwise it pollute
gInterpreter->GetIncludeDirs()
@linev
[cmake] specify used include for core libs directly
e428c43
@linev
Do not expose RConfigOptions.h in public includes
037d0d4 
It is used only from TROOT.cxx and was not installed before
@linev
[cmake] do not use source dirs for generating ROOT dictionaries
d9f27c2 
While ${CMAKE_BINARY_DIR}/include used for some externals,
rootcling facing same includes twice and may fail.
@linev @Axel-Naumann
Update core/CMakeLists.txt
d22fa4a 
Co-Authored-By: Axel Naumann <Axel.Naumann@cern.ch>
@linev
[cmake] enable rootmap again for MULTIDICT
5d01090
@linev
[cmake] spaces, formatting
0ffe3e0
@linev
[core] use relative paths in LinkDef.h, no need for special include
0c711ba
@linev
[cmake] always use includes from build directory for dictionaries
61aefb0 
This required because of modules but also while
gInterpreter->GetIncludePath() will return all source dirs in output
@linev
restore cmake files for alien and monalisa
99157e7
@linev
adjust spaces and formatting
9874791
@linev
use cling excludePath args
c1fd9e4
@linev
last adjustments using target includes
61ab26d
@linev
also exclude builtins
3158683
@linev
do not link cude two times
68749ff
@linev
use RGitCommit.tmp.h to avoid unnecessary rebuilds
454d47e
@linev
add target_include_directories directly in ROOT_LINKER_LIBRARY
96f2670
@linev
remove mathmore includes from mathcore
148ba11
@linev
always add Core includes to the library
e5da3ae
@phsft-bot
Copy link
Collaborator

Starting build on ROOT-debian10-i386/cxx14, ROOT-performance-centos7-multicore/default, ROOT-fedora29/python3, ROOT-fedora30/cxx14, ROOT-fedora31/noimt, ROOT-ubuntu16/nortcxxmod, mac1015/cxx17, windows10/cxx14
How to customize builds

@linev linev dismissed amadio’s stale review April 22, 2020 10:59

Issues, mentioned by Guilherme, will be reolved in other PRs

@linev linev merged commit e1751b1 into root-project:master Apr 22, 2020
@linev linev deleted the only_local_includes branch April 22, 2020 14:34
This was referenced May 4, 2020
Merged
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lmoneta lmoneta lmoneta left review comments

@vgvassilev vgvassilev vgvassilev left review comments

@oshadura oshadura oshadura approved these changes

@Axel-Naumann Axel-Naumann Axel-Naumann approved these changes

@agheata agheata Awaiting requested review from agheata

@bellenot bellenot Awaiting requested review from bellenot bellenot is a code owner

@gganis gganis Awaiting requested review from gganis

@osschar osschar Awaiting requested review from osschar

@pcanal pcanal Awaiting requested review from pcanal pcanal is a code owner

@hageboeck hageboeck Awaiting requested review from hageboeck

@ashlaban ashlaban Awaiting requested review from ashlaban

@sitongan sitongan Awaiting requested review from sitongan

@stwunsch stwunsch Awaiting requested review from stwunsch

@couet couet Awaiting requested review from couet

@amadio amadio Awaiting requested review from amadio

Assignees

@linev linev

Labels
new feature
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@linev @phsft-bot @vgvassilev @oshadura @Axel-Naumann @amadio @pcanal @lmoneta