diff --git a/CMakeLists.txt b/CMakeLists.txt index 6f998dac..8d6f9231 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ if (CMAKE_VERSION GREATER_EQUAL 3.12) cmake_policy(SET CMP0075 NEW) endif (CMAKE_VERSION GREATER_EQUAL 3.12) -project(musrfit VERSION 1.7.0 LANGUAGES C CXX) +project(musrfit VERSION 1.7.1 LANGUAGES C CXX) #--- musrfit specific options ------------------------------------------------- option(nexus "build optional NeXus support. Needed for ISIS" OFF) diff --git a/cmake/config.h.in b/cmake/config.h.in index 2a72e18a..e4287b93 100644 --- a/cmake/config.h.in +++ b/cmake/config.h.in @@ -1,6 +1,7 @@ // config.h #define PACKAGE_VERSION "@PROJECT_VERSION@" +#define ROOT_VERSION_USED "@ROOT_VERSION@" // define to 1 if you have and it should be used #cmakedefine HAVE_ALLOCA_H 1 diff --git a/src/any2many.cpp b/src/any2many.cpp index 1afe0056..71a7ed6d 100644 --- a/src/any2many.cpp +++ b/src/any2many.cpp @@ -197,7 +197,7 @@ int main(int argc, char *argv[]) any2many_syntax(); else if (strstr(argv[1], "--v")) { #ifdef HAVE_CONFIG_H - std::cout << std::endl << "any2many version: " << PACKAGE_VERSION << ", git-branch: " << GIT_BRANCH << ", git-rev: " << GIT_CURRENT_SHA1 << std::endl << std::endl; + std::cout << std::endl << "any2many version: " << PACKAGE_VERSION << ", git-branch: " << GIT_BRANCH << ", git-rev: " << GIT_CURRENT_SHA1 << ", ROOT version: " << ROOT_VERSION_USED << std::endl << std::endl; #else std::cout << std::endl << "any2many git-branch: " << GIT_BRANCH << ", git-rev: " << GIT_CURRENT_SHA1 << std::endl << std::endl; #endif diff --git a/src/dump_header.cpp b/src/dump_header.cpp index ffe3daef..f106f46d 100644 --- a/src/dump_header.cpp +++ b/src/dump_header.cpp @@ -776,7 +776,7 @@ int main(int argc, char *argv[]) return 0; } else if (!strcmp(argv[i], "--version") || !strcmp(argv[i], "-v")) { #ifdef HAVE_CONFIG_H - std::cout << std::endl << "dump_header version: " << PACKAGE_VERSION << ", git-branch: " << GIT_BRANCH << ", git-rev: " << GIT_CURRENT_SHA1 << std::endl << std::endl; + std::cout << std::endl << "dump_header version: " << PACKAGE_VERSION << ", git-branch: " << GIT_BRANCH << ", git-rev: " << GIT_CURRENT_SHA1 << ", ROOT version: " << ROOT_VERSION_USED << std::endl << std::endl; #else std::cout << std::endl << "dump_header git-branch: " << GIT_BRANCH << ", git-rev: " << GIT_CURRENT_SHA1 << std::endl << std::endl; #endif diff --git a/src/msr2data.cpp b/src/msr2data.cpp index 33dd4a47..0bc8ba60 100644 --- a/src/msr2data.cpp +++ b/src/msr2data.cpp @@ -512,7 +512,7 @@ int main(int argc, char *argv[]) return 0; } else if (!strcmp(argv[1], "--version")) { #ifdef HAVE_CONFIG_H - std::cout << std::endl << "msr2data version: " << PACKAGE_VERSION << ", git-branch: " << GIT_BRANCH << ", git-rev: " << GIT_CURRENT_SHA1 << std::endl << std::endl; + std::cout << std::endl << "msr2data version: " << PACKAGE_VERSION << ", git-branch: " << GIT_BRANCH << ", git-rev: " << GIT_CURRENT_SHA1 << ", ROOT version: " << ROOT_VERSION_USED << std::endl << std::endl; #else std::cout << std::endl << "msr2data git-branch: " << GIT_BRANCH << ", git-rev: " << GIT_CURRENT_SHA1 << std::endl << std::endl; #endif diff --git a/src/musrFT.cpp b/src/musrFT.cpp index 3a5b60c8..83fd70e7 100644 --- a/src/musrFT.cpp +++ b/src/musrFT.cpp @@ -297,7 +297,7 @@ Int_t musrFT_parse_options(Int_t argc, Char_t *argv[], musrFT_startup_param &sta tstr = argv[i]; if (tstr.BeginsWith("--version")) { #ifdef HAVE_CONFIG_H - std::cout << std::endl << "musrFT version: " << PACKAGE_VERSION << ", git-branch: " << GIT_BRANCH << ", git-rev: " << GIT_CURRENT_SHA1 << std::endl << std::endl; + std::cout << std::endl << "musrFT version: " << PACKAGE_VERSION << ", git-branch: " << GIT_BRANCH << ", git-rev: " << GIT_CURRENT_SHA1 << ", ROOT version: " << ROOT_VERSION_USED << std::endl << std::endl; #else std::cout << std::endl << "musrFT git-branch: " << GIT_BRANCH << ", git-rev: " << GIT_CURRENT_SHA1 << std::endl << std::endl; #endif diff --git a/src/musredit_qt5/musredit/CMakeLists.txt b/src/musredit_qt5/musredit/CMakeLists.txt index a3d4d920..12d66ecf 100644 --- a/src/musredit_qt5/musredit/CMakeLists.txt +++ b/src/musredit_qt5/musredit/CMakeLists.txt @@ -1,9 +1,5 @@ #--- musredit for Qt > 5.0 ---------------------------------------------------- -#--- check if Qt5WebEngine or Qt5WebKit is present ---------------------------- -#find_package(Qt5WebEngine QUIET) -#find_package(Qt5WebKit QUIET) - set(qt_libs Qt5::Core Qt5::Widgets Qt5::Network Qt5::Xml Qt5::Svg Qt5::PrintSupport) set(musredit_src @@ -110,35 +106,13 @@ else (APPLE) ) endif (APPLE) -# set necessary tags depending if QtWebEngine, QtWebKit, -# or none of both are given -if (Qt5WebKit_FOUND) - target_compile_options(musredit - BEFORE PRIVATE - -DHAVE_QT_WEB_KIT - ) -endif (Qt5WebKit_FOUND) - -if (Qt5WebEngine_FOUND) - target_compile_options(musredit - BEFORE PRIVATE - -DHAVE_QT_WEB_ENGINE - ) -endif (Qt5WebEngine_FOUND) - -if (Qt5NoWeb) - target_compile_options(musredit - BEFORE PRIVATE - -DHAVE_QT_NO_WEB - ) -endif (Qt5NoWeb) - target_include_directories(musredit BEFORE PRIVATE $ $ $ $ + $ $ ) diff --git a/src/musredit_qt5/musredit/PMusrEditAbout.cpp b/src/musredit_qt5/musredit/PMusrEditAbout.cpp index e41f4603..831289dd 100644 --- a/src/musredit_qt5/musredit/PMusrEditAbout.cpp +++ b/src/musredit_qt5/musredit/PMusrEditAbout.cpp @@ -27,6 +27,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ +#include "config.h" #include "git-revision.h" #include "PMusrEditAbout.h" @@ -40,6 +41,8 @@ PMusrEditAbout::PMusrEditAbout(QWidget *parent) : QDialog(parent) fGitBranch_label->setText(QString("git-branch: %1").arg(GIT_BRANCH)); fGitRev_label->setText(QString("git-rev: %1").arg(GIT_CURRENT_SHA1)); + fMusrfitVersion_label->setText(QString("musrfit-version: %1").arg(PACKAGE_VERSION)); + fRootVersion_label->setText(QString("ROOT-version: %1").arg(ROOT_VERSION_USED)); setModal(true); } diff --git a/src/musredit_qt5/musredit/forms/PMusrEditAbout.ui b/src/musredit_qt5/musredit/forms/PMusrEditAbout.ui index 95858b64..6e3c4770 100644 --- a/src/musredit_qt5/musredit/forms/PMusrEditAbout.ui +++ b/src/musredit_qt5/musredit/forms/PMusrEditAbout.ui @@ -7,7 +7,7 @@ 0 0 395 - 225 + 331 @@ -17,13 +17,13 @@ :/images/musrfit.xpm:/images/musrfit.xpm - + - 13 - 13 + 14 + 14 371 - 201 + 311 @@ -44,6 +44,26 @@ p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Sans Serif'; font-size:24pt; font-weight:400; font-style:italic;"> <p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">musredit ...</p></body></html> + + Qt::AlignCenter + + + + + + + + 75 + true + true + + + + musrfit-version: + + + Qt::AlignCenter + @@ -80,6 +100,23 @@ p, li { white-space: pre-wrap; } + + + + + 75 + true + true + + + + ROOT-version: + + + Qt::AlignCenter + + + diff --git a/src/musredit_qt6/musredit/CMakeLists.txt b/src/musredit_qt6/musredit/CMakeLists.txt index eae972a7..cf75525a 100644 --- a/src/musredit_qt6/musredit/CMakeLists.txt +++ b/src/musredit_qt6/musredit/CMakeLists.txt @@ -111,6 +111,7 @@ target_include_directories(musredit $ $ $ + $ $ ) diff --git a/src/musredit_qt6/musredit/PMusrEditAbout.cpp b/src/musredit_qt6/musredit/PMusrEditAbout.cpp index e41f4603..831289dd 100644 --- a/src/musredit_qt6/musredit/PMusrEditAbout.cpp +++ b/src/musredit_qt6/musredit/PMusrEditAbout.cpp @@ -27,6 +27,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ +#include "config.h" #include "git-revision.h" #include "PMusrEditAbout.h" @@ -40,6 +41,8 @@ PMusrEditAbout::PMusrEditAbout(QWidget *parent) : QDialog(parent) fGitBranch_label->setText(QString("git-branch: %1").arg(GIT_BRANCH)); fGitRev_label->setText(QString("git-rev: %1").arg(GIT_CURRENT_SHA1)); + fMusrfitVersion_label->setText(QString("musrfit-version: %1").arg(PACKAGE_VERSION)); + fRootVersion_label->setText(QString("ROOT-version: %1").arg(ROOT_VERSION_USED)); setModal(true); } diff --git a/src/musredit_qt6/musredit/forms/PMusrEditAbout.ui b/src/musredit_qt6/musredit/forms/PMusrEditAbout.ui index 95858b64..6e3c4770 100644 --- a/src/musredit_qt6/musredit/forms/PMusrEditAbout.ui +++ b/src/musredit_qt6/musredit/forms/PMusrEditAbout.ui @@ -7,7 +7,7 @@ 0 0 395 - 225 + 331 @@ -17,13 +17,13 @@ :/images/musrfit.xpm:/images/musrfit.xpm - + - 13 - 13 + 14 + 14 371 - 201 + 311 @@ -44,6 +44,26 @@ p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Sans Serif'; font-size:24pt; font-weight:400; font-style:italic;"> <p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">musredit ...</p></body></html> + + Qt::AlignCenter + + + + + + + + 75 + true + true + + + + musrfit-version: + + + Qt::AlignCenter + @@ -80,6 +100,23 @@ p, li { white-space: pre-wrap; } + + + + + 75 + true + true + + + + ROOT-version: + + + Qt::AlignCenter + + + diff --git a/src/musrfit.cpp b/src/musrfit.cpp index 7be1860a..e082b403 100644 --- a/src/musrfit.cpp +++ b/src/musrfit.cpp @@ -464,7 +464,7 @@ int main(int argc, char *argv[]) if (argc == 2) { if (!strcmp(argv[1], "--version")) { #ifdef HAVE_CONFIG_H - std::cout << std::endl << "musrfit version: " << PACKAGE_VERSION << ", git-branch: " << GIT_BRANCH << ", git-rev: " << GIT_CURRENT_SHA1 << std::endl << std::endl; + std::cout << std::endl << "musrfit version: " << PACKAGE_VERSION << ", git-branch: " << GIT_BRANCH << ", git-rev: " << GIT_CURRENT_SHA1 << ", ROOT version: " << ROOT_VERSION_USED << std::endl << std::endl; #else std::cout << std::endl << "musrfit git-branch: " << GIT_BRANCH << ", git-rev: " << GIT_CURRENT_SHA1 << std::endl << std::endl; #endif diff --git a/src/musrt0.cpp b/src/musrt0.cpp index b0cdacbd..81525c70 100644 --- a/src/musrt0.cpp +++ b/src/musrt0.cpp @@ -237,7 +237,7 @@ Int_t main(Int_t argc, Char_t *argv[]) for (int i=1; i