Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
atlasexternals
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Requirements
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Tim Martin
atlasexternals
Commits
6a7eb679
Commit
6a7eb679
authored
7 years ago
by
Attila Krasznahorkay
Browse files
Options
Downloads
Plain Diff
Merge branch 'XRootDFix-20170329' into '1.0'
FindXrootd.cmake fix, 1.0 branch (2017.03.29.) See merge request !18
parents
8528809b
339866a9
No related branches found
Branches containing commit
Tags
1.0.6
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Build/AtlasLCG/modules/FindXrootd.cmake
+8
-2
8 additions, 2 deletions
Build/AtlasLCG/modules/FindXrootd.cmake
with
8 additions
and
2 deletions
Build/AtlasLCG/modules/FindXrootd.cmake
+
8
−
2
View file @
6a7eb679
...
...
@@ -19,16 +19,22 @@ include( LCGFunctions )
# Declare the external module:
lcg_external_module
(
NAME Xrootd
INCLUDE_SUFFIXES include INCLUDE_NAMES xrootd/XrdVersion.hh
LIBRARY_SUFFIXES lib64 LIBRARY_PREFIX Xrd
LIBRARY_SUFFIXES
lib
lib64 LIBRARY_PREFIX Xrd
DEFAULT_COMPONENTS Utils
EXTRA_OPTIONS NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH
)
# Find the xrootd executable, and set up the binary path using it:
find_program
(
XROOTD_EXECUTABLE xrootd
PATH_SUFFIXES bin PATHS
${
XROOTD_ROOT
}
NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH
)
get_filename_component
(
XROOTD_BINARY_PATH
${
XROOTD_EXECUTABLE
}
PATH
)
# Handle the standard find_package arguments:
include
(
FindPackageHandleStandardArgs
)
find_package_handle_standard_args
(
Xrootd DEFAULT_MSG XROOTD_INCLUDE_DIR
XROOTD_LIBRARIES
)
mark_as_advanced
(
XROOTD_FOUND XROOTD_INCLUDE_DIR XROOTD_INCLUDE_DIRS
XROOTD_LIBRARIES XROOTD_LIBRARY_DIRS
)
XROOTD_LIBRARIES XROOTD_LIBRARY_DIRS
XROOTD_EXECUTABLE XROOTD_BINARY_PATH
)
# Set up the RPM dependency:
lcg_need_rpm
(
xrootd
)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment