Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Corryvreckan
Corryvreckan
Commits
45de65bd
Commit
45de65bd
authored
Mar 11, 2020
by
Simon Spannagel
Browse files
CMake: silence warning of ROOT 6.20 about renamed macros file.
parent
39bcf883
Pipeline
#1479227
passed with stages
in 23 minutes and 11 seconds
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
src/objects/CMakeLists.txt
View file @
45de65bd
...
@@ -5,8 +5,8 @@ INCLUDE_DIRECTORIES(SYSTEM ${GBL_INCLUDE_DIRS})
...
@@ -5,8 +5,8 @@ INCLUDE_DIRECTORIES(SYSTEM ${GBL_INCLUDE_DIRS})
# Find the RootNewMacros.cmake file and include it
# Find the RootNewMacros.cmake file and include it
GET_FILENAME_COMPONENT
(
ROOT_CMAKE_DIR
"
${
ROOT_USE_FILE
}
"
DIRECTORY
)
GET_FILENAME_COMPONENT
(
ROOT_CMAKE_DIR
"
${
ROOT_USE_FILE
}
"
DIRECTORY
)
FIND_FILE
(
ROOT_MACROS_FILE
FIND_FILE
(
ROOT_MACROS_FILE
NAMES RootNewMacros.cmake
NAMES RootNewMacros.cmake
RootMacros.cmake
HINTS
${
ROOT_CMAKE_DIR
}
/modules/ $ENV{ROOTSYS}/../cmake/modules $ENV{ROOTSYS}/cmake/modules
)
HINTS
${
ROOT_CMAKE_DIR
}
${
ROOT_CMAKE_DIR
}
/modules/ $ENV{ROOTSYS}/../cmake/modules $ENV{ROOTSYS}/cmake/modules
)
IF
(
NOT ROOT_MACROS_FILE
)
IF
(
NOT ROOT_MACROS_FILE
)
MESSAGE
(
WARNING
"Cannot find ROOT macros, including generic file as fallback."
)
MESSAGE
(
WARNING
"Cannot find ROOT macros, including generic file as fallback."
)
...
...
Simon Spannagel
@simonspa
mentioned in commit
c87bb466
·
Jun 18, 2020
mentioned in commit
c87bb466
mentioned in commit c87bb46669a51ffc2a681162fca5eb107561486c
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment