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

Fixwarn #44

Merged
merged 2 commits into from
Jan 12, 2018
Merged

Fixwarn #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ca9dff
dont create LCIOLibDeps.cmake (fix Policy CMP0033)
gaede Jan 11, 2018
cbbc86e
fix warnings in UTIL::LCFourVector
gaede Jan 11, 2018
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,6 @@ MESSAGE( STATUS "" )


# generate and install following configuration files
GENERATE_PACKAGE_CONFIGURATION_FILES( LCIOConfig.cmake LCIOConfigVersion.cmake LCIOLibDeps.cmake )
GENERATE_PACKAGE_CONFIGURATION_FILES( LCIOConfig.cmake LCIOConfigVersion.cmake )

INSTALL( FILES cmake/MacroCheckPackageLibs.cmake cmake/MacroCheckPackageVersion.cmake DESTINATION lib/cmake)
5 changes: 0 additions & 5 deletions cmake/MacroGeneratePackageConfigFiles.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,6 @@ MACRO( GENERATE_PACKAGE_CONFIGURATION_FILES )
ENDIF( EXISTS "${PROJECT_SOURCE_DIR}/cmake/${arg}.in" )
ENDIF()

IF( ${arg} MATCHES "LibDeps.cmake" )
EXPORT_LIBRARY_DEPENDENCIES( "${arg}" )
INSTALL( FILES "${PROJECT_BINARY_DIR}/${arg}" DESTINATION lib/cmake )
ENDIF()

ENDFOREACH()

ENDMACRO( GENERATE_PACKAGE_CONFIGURATION_FILES )
Expand Down
5 changes: 4 additions & 1 deletion src/cpp/include/UTIL/LCFourVector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,14 @@ namespace UTIL {
class LCFourVector : public HepLorentzVector {

protected:
const TT* _lcObj ;
const TT* _lcObj = nullptr ;

public:
virtual ~LCFourVector() { /*no_op*/; }

LCFourVector(const LCFourVector& ) = default ;
LCFourVector& operator=(const LCFourVector& ) = default ;

/** Constructor for templated type,e.g. LCFourVector<MCParticle>( myMCParticle ).
*/
inline LCFourVector( const TT* lcObj) : _lcObj(lcObj) {
Expand Down