Installer: fix innosetup script for generating version based on

OpenCascade v7.5.0
fougue · Feb 12, 2021 · 9f0e2b6 · 9f0e2b6
1 parent 9ed4eb7
commit 9f0e2b6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/installer/setup.iss b/installer/setup.iss
@@ -68,6 +68,7 @@ Source: "{#FFMPEG_BinDir}\*.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#FreeImage_BinDir}\freeimage.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#FreeImage_BinDir}\freeimageplus.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#FreeType_BinDir}\freetype.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#OpenVR_BinDir}\*.dll"; DestDir: "{app}"; Flags: ignoreversion
 ;Source: "{#TclTk_BinDir}\tcl86.dll"; DestDir: "{app}"; Flags: ignoreversion
 ;Source: "{#TclTk_BinDir}\tk86.dll"; DestDir: "{app}"; Flags: ignoreversion
 

diff --git a/installer/setupvars.iss.in b/installer/setupvars.iss.in
@@ -6,4 +6,5 @@
 #define FreeImage_BinDir \"$$FREEIMAGE_BIN_DIR\"
 #define FreeType_BinDir \"$$FREETYPE_BIN_DIR\"
 #define Tbb_BinDir \"$$TBB_BIN_DIR\"
+#define OpenVR_BinDir \"$$OPENVR_BIN_DIR\"
 #define MsvcRedist_Dir \"$$(VCToolsRedistDir)\"
diff --git a/mayo.pro b/mayo.pro
@@ -151,14 +151,21 @@ LIBS += -lTKVRML
 CASCADE_LIST_OPTBIN_DIR = $$split(CASCADE_OPTBIN_DIRS, ;)
 for(binPath, CASCADE_LIST_OPTBIN_DIR) {
     lowerBinPath = $$lower($${binPath})
+
     findLib = $$find(lowerBinPath, "ffmpeg")
     !isEmpty(findLib):FFMPEG_BIN_DIR = $${binPath}
+
     findLib = $$find(lowerBinPath, "freeimage")
     !isEmpty(findLib):FREEIMAGE_BIN_DIR = $${binPath}
+
     findLib = $$find(lowerBinPath, "freetype")
     !isEmpty(findLib):FREETYPE_BIN_DIR = $${binPath}
+
     findLib = $$find(lowerBinPath, "tbb")
     !isEmpty(findLib):TBB_BIN_DIR = $${binPath}
+
+    findLib = $$find(lowerBinPath, "openvr")
+    !isEmpty(findLib):OPENVR_BIN_DIR = $${binPath}
 }
 
 # -- Create file "opencascade_dlls.iss" that will contain the required OpenCascade DLL files to be