LMU/musrfit
LMU/musrfit
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 3 Activity

some fixes on the qt5 side for a none-git project source.

Browse Source
This commit is contained in:
suter_a 2021-07-12 16:23:33 +02:00
parent 668b4bf481
commit ad08aa61dd
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/musredit_qt5/mupp/CMakeLists.txt
View File

@ -83,6 +83,7 @@ add_subdirectory(var)
target_include_directories(mupp target_include_directories(mupp
BEFORE PRIVATE BEFORE PRIVATE
$<BUILD_INTERFACE:${Boost_INCLUDE_DIR}> $<BUILD_INTERFACE:${Boost_INCLUDE_DIR}>
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/../..>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/var/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/var/include>
) )

2
src/musredit_qt5/mupp/PmuppGui.cpp
View File

@ -783,7 +783,7 @@ void PmuppGui::helpCmds()
void PmuppGui::helpAbout() void PmuppGui::helpAbout()
{ {
#ifdef HAVE_GIT_REV_H #ifdef HAVE_GIT_REV_H
QMessageBox::information(this, "about", QString("mupp: created by Andreas Suter.\nVersion: %1\nBranch: %2\nHash: %3").arg(MUPP_VERSION).arg(GIT_BRANCH).arg(GIT_COMMIT_HASH)); QMessageBox::information(this, "about", QString("mupp: created by Andreas Suter.\nVersion: %1\nBranch: %2\nHash: %3").arg(MUPP_VERSION).arg(GIT_BRANCH).arg(GIT_CURRENT_SHA1));
#else #else
QMessageBox::information(this, "about", QString("mupp: created by Andreas Suter.\nVersion: %1").arg(MUPP_VERSION)); QMessageBox::information(this, "about", QString("mupp: created by Andreas Suter.\nVersion: %1").arg(MUPP_VERSION));
#endif #endif

2
src/musredit_qt5/mupp/mupp.cpp
View File

@ -529,7 +529,7 @@ int main(int argc, char *argv[])
return 0; return 0;
} else if (!qstrcmp(argv[1], "-v") || !qstrcmp(argv[1], "--version")) { } else if (!qstrcmp(argv[1], "-v") || !qstrcmp(argv[1], "--version")) {
#ifdef HAVE_GIT_REV_H #ifdef HAVE_GIT_REV_H
std::cout << std::endl << "mupp version: " << MUPP_VERSION << ", git-branch: " << GIT_BRANCH << ", git-rev: " << GIT_COMMIT_HASH << std::endl << std::endl; std::cout << std::endl << "mupp version: " << MUPP_VERSION << ", git-branch: " << GIT_BRANCH << ", git-rev: " << GIT_CURRENT_SHA1 << std::endl << std::endl;
#else #else
std::cout << std::endl << "mupp version: " << MUPP_VERSION << std::endl << std::endl; std::cout << std::endl << "mupp version: " << MUPP_VERSION << std::endl << std::endl;
#endif #endif

2
src/musredit_qt5/musrStep/CMakeLists.txt
View File

@ -54,7 +54,7 @@ target_include_directories(musrStep
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../include>
) )
target_compile_options(musrWiz target_compile_options(musrStep
PRIVATE PRIVATE
"${HAVE_GIT_REV_H}" "${HAVE_GIT_REV_H}"
) )