mirror of https://github.com/saitohirga/WSJT-X.git
Possible warning message for users of -devel and -rc? revisions.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8476 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
parent
52430b9773
commit
64c0b304f1
|
@ -952,7 +952,7 @@ if (Fortran_COMPILER_NAME MATCHES "gfortran.*")
|
||||||
set (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -isysroot ${CMAKE_OSX_SYSROOT}")
|
set (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -isysroot ${CMAKE_OSX_SYSROOT}")
|
||||||
endif (CMAKE_OSX_SYSROOT)
|
endif (CMAKE_OSX_SYSROOT)
|
||||||
|
|
||||||
set (CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE} -funroll-all-loops -fno-f2c ${General_FFLAGS}")
|
set (CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE} -fbounds-check -funroll-all-loops -fno-f2c ${General_FFLAGS}")
|
||||||
set (CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_DEBUG} -fbounds-check -fno-f2c ${General_FFLAGS}")
|
set (CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_DEBUG} -fbounds-check -fno-f2c ${General_FFLAGS}")
|
||||||
elseif (Fortran_COMPILER_NAME MATCHES "ifort.*")
|
elseif (Fortran_COMPILER_NAME MATCHES "ifort.*")
|
||||||
# ifort (untested)
|
# ifort (untested)
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Version number components
|
# Version number components
|
||||||
set (WSJTX_VERSION_MAJOR 1)
|
set (WSJTX_VERSION_MAJOR 1)
|
||||||
set (WSJTX_VERSION_MINOR 7)
|
set (WSJTX_VERSION_MINOR 9)
|
||||||
set (WSJTX_VERSION_PATCH 1)
|
set (WSJTX_VERSION_PATCH 0)
|
||||||
set (WSJTX_RC 0) # release candidate number, comment out or zero for development versions
|
set (WSJTX_RC 0) # release candidate number, comment out or zero for development versions
|
||||||
set (WSJTX_VERSION_IS_RELEASE 0) # set to 1 for final release build
|
set (WSJTX_VERSION_IS_RELEASE 0) # set to 1 for final release build
|
||||||
|
|
|
@ -915,7 +915,17 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
|
||||||
"Please use WSJT-X v1.8.0\n", errorMsg);
|
"Please use WSJT-X v1.8.0\n", errorMsg);
|
||||||
Q_EMIT finished ();
|
Q_EMIT finished ();
|
||||||
}
|
}
|
||||||
|
/*
|
||||||
|
if(QCoreApplication::applicationVersion().contains("-devel") or
|
||||||
|
QCoreApplication::applicationVersion().contains("-rc")) {
|
||||||
|
QString errorMsg;
|
||||||
|
MessageBox::critical_message (this,
|
||||||
|
"This version of WSJT-X was built from code in the\n"
|
||||||
|
"development branch, or is a Release Candidate.\n"
|
||||||
|
"On-the-air use carries an obligation to report\n"
|
||||||
|
"problems to the WSJT Development group.\n\n", errorMsg);
|
||||||
|
}
|
||||||
|
*/
|
||||||
if(!ui->cbMenus->isChecked()) {
|
if(!ui->cbMenus->isChecked()) {
|
||||||
ui->cbMenus->setChecked(true);
|
ui->cbMenus->setChecked(true);
|
||||||
ui->cbMenus->setChecked(false);
|
ui->cbMenus->setChecked(false);
|
||||||
|
|
Loading…
Reference in New Issue