some fixes on the qt5 side for a none-git project source.
This commit is contained in:
parent
668b4bf481
commit
ad08aa61dd
@ -83,6 +83,7 @@ add_subdirectory(var)
|
||||
target_include_directories(mupp
|
||||
BEFORE PRIVATE
|
||||
$<BUILD_INTERFACE:${Boost_INCLUDE_DIR}>
|
||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/../..>
|
||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
|
||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/var/include>
|
||||
)
|
||||
|
@ -783,7 +783,7 @@ void PmuppGui::helpCmds()
|
||||
void PmuppGui::helpAbout()
|
||||
{
|
||||
#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
|
||||
QMessageBox::information(this, "about", QString("mupp: created by Andreas Suter.\nVersion: %1").arg(MUPP_VERSION));
|
||||
#endif
|
||||
|
@ -529,7 +529,7 @@ int main(int argc, char *argv[])
|
||||
return 0;
|
||||
} else if (!qstrcmp(argv[1], "-v") || !qstrcmp(argv[1], "--version")) {
|
||||
#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
|
||||
std::cout << std::endl << "mupp version: " << MUPP_VERSION << std::endl << std::endl;
|
||||
#endif
|
||||
|
@ -54,7 +54,7 @@ target_include_directories(musrStep
|
||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../include>
|
||||
)
|
||||
|
||||
target_compile_options(musrWiz
|
||||
target_compile_options(musrStep
|
||||
PRIVATE
|
||||
"${HAVE_GIT_REV_H}"
|
||||
)
|
||||
|
Loading…
x
Reference in New Issue
Block a user