diff --git a/ApplicationExeCode/CMakeLists.txt b/ApplicationExeCode/CMakeLists.txt index adaa483bf2..25d331b507 100644 --- a/ApplicationExeCode/CMakeLists.txt +++ b/ApplicationExeCode/CMakeLists.txt @@ -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} $ - "$,--debug,--release>" --no-translations + COMMAND + ${WINDEPLOYQT_EXECUTABLE} $ + "$,--debug,--release>" --no-translations >NUL 2>NUL COMMENT "Running windeployqt to deploy Qt dependencies to the build folder, required by install()" ) diff --git a/ApplicationLibCode/ModelVisualization/RivGridPartMgr.cpp b/ApplicationLibCode/ModelVisualization/RivGridPartMgr.cpp index cbad222ab4..1f0e9141d4 100644 --- a/ApplicationLibCode/ModelVisualization/RivGridPartMgr.cpp +++ b/ApplicationLibCode/ModelVisualization/RivGridPartMgr.cpp @@ -144,10 +144,19 @@ void RivGridPartMgr::generatePartGeometry( cvf::StructGridGeometryGenerator& geo // Surface geometry { - auto text = caf::AppEnum::text( m_cellSetType ); - RiaLogging::resetTimer( "Compute surface for " + text ); + bool showDebugTiming = false; + if ( showDebugTiming ) + { + auto text = caf::AppEnum::text( m_cellSetType ); + RiaLogging::resetTimer( "Compute surface for " + text ); + } + cvf::ref geo = geoBuilder.generateSurface(); - RiaLogging::logTimeElapsed( "" ); + + if ( showDebugTiming ) + { + RiaLogging::logTimeElapsed( "" ); + } if ( geo.notNull() ) { diff --git a/ResInsightVersion.cmake b/ResInsightVersion.cmake index 4ff2f69f17..a2cce6ed77 100644 --- a/ResInsightVersion.cmake +++ b/ResInsightVersion.cmake @@ -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")