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

[skip-ci] Fix an issue with root-config --has-whatever #10922

Merged
merged 2 commits into from
Jul 7, 2022
Merged

[skip-ci] Fix an issue with root-config --has-whatever #10922

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d94ad26
Fix an issue with `root-config --has-whatever`
bellenot Jul 7, 2022
543899c
[skip-ci] Fix the comment
bellenot Jul 7, 2022
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
4 changes: 2 additions & 2 deletions cmake/modules/RootConfiguration.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -847,7 +847,8 @@ else()
"${libdir}" "-lCore" "-lRint" "${incdir}" "" "" "${ROOT_ARCHITECTURE}" "${ROOTBUILD}")
endif()

#---Get the value of CMAKE_CXX_FLAGS provided by the user in the command line
#---Get the values of ROOT_ALL_OPTIONS and CMAKE_CXX_FLAGS provided by the user in the command line
set(all_features ${ROOT_ALL_OPTIONS})
set(usercflags ${CMAKE_CXX_FLAGS-CACHED})
file(REMOVE ${CMAKE_BINARY_DIR}/installtree/root-config)
configure_file(${CMAKE_SOURCE_DIR}/config/root-config.in ${CMAKE_BINARY_DIR}/installtree/root-config @ONLY NEWLINE_STYLE UNIX)
Expand All @@ -873,7 +874,6 @@ if(WIN32)
endif()

#--Local root-configure
set(all_features ${ROOT_ALL_OPTIONS})
set(prefix $ROOTSYS)
set(bindir $ROOTSYS/bin)
set(libdir $ROOTSYS/lib)
Expand Down