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

Debian lintian fixes #1329

Merged
merged 3 commits into from
Nov 19, 2020
Merged

Debian lintian fixes #1329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c0b1889
Fix wrong section number in xrootdfs.1 manpage
ellert Nov 18, 2020
d90094c
Use system tinyxml library if available
ellert Nov 18, 2020
e9a10f3
Fix typo for consistency
ellert Nov 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmake/FindSciTokensCpp.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ FIND_PATH(SCITOKENS_CPP_INCLUDE_DIR scitokens/scitokens.h
FIND_LIBRARY(SCITOKENS_CPP_LIBRARIES SciTokens
HINTS
${SCITOKENS_CPP_DIR}
$ENV{SCITOKENS_DIR}
$ENV{SCITOKENS_CPP_DIR}
/usr
PATH_SUFFIXES lib
)
Expand Down
18 changes: 18 additions & 0 deletions cmake/FindTinyXml.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
FIND_PATH(TINYXML_INCLUDE_DIR tinyxml.h
HINTS
${TINYXML_DIR}
$ENV{TINYXML_DIR}
/usr
PATH_SUFFIXES include
)

FIND_LIBRARY(TINYXML_LIBRARIES tinyxml
HINTS
${TINYXML_DIR}
$ENV{TINYXML_DIR}
/usr
PATH_SUFFIXES lib
)

INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(TinyXml DEFAULT_MSG TINYXML_LIBRARIES TINYXML_INCLUDE_DIR)
2 changes: 2 additions & 0 deletions cmake/XRootDFindLibs.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ if( ZLIB_FOUND )
add_definitions( -DHAVE_LIBZ )
endif()

find_package( TinyXml )

find_package( LibXml2 )
if( LIBXML2_FOUND )
add_definitions( -DHAVE_XML2 )
Expand Down
2 changes: 1 addition & 1 deletion docs/man/xrootdfs.1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH xrootdfs 8 "__VERSION__"
.TH xrootdfs 1 "__VERSION__"
.SH NAME
xrootdfs - xrootd FUSE file system daemon
.SH SYNOPSIS
Expand Down
34 changes: 21 additions & 13 deletions src/XrdXml.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,23 @@

include( XRootDCommon )

if ( TINYXML_FOUND )
set( TINYXML_FILES "" )
set( TINYXML_LIBRARIES ${TINYXML_LIBRARIES} )
else()
set( TINYXML_FILES
XrdXml/tinyxml/tinystr.cpp XrdXml/tinyxml/tinystr.h
XrdXml/tinyxml/tinyxml.cpp XrdXml/tinyxml/tinyxml.h
XrdXml/tinyxml/tinyxmlerror.cpp
XrdXml/tinyxml/tinyxmlparser.cpp )
set( TINYXML_LIBRARIES "" )
endif()

if ( LIBXML2_FOUND )
set( XRDXML2_READER_FILES
XrdXml/XrdXmlRdrXml2.cc
XrdXml/XrdXmlRdrXml2.hh )
set( XRDXML2_LIBRARIES ${LIBXML2_LIBRARIES} )
if( CMAKE_VERSION VERSION_LESS "2.8" OR ${Solaris} STREQUAL "TRUE")
INCLUDE_DIRECTORIES( ${LIBXML2_INCLUDE_DIR} )
endif()
else()
set( XRDXML2_READER_FILES "" )
set( XRDXML2_LIBRARIES "" )
Expand All @@ -28,10 +37,7 @@ set( XRD_XML_PRELOAD_SOVERSION 2 )
add_library(
XrdXml
SHARED
XrdXml/tinystr.cpp XrdXml/tinystr.h
XrdXml/tinyxml.cpp XrdXml/tinyxml.h
XrdXml/tinyxmlerror.cpp
XrdXml/tinyxmlparser.cpp
${TINYXML_FILES}
XrdXml/XrdXmlMetaLink.cc XrdXml/XrdXmlMetaLink.hh
XrdXml/XrdXmlRdrTiny.cc XrdXml/XrdXmlRdrTiny.hh
XrdXml/XrdXmlReader.cc XrdXml/XrdXmlReader.hh
Expand All @@ -40,24 +46,26 @@ add_library(
target_link_libraries(
XrdXml
XrdUtils
${TINYXML_LIBRARIES}
${XRDXML2_LIBRARIES}
pthread )
# INCLUDE_DIRECTORIES /usr/include/libxml2

set_target_properties(
XrdXml
PROPERTIES
INCLUDE_DIRECTORIES ${CMAKE_SOURCE_DIR}/src/XrdXml/.
VERSION ${XRD_XML_VERSION}
SOVERSION ${XRD_XML_SOVERSION}
INTERFACE_LINK_LIBRARIES ""
LINK_INTERFACE_LIBRARIES "" )

if ( TINYXML_FOUND )
target_include_directories( XrdXml PRIVATE ${TINYXML_INCLUDE_DIR} )
else()
target_include_directories( XrdXml PRIVATE XrdXml/tinyxml )
endif()

if ( LIBXML2_FOUND )
set_target_properties(
XrdXml
PROPERTIES
INCLUDE_DIRECTORIES ${LIBXML2_INCLUDE_DIR} )
target_include_directories( XrdXml PRIVATE ${LIBXML2_INCLUDE_DIR} )
endif()

#-------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion src/XrdXml/XrdXmlRdrTiny.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
#include <iostream>

#include "XrdSys/XrdSysE2T.hh"
#include "XrdXml/tinyxml.h"
#include "tinyxml.h"
#include "XrdXml/XrdXmlRdrTiny.hh"

/******************************************************************************/
Expand Down
0 src/XrdXml/tinystr.cpp → src/XrdXml/tinyxml/tinystr.cpp
View file
Open in desktop
File renamed without changes.
0 src/XrdXml/tinystr.h → src/XrdXml/tinyxml/tinystr.h
View file
Open in desktop
File renamed without changes.
0 src/XrdXml/tinyxml.cpp → src/XrdXml/tinyxml/tinyxml.cpp
View file
Open in desktop
File renamed without changes.
0 src/XrdXml/tinyxml.h → src/XrdXml/tinyxml/tinyxml.h
View file
Open in desktop
File renamed without changes.
0 src/XrdXml/tinyxmlerror.cpp → src/XrdXml/tinyxml/tinyxmlerror.cpp
View file
Open in desktop
File renamed without changes.
0 src/XrdXml/tinyxmlparser.cpp → src/XrdXml/tinyxml/tinyxmlparser.cpp
View file
Open in desktop
File renamed without changes.