diff --git a/SuperBuild/cmake/External-OpenMVS.cmake b/SuperBuild/cmake/External-OpenMVS.cmake index 219f3059..b9abe373 100644 --- a/SuperBuild/cmake/External-OpenMVS.cmake +++ b/SuperBuild/cmake/External-OpenMVS.cmake @@ -20,7 +20,7 @@ ExternalProject_Add(${_proj_name} #--Download step-------------- DOWNLOAD_DIR ${SB_DOWNLOAD_DIR} GIT_REPOSITORY https://github.com/OpenDroneMap/openMVS - GIT_TAG 2412 + GIT_TAG 250 #--Update/Patch step---------- UPDATE_COMMAND "" #--Configure step------------- diff --git a/innosetup.iss b/innosetup.iss index def7193d..7945e707 100644 --- a/innosetup.iss +++ b/innosetup.iss @@ -52,6 +52,7 @@ Source: "run.bat"; DestDir: "{app}"; Flags: ignoreversion Source: "run.py"; DestDir: "{app}"; Flags: ignoreversion Source: "settings.yaml"; DestDir: "{app}"; Flags: ignoreversion Source: "win32env.bat"; DestDir: "{app}"; Flags: ignoreversion +Source: "winrun.bat"; DestDir: "{app}"; Flags: ignoreversion [Icons] Name: {group}\ODM Console; Filename: "{app}\console.bat"; WorkingDir: "{app}" diff --git a/run.bat b/run.bat index 7b014395..79c7ef42 100644 --- a/run.bat +++ b/run.bat @@ -1,9 +1,3 @@ @echo off - -setlocal - -call win32env.bat -python "%ODMBASE%\run.py" %* - -endlocal - +rem Bypass "Terminate Batch Job" prompt. +winrun.bat %*