diff --git a/LibraryVersions.h.cmake b/LibraryVersions.h.cmake index 9934d440d2..66730589ed 100644 --- a/LibraryVersions.h.cmake +++ b/LibraryVersions.h.cmake @@ -9,13 +9,20 @@ # include <${OCC_INCLUDE_DIR}/Standard_Version.hxx> #endif +#cmakedefine BUILD_SMESH + +#if defined(BUILD_SMESH) +# include +#endif + /* No need for Boost (version info is always included in the source) */ /* No need for Python (version info is always included in the source) */ /* No need for Qt (version info is always included in the source) */ +/* No need for SMESH (version info is always included in the source) */ /* No need for zlib (version info is always included in the source) */ -// No CMake version info for SMESH, libarea, Zipios, or KDL +// No CMake version info for libarea, Zipios, or KDL // Coin3D constexpr char * FC_COIN3D_VERSION = "${COIN3D_VERSION}"; diff --git a/SMESH_Version.h.cmake b/SMESH_Version.h.cmake index b311f984a6..1e4084ecb2 100644 --- a/SMESH_Version.h.cmake +++ b/SMESH_Version.h.cmake @@ -9,4 +9,6 @@ #define SMESH_VERSION_PATCH ${SMESH_VERSION_PATCH} #define SMESH_VERSION_TWEAK ${SMESH_VERSION_TWEAK} +#define SMESH_VERSION_STR "${SMESH_VERSION_MAJOR}.${SMESH_VERSION_MINOR}.${SMESH_VERSION_PATCH}.${SMESH_VERSION_TWEAK}" + #endif // SMESH_VERSION_H diff --git a/src/App/Application.cpp b/src/App/Application.cpp index 4940dccbb8..df44ef839e 100644 --- a/src/App/Application.cpp +++ b/src/App/Application.cpp @@ -25,12 +25,12 @@ #ifndef _PreComp_ # if defined(FC_OS_LINUX) || defined(FC_OS_MACOSX) || defined(FC_OS_BSD) -# include -# include -# include +# include +# include +# include # elif defined(__MINGW32__) -# define WINVER 0x502 // needed for SetDllDirectory -# include +# define WINVER 0x502 // needed for SetDllDirectory +# include # endif # include # include @@ -2313,6 +2313,7 @@ void processProgramOptions(const variables_map& vm, std::map # include @@ -590,7 +591,7 @@ void AboutDialog::showLibraryInformation() li.name = QLatin1String("Salome SMESH"); li.href = baseurl + QLatin1String("#_TocSalomeSMESH"); li.url = QLatin1String("https://salome-platform.org"); - li.version.clear(); + li.version = QLatin1String(SMESH_VERSION_STR); libInfo << li; // Shiboken