Skip to content

Commit

Permalink
Update for QGIS 3.40.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@mooiman
mooiman committed Nov 23, 2024
1 parent 62c4fbe commit 01f8b1d
Show file tree
Hide file tree
Showing 9 changed files with 28 additions and 28 deletions.
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ At this moment the development environment is based on Visual Studio 2017.

## Environment variables
Environment variables (example)
QT5DIR64=c:\Qt\Qt5.12.6\5.12.6\msvc2017_64\
QT5DIR64OSGEO=c:\OSGeo4W64\apps\Qt5
QT5DIR_OSGEO=c:\OSGeo4W64\apps\Qt5
BOOST_ROOT_DIR=c:\boost\boost_1_85_0\

## Link Libraries
netCDF library:
Expand Down
8 changes: 4 additions & 4 deletions dispatch_release_dll_to_qgis.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ copy .\doc\qgis_umesh_installation.pdf "c:\Program Files\Deltares\qgis_umesh\do
copy .\icons\*.* "c:\Program Files\Deltares\qgis_umesh\icons\*.*"

rem copy to Bulletin
copy "c:\OSGeo4W\apps\qgis\plugins\qgis_umesh.dll" n:\Deltabox\Bulletin\mooiman\programs\QGIS_3.34.00_qgis_umesh\*.*
copy .\doc\qgis_umesh_um.pdf n:\Deltabox\Bulletin\mooiman\programs\QGIS_3.34.00_qgis_umesh\doc\*.*
copy .\doc\qgis_umesh_installation.pdf n:\Deltabox\Bulletin\mooiman\programs\QGIS_3.34.00_qgis_umesh\doc\*.*
copy .\icons\*.* n:\Deltabox\Bulletin\mooiman\programs\QGIS_3.34.00_qgis_umesh\icons\*.*
copy "c:\OSGeo4W\apps\qgis\plugins\qgis_umesh.dll" n:\Deltabox\Bulletin\mooiman\programs\QGIS_3.40.01_qgis_umesh\*.*
copy .\doc\qgis_umesh_um.pdf n:\Deltabox\Bulletin\mooiman\programs\QGIS_3.40.01_qgis_umesh\doc\*.*
copy .\doc\qgis_umesh_installation.pdf n:\Deltabox\Bulletin\mooiman\programs\QGIS_3.40.01_qgis_umesh\doc\*.*
copy .\icons\*.* n:\Deltabox\Bulletin\mooiman\programs\QGIS_3.40.01_qgis_umesh\icons\*.*
rem pause
Binary file modified lib/x64/debug/qgis_analysis.lib
View file
Binary file not shown.
Binary file modified lib/x64/debug/qgis_core.lib
View file
Binary file not shown.
Binary file modified lib/x64/debug/qgis_gui.lib
View file
Binary file not shown.
Binary file modified lib/x64/release/qgis_analysis.lib
View file
Binary file not shown.
Binary file modified lib/x64/release/qgis_core.lib
View file
Binary file not shown.
Binary file modified lib/x64/release/qgis_gui.lib
View file
Binary file not shown.
44 changes: 22 additions & 22 deletions packages/qgis_umesh.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@
</ItemGroup>
<ItemGroup>
<CustomBuild Include="include\qgis_umesh.h">
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QT5DIR64OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QT5DIR_OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp</Command>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Performing Custom Build Step: MOC%27ing %(FullPath)</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Performing Custom Build Step: MOC%27ing %(FullPath)</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">generated\moc_%(Filename).cpp;%(Outputs)</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QT5DIR64OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QT5DIR_OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">generated\moc_%(Filename).cpp;%(Outputs)</Outputs>
</CustomBuild>
</ItemGroup>
Expand All @@ -51,12 +51,12 @@
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">generated\moc_%(Filename).cpp;%(Outputs)</Outputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Performing Custom Build Step: MOC%27ing %(FullPath)</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Performing Custom Build Step: MOC%27ing %(FullPath)</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QT5DIR64OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QT5DIR64OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QT5DIR_OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QT5DIR_OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp</Command>
</CustomBuild>
<CustomBuild Include="include\MyDrawingCanvas.h">
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QT5DIR64OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QT5DIR64OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QT5DIR_OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QT5DIR_OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp</Command>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Performing Custom Build Step: MOC%27ing %(FullPath)</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Performing Custom Build Step: MOC%27ing %(FullPath)</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">generated\moc_%(Filename).cpp;%(Outputs)</Outputs>
Expand All @@ -65,8 +65,8 @@
<ClInclude Include="include\AbstractCanvas.h" />
<ClInclude Include="include\AbstractCanvasListener.h" />
<CustomBuild Include="include\my_date_time_edit.h">
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QT5DIR64OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QT5DIR64OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QT5DIR_OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QT5DIR_OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp</Command>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Performing Custom Build Step: MOC%27ing %(FullPath)</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Performing Custom Build Step: MOC%27ing %(FullPath)</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">generated\moc_%(Filename).cpp;%(Outputs)</Outputs>
Expand All @@ -77,28 +77,28 @@
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">generated\moc_%(Filename).cpp;%(Outputs)</Outputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Performing Custom Build Step: MOC%27ing %(FullPath)</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Performing Custom Build Step: MOC%27ing %(FullPath)</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QT5DIR64OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QT5DIR64OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QT5DIR_OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QT5DIR_OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp</Command>
</CustomBuild>
<CustomBuild Include="include\map_property_window.h">
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">generated\moc_%(Filename).cpp;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">generated\moc_%(Filename).cpp;%(Outputs)</Outputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Performing Custom Build Step: MOC%27ing %(FullPath)</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Performing Custom Build Step: MOC%27ing %(FullPath)</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QT5DIR64OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QT5DIR64OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QT5DIR_OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QT5DIR_OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp</Command>
</CustomBuild>
<CustomBuild Include="include\add_current_view_window.h">
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">generated\moc_%(Filename).cpp;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">generated\moc_%(Filename).cpp;%(Outputs)</Outputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Performing Custom Build Step: MOC%27ing %(FullPath)</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Performing Custom Build Step: MOC%27ing %(FullPath)</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QT5DIR64OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QT5DIR64OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QT5DIR_OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QT5DIR_OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp</Command>
</CustomBuild>
<CustomBuild Include="include\handle_vector_layers.h">
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QT5DIR64OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QT5DIR64OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QT5DIR_OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QT5DIR_OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp</Command>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Performing Custom Build Step: MOC%27ing %(FullPath)</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Performing Custom Build Step: MOC%27ing %(FullPath)</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">generated\moc_%(Filename).cpp;%(Outputs)</Outputs>
Expand All @@ -113,8 +113,8 @@
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">generated\moc_%(Filename).cpp;%(Outputs)</Outputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Performing Custom Build Step: MOC%27ing %(FullPath)</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Performing Custom Build Step: MOC%27ing %(FullPath)</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QT5DIR64OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QT5DIR64OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QT5DIR_OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QT5DIR_OSGEO)\bin\moc.exe %(FullPath) -o generated\moc_%(Filename).cpp</Command>
</CustomBuild>
<ClInclude Include="include\perf_timer.h" />
<ClInclude Include="include\qgis_umesh_version.h" />
Expand All @@ -134,13 +134,13 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Expand Down Expand Up @@ -182,7 +182,7 @@ call ..\scripts\git_insert_hash.cmd .\include qqis_umesh_version.rc</Command>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>Default</InlineFunctionExpansion>
<AdditionalIncludeDirectories>.\include;c:\OSGeo4W\include\;c:\OSGeo4W\apps\qgis\include;$(QT5DIR64OSGEO)\include;$(QT5DIR64OSGEO)\include\ActiveQt\;$(QT5DIR64OSGEO)\include\Qt\;$(QT5DIR64OSGEO)\include\QtCore\;$(QT5DIR64OSGEO)\include\QtGui\;$(QT5DIR64OSGEO)\include\QtSvg\;$(QT5DIR64OSGEO)\include\QtWidgets\;$(QT5DIR64OSGEO)\include\QtXml\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.\include;c:\OSGeo4W\include\;c:\OSGeo4W\apps\qgis\include;$(QT5DIR_OSGEO)\include;$(QT5DIR_OSGEO)\include\ActiveQt\;$(QT5DIR_OSGEO)\include\Qt\;$(QT5DIR_OSGEO)\include\QtCore\;$(QT5DIR_OSGEO)\include\QtGui\;$(QT5DIR_OSGEO)\include\QtSvg\;$(QT5DIR_OSGEO)\include\QtWidgets\;$(QT5DIR_OSGEO)\include\QtXml\;$(BOOST_ROOT_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;QT_DLL;QT_THREAD_SUPPORT;CORE_EXPORT=;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<FunctionLevelLinking>true</FunctionLevelLinking>
Expand Down Expand Up @@ -230,7 +230,7 @@ call ..\scripts\git_insert_hash.cmd .\include qqis_umesh_version.rc</Command>
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>.\include;c:\OSGeo4W\include\google;c:\OSGeo4W\apps\qgis\include;$(QT5DIR64OSGEO)\include;$(QT5DIR64OSGEO)\include\ActiveQt\;$(QT5DIR64OSGEO)\include\Qt\;$(QT5DIR64OSGEO)\include\QtCore\;$(QT5DIR64OSGEO)\include\QtGui\;$(QT5DIR64OSGEO)\include\QtSvg\;$(QT5DIR64OSGEO)\include\QtWidgets\;$(QT5DIR64OSGEO)\include\QtXml\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.\include;c:\OSGeo4W\include\;c:\OSGeo4W\apps\qgis\include;$(QT5DIR_OSGEO)\include;$(QT5DIR_OSGEO)\include\ActiveQt\;$(QT5DIR_OSGEO)\include\Qt\;$(QT5DIR_OSGEO)\include\QtCore\;$(QT5DIR_OSGEO)\include\QtGui\;$(QT5DIR_OSGEO)\include\QtSvg\;$(QT5DIR_OSGEO)\include\QtWidgets\;$(QT5DIR_OSGEO)\include\QtXml\;$(BOOST_ROOT_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;CORE_EXPORT=;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
Expand Down

0 comments on commit 01f8b1d

Please sign in to comment.