OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Bump to dev.05

Browse Source 
* Disable logging text for timing of geometry surface creation
* Suppress text output from windeployqt
* Bump to 2024.09.3-dev.05
This commit is contained in:
Magne Sjaastad
2024-11-15 11:36:52 +01:00
committed by GitHub
parent 664b082c81
commit f6109cab2b
3 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ApplicationExeCode/CMakeLists.txt
View File

@@ -434,11 +434,16 @@ if(RESINSIGHT_PRIVATE_INSTALL)
# TODO: This command copies all required dlls, so we should probably not use
# the Install() command to copy external dlls dependencies.
#
# The statements " >NUL 2>NUL" are used to suppress text output from
# windeployqt. ">NUL" suppresses standard output. "2>NUL" suppresses
# standard error.
#
add_custom_command(
TARGET ResInsight
POST_BUILD
COMMAND ${WINDEPLOYQT_EXECUTABLE} $<TARGET_FILE:ResInsight>
"$<IF:$<CONFIG:Debug>,--debug,--release>" --no-translations
COMMAND
${WINDEPLOYQT_EXECUTABLE} $<TARGET_FILE:ResInsight>
"$<IF:$<CONFIG:Debug>,--debug,--release>" --no-translations >NUL 2>NUL
COMMENT
"Running windeployqt to deploy Qt dependencies to the build folder, required by install()"
)

15
ApplicationLibCode/ModelVisualization/RivGridPartMgr.cpp
View File

@@ -144,10 +144,19 @@ void RivGridPartMgr::generatePartGeometry( cvf::StructGridGeometryGenerator& geo
// Surface geometry
{
auto text = caf::AppEnum<RivCellSetEnum>::text( m_cellSetType );
RiaLogging::resetTimer( "Compute surface for " + text );
bool showDebugTiming = false;
if ( showDebugTiming )
{
auto text = caf::AppEnum<RivCellSetEnum>::text( m_cellSetType );
RiaLogging::resetTimer( "Compute surface for " + text );
}
cvf::ref<cvf::DrawableGeo> geo = geoBuilder.generateSurface();
RiaLogging::logTimeElapsed( "" );
if ( showDebugTiming )
{
RiaLogging::logTimeElapsed( "" );
}
if ( geo.notNull() )
{

2
ResInsightVersion.cmake
View File

@@ -11,7 +11,7 @@ set(RESINSIGHT_VERSION_TEXT "-dev")
# Must be unique and increasing within one combination of major/minor/patch version
# The uniqueness of this text is independent of RESINSIGHT_VERSION_TEXT
# Format of text must be ".xx"
set(RESINSIGHT_DEV_VERSION ".04")
set(RESINSIGHT_DEV_VERSION ".05")
# https://github.com/CRAVA/crava/tree/master/libs/nrlib
set(NRLIB_GITHUB_SHA "ba35d4359882f1c6f5e9dc30eb95fe52af50fd6f")