math/saga: Forgotten changes to the files dir
In commit 9bdd8719 all changes in files dir are missing, sorry for this.
This commit is contained in:
Rainer Hurling
parent
9bdd871990
commit
5471bfa17b
|
|
@ -0,0 +1,12 @@
|
|||
--- CMakeLists.txt.orig 2022-08-28 17:59:56 UTC
|
||||
+++ CMakeLists.txt
|
||||
@@ -21,6 +21,9 @@ endif()
|
||||
set(CMAKE_BUILD_TYPE Release)
|
||||
endif()
|
||||
|
||||
+set(COMPILER "${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}")
|
||||
+add_definitions(-DCOMPILER="${COMPILER}")
|
||||
+
|
||||
if(MSVC)
|
||||
set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "" FORCE)
|
||||
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
--- src/saga_core/saga_gui/CMakeLists.txt.orig 2022-08-31 16:51:39 UTC
|
||||
+++ src/saga_core/saga_gui/CMakeLists.txt
|
||||
@@ -241,7 +241,7 @@ if(GIT_FOUND)
|
||||
OUTPUT_VARIABLE GIT_HASH
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
)
|
||||
- message("git hash: ${GIT_HASH} to ${PROJECT_SOURCE_DIR}/git_hash.h")
|
||||
+ message("git hash: "https://sourceforge.net/p/saga-gis/code/ci/GIT_TAGNAME" to ${PROJECT_SOURCE_DIR}/git_hash.h")
|
||||
else()
|
||||
message("not a git repository, git hash not found")
|
||||
endif()
|
||||
|
|
@ -1,120 +1,16 @@
|
|||
--- src/saga_core/saga_gui/dlg_about.cpp.orig 2020-08-25 19:21:15 UTC
|
||||
--- src/saga_core/saga_gui/dlg_about.cpp.orig 2022-09-14 15:41:47 UTC
|
||||
+++ src/saga_core/saga_gui/dlg_about.cpp
|
||||
@@ -177,6 +177,7 @@ wxString CDLG_About::_Get_Version(void)
|
||||
s += "http://www.saga-gis.org\n";
|
||||
s += "\n";
|
||||
s += "Version: " + wxString(SAGA_VERSION) + "\n";
|
||||
+ s += "https://sourceforge.net/p/saga-gis/code/ci/release-PORTVERSION/tree/\n";
|
||||
@@ -166,12 +166,7 @@ wxString CDLG_About::_Get_Version(void)
|
||||
#else
|
||||
s += " (32 bit)</b><br>";
|
||||
#endif
|
||||
- #ifdef GIT_HASH
|
||||
- if( *GIT_HASH )
|
||||
- {
|
||||
- s += "<br><i>Git commit hash</i><br>[ <a href=\"https://sourceforge.net/p/saga-gis/code/ci/" GIT_HASH "\">#" GIT_HASH "</a> ]<br>";
|
||||
- }
|
||||
- #endif
|
||||
+ s += "<br><i>Git commit hash</i><br>[ <a href=\"https://sourceforge.net/p/saga-gis/code/ci/GIT_TAGNAME \">#" + wxString("GIT_TAGNAME") + "</a> ]<br>";
|
||||
s += "<br>";
|
||||
s += "<a href=\"https://saga-gis.sourceforge.io/\">saga-gis.org</a>";
|
||||
|
||||
#ifdef _SAGA_MSW
|
||||
#ifdef _WIN64
|
||||
@@ -254,13 +255,107 @@ wxString CDLG_About::_Get_Version(void)
|
||||
#elif defined(__PGI)
|
||||
"Portland PGCC/PGCPP"
|
||||
#elif defined(__clang__)
|
||||
- "Clang/LLVM"
|
||||
+ #if (__clang_major__ == 11 && __clang_minor__ == 0 && __clang_patchlevel__ == 1)
|
||||
+ "Clang/LLVM 11.0.1"
|
||||
+ #elif (__clang_major__ == 11 && __clang_minor__ == 0 && __clang_patchlevel__ == 0)
|
||||
+ "Clang/LLVM 11.0.0"
|
||||
+ #elif (__clang_major__ == 10 && __clang_minor__ == 0 && __clang_patchlevel__ == 1)
|
||||
+ "Clang/LLVM 10.0.1"
|
||||
+ #elif (__clang_major__ == 10 && __clang_minor__ == 0 && __clang_patchlevel__ == 0)
|
||||
+ "Clang/LLVM 10.0.0"
|
||||
+ #elif (__clang_major__ == 9 && __clang_minor__ == 0 && __clang_patchlevel__ == 1)
|
||||
+ "Clang/LLVM 9.0.1"
|
||||
+ #elif (__clang_major__ == 9 && __clang_minor__ == 0 && __clang_patchlevel__ == 0)
|
||||
+ "Clang/LLVM 9.0.0"
|
||||
+ #elif (__clang_major__ == 8 && __clang_minor__ == 0 && __clang_patchlevel__ == 1)
|
||||
+ "Clang/LLVM 8.0.1"
|
||||
+ #elif (__clang_major__ == 8 && __clang_minor__ == 0 && __clang_patchlevel__ == 0)
|
||||
+ "Clang/LLVM 8.0.0"
|
||||
+ #elif (__clang_major__ == 7 && __clang_minor__ == 0 && __clang_patchlevel__ == 1)
|
||||
+ "Clang/LLVM 7.0.1"
|
||||
+ #elif (__clang_major__ == 7 && __clang_minor__ == 0 && __clang_patchlevel__ == 0)
|
||||
+ "Clang/LLVM 7.0.0"
|
||||
+ #elif (__clang_major__ == 6 && __clang_minor__ == 0 && __clang_patchlevel__ == 1)
|
||||
+ "Clang/LLVM 6.0.1"
|
||||
+ #elif (__clang_major__ == 6 && __clang_minor__ == 0 && __clang_patchlevel__ == 0)
|
||||
+ "Clang/LLVM 6.0.0"
|
||||
+ #else
|
||||
+ "Clang/LLVM"
|
||||
+ #endif
|
||||
#elif defined(__MINGW32__)
|
||||
"MinGW"
|
||||
#elif defined(__GNUWIN32__)
|
||||
"Gnu-Win32 compiler"
|
||||
#elif defined(__GNUG__)
|
||||
- "Gnu C++"
|
||||
+ #if wxCHECK_GCC_VERSION(9,4)
|
||||
+ "Gnu C++ 9.4"
|
||||
+ #elif wxCHECK_GCC_VERSION(9,3)
|
||||
+ "Gnu C++ 9.3"
|
||||
+ #elif wxCHECK_GCC_VERSION(9,2)
|
||||
+ "Gnu C++ 9.2"
|
||||
+ #elif wxCHECK_GCC_VERSION(9,1)
|
||||
+ "Gnu C++ 9.1"
|
||||
+ #elif wxCHECK_GCC_VERSION(9,0)
|
||||
+ "Gnu C++ 9.0"
|
||||
+ #elif wxCHECK_GCC_VERSION(8,3)
|
||||
+ "Gnu C++ 8.3"
|
||||
+ #elif wxCHECK_GCC_VERSION(8,2)
|
||||
+ "Gnu C++ 8.2"
|
||||
+ #elif wxCHECK_GCC_VERSION(8,1)
|
||||
+ "Gnu C++ 8.1"
|
||||
+ #elif wxCHECK_GCC_VERSION(8,0)
|
||||
+ "Gnu C++ 8.0"
|
||||
+ #elif wxCHECK_GCC_VERSION(7,4)
|
||||
+ "Gnu C++ 7.4"
|
||||
+ #elif wxCHECK_GCC_VERSION(7,3)
|
||||
+ "Gnu C++ 7.3"
|
||||
+ #elif wxCHECK_GCC_VERSION(7,2)
|
||||
+ "Gnu C++ 7.2"
|
||||
+ #elif wxCHECK_GCC_VERSION(7,1)
|
||||
+ "Gnu C++ 7.1"
|
||||
+ #elif wxCHECK_GCC_VERSION(7,0)
|
||||
+ "Gnu C++ 7.0"
|
||||
+ #elif wxCHECK_GCC_VERSION(6,4)
|
||||
+ "Gnu C++ 6.4"
|
||||
+ #elif wxCHECK_GCC_VERSION(6,3)
|
||||
+ "Gnu C++ 6.3"
|
||||
+ #elif wxCHECK_GCC_VERSION(6,2)
|
||||
+ "Gnu C++ 6.2"
|
||||
+ #elif wxCHECK_GCC_VERSION(6,1)
|
||||
+ "Gnu C++ 6.1"
|
||||
+ #elif wxCHECK_GCC_VERSION(6,0)
|
||||
+ "Gnu C++ 6.0"
|
||||
+ #elif wxCHECK_GCC_VERSION(5,9)
|
||||
+ "Gnu C++ 5.9"
|
||||
+ #elif wxCHECK_GCC_VERSION(5,8)
|
||||
+ "Gnu C++ 5.8"
|
||||
+ #elif wxCHECK_GCC_VERSION(5,7)
|
||||
+ "Gnu C++ 5.7"
|
||||
+ #elif wxCHECK_GCC_VERSION(5,6)
|
||||
+ "Gnu C++ 5.6"
|
||||
+ #elif wxCHECK_GCC_VERSION(5,5)
|
||||
+ "Gnu C++ 5.5"
|
||||
+ #elif wxCHECK_GCC_VERSION(5,4)
|
||||
+ "Gnu C++ 5.4"
|
||||
+ #elif wxCHECK_GCC_VERSION(5,3)
|
||||
+ "Gnu C++ 5.3"
|
||||
+ #elif wxCHECK_GCC_VERSION(5,2)
|
||||
+ "Gnu C++ 5.2"
|
||||
+ #elif wxCHECK_GCC_VERSION(5,1)
|
||||
+ "Gnu C++ 5.1"
|
||||
+ #elif wxCHECK_GCC_VERSION(5,0)
|
||||
+ "Gnu C++ 5.0"
|
||||
+ #elif wxCHECK_GCC_VERSION(4,9)
|
||||
+ "Gnu C++ 4.9"
|
||||
+ #elif wxCHECK_GCC_VERSION(4,8)
|
||||
+ "Gnu C++ 4.8"
|
||||
+ #elif wxCHECK_GCC_VERSION(4,7)
|
||||
+ "Gnu C++ 4.7"
|
||||
+ #elif wxCHECK_GCC_VERSION(4,6)
|
||||
+ "Gnu C++ 4.6"
|
||||
+ #else
|
||||
+ "Gnu C++"
|
||||
+ #endif
|
||||
#elif defined(__VISUALC__) // The value of this macro corresponds to the compiler version: 1020 for 4.2 (the first supported version), 1100 for 5.0, 1200 for 6.0 and so on
|
||||
#if __VISUALC__ == 1020
|
||||
"Microsoft Visual C++ 4.2"
|
||||
|
|
|
|||
|
|
@ -1,14 +0,0 @@
|
|||
--- src/saga_core/saga_gui/saga_frame.cpp.orig 2022-10-15 20:07:34 UTC
|
||||
+++ src/saga_core/saga_gui/saga_frame.cpp
|
||||
@@ -1290,9 +1290,9 @@ void CSAGA_Frame::TB_Add(wxToolBarBase *pToolBar, cons
|
||||
void CSAGA_Frame::TB_Add_Item(wxToolBarBase *pToolBar, bool bCheck, int Cmd_ID)
|
||||
{
|
||||
if( bCheck )
|
||||
- ((wxToolBar *)pToolBar)->AddTool(Cmd_ID, CMD_Get_Name(Cmd_ID), IMG_Get_Bitmap(CMD_Get_ImageID(Cmd_ID), pToolBar->GetToolBitmapSize()), CMD_Get_Help(Cmd_ID), wxITEM_CHECK);
|
||||
+ ((wxToolBar *)pToolBar)->AddTool(Cmd_ID, CMD_Get_Name(Cmd_ID), (wxBitmapBundle)IMG_Get_Bitmap(CMD_Get_ImageID(Cmd_ID), pToolBar->GetToolBitmapSize()), CMD_Get_Help(Cmd_ID), wxITEM_CHECK);
|
||||
else
|
||||
- ((wxToolBar *)pToolBar)->AddTool(Cmd_ID, CMD_Get_Name(Cmd_ID), IMG_Get_Bitmap(CMD_Get_ImageID(Cmd_ID), pToolBar->GetToolBitmapSize()), CMD_Get_Help(Cmd_ID));
|
||||
+ ((wxToolBar *)pToolBar)->AddTool(Cmd_ID, CMD_Get_Name(Cmd_ID), (wxBitmapBundle)IMG_Get_Bitmap(CMD_Get_ImageID(Cmd_ID), pToolBar->GetToolBitmapSize()), CMD_Get_Help(Cmd_ID));
|
||||
}
|
||||
|
||||
//---------------------------------------------------------
|
||||
Loading…
Reference in New Issue