Skip to content

Commit

Permalink
Update version info.
Browse files Browse the repository at this point in the history
  • Loading branch information
fuhlig1 committed Jun 30, 2017
1 parent ebbc65e commit 7b8ba53
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ EndIf (Boost_FOUND)
# Set the library version in the main CMakeLists.txt
SET(FAIRROOT_MAJOR_VERSION 17)
SET(FAIRROOT_MINOR_VERSION 03)
SET(FAIRROOT_PATCH_VERSION 00)
SET(FAIRROOT_PATCH_VERSION 01)
SET(FAIRROOT_VERSION "${FAIRROOT_MAJOR_VERSION}.${FAIRROOT_MINOR_VERSION}.${FAIRROOT_PATCH_VERSION}")

If(ROOT_FOUND_VERSION LESS 59999)
Expand Down Expand Up @@ -372,7 +372,7 @@ If(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
)
Else()
Set(FAIRROOT_GIT_VERSION v-17.03)
Set(FAIRROOT_GIT_VERSION v-17.03a)
EndIf()
Configure_File(${CMAKE_SOURCE_DIR}/cmake/scripts/fairroot-config.in ${CMAKE_BINARY_DIR}/fairroot-config @ONLY)

Expand Down
2 changes: 1 addition & 1 deletion cmake/scripts/fairroot-config.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

_version=v-17.03
_version=v-17.03a
_major_version=${_version:2:2}
_minor_version=${_version:5:2}
_patch=${_version:7}
Expand Down
4 changes: 4 additions & 0 deletions parbase/FairParAsciiFileIo.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,10 @@ Bool_t FairParAsciiFileIo::open(const Text_t* fname, const Text_t* status)

Bool_t FairParAsciiFileIo::open(const TList* fnamelist, const Text_t* status)
{
if ( 0 == fnamelist->GetEntries() ) {
LOG(ERROR) << "The defined list of parameter files is empty. There are no parameters initialized from the ASCII files." << FairLogger::endl;
return kFALSE;
}
TString outFileName = gSystem->WorkingDirectory();

outFileName += "/all_";
Expand Down

0 comments on commit 7b8ba53

Please sign in to comment.