From c0d6958e37635edb93cb5ed34810d6eb8740d175 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Fri, 4 Aug 2017 15:40:21 +0200 Subject: [PATCH] no changE --- slsReceiverSoftware/CMakeLists.txt | 26 ++++++++++--------- slsReceiverSoftware/gitInfo.txt | 8 +++--- slsReceiverSoftware/include/gitInfoReceiver.h | 8 +++--- 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/slsReceiverSoftware/CMakeLists.txt b/slsReceiverSoftware/CMakeLists.txt index 7a2604086..015c904b9 100644 --- a/slsReceiverSoftware/CMakeLists.txt +++ b/slsReceiverSoftware/CMakeLists.txt @@ -28,18 +28,20 @@ endif (REST) # HDF5 -if (HDF5_FOUND) - include_directories( - ${HDF5_INCLUDE_DIRS} - ) - add_definitions( - -DHDF5C ${HDF5_DEFINITIONS} - ) - list (APPEND SOURCES - src/HDF5File.cpp - src/HDF5FileStatic.cpp - ) -endif () +if (USE_HDF5) + if (HDF5_FOUND) + include_directories( + ${HDF5_INCLUDE_DIRS} + ) + add_definitions( + -DHDF5C ${HDF5_DEFINITIONS} + ) + list (APPEND SOURCES + src/HDF5File.cpp + src/HDF5FileStatic.cpp + ) + endif () +endif (USE_HDF5) add_definitions( diff --git a/slsReceiverSoftware/gitInfo.txt b/slsReceiverSoftware/gitInfo.txt index 1a6a2a43c..24b606ddf 100644 --- a/slsReceiverSoftware/gitInfo.txt +++ b/slsReceiverSoftware/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsReceiverSoftware URL: origin git@git.psi.ch:sls_detectors_software/sls_receiver_software.git Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_receiver_software.git -Repsitory UUID: b0f8868b9fd50e3152c8431a522edaaaeaed0fc2 -Revision: 616 +Repsitory UUID: 6aedda5c374e0d0e9347b491fc451f3d4d4398b1 +Revision: 617 Branch: 3.0-rc Last Changed Author: Dhanya_Maliakal -Last Changed Rev: 621 -Last Changed Date: 2017-08-03 17:23:12.000000002 +0200 ./src/utilities.cpp +Last Changed Rev: 622 +Last Changed Date: 2017-08-04 14:28:08.000000002 +0200 ./CMakeLists.txt diff --git a/slsReceiverSoftware/include/gitInfoReceiver.h b/slsReceiverSoftware/include/gitInfoReceiver.h index 0c80791d4..be003015c 100644 --- a/slsReceiverSoftware/include/gitInfoReceiver.h +++ b/slsReceiverSoftware/include/gitInfoReceiver.h @@ -1,11 +1,11 @@ //#define SVNPATH "" #define SVNURL "git@git.psi.ch:sls_detectors_software/sls_receiver_software.git" //#define SVNREPPATH "" -#define SVNREPUUID "b0f8868b9fd50e3152c8431a522edaaaeaed0fc2" -//#define SVNREV 0x621 +#define SVNREPUUID "6aedda5c374e0d0e9347b491fc451f3d4d4398b1" +//#define SVNREV 0x622 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTH "Dhanya_Maliakal" -#define SVNREV 0x621 -#define SVNDATE 0x20170803 +#define SVNREV 0x622 +#define SVNDATE 0x20170804 //