Skip to content

Commit 9f0e2b6

Browse files
committed
Installer: fix innosetup script for generating version based on
OpenCascade v7.5.0
1 parent 9ed4eb7 commit 9f0e2b6

File tree

3 files changed

+9
-0
lines changed

3 files changed

+9
-0
lines changed

installer/setup.iss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ Source: "{#FFMPEG_BinDir}\*.dll"; DestDir: "{app}"; Flags: ignoreversion
6868
Source: "{#FreeImage_BinDir}\freeimage.dll"; DestDir: "{app}"; Flags: ignoreversion
6969
Source: "{#FreeImage_BinDir}\freeimageplus.dll"; DestDir: "{app}"; Flags: ignoreversion
7070
Source: "{#FreeType_BinDir}\freetype.dll"; DestDir: "{app}"; Flags: ignoreversion
71+
Source: "{#OpenVR_BinDir}\*.dll"; DestDir: "{app}"; Flags: ignoreversion
7172
;Source: "{#TclTk_BinDir}\tcl86.dll"; DestDir: "{app}"; Flags: ignoreversion
7273
;Source: "{#TclTk_BinDir}\tk86.dll"; DestDir: "{app}"; Flags: ignoreversion
7374

installer/setupvars.iss.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@
66
#define FreeImage_BinDir \"$$FREEIMAGE_BIN_DIR\"
77
#define FreeType_BinDir \"$$FREETYPE_BIN_DIR\"
88
#define Tbb_BinDir \"$$TBB_BIN_DIR\"
9+
#define OpenVR_BinDir \"$$OPENVR_BIN_DIR\"
910
#define MsvcRedist_Dir \"$$(VCToolsRedistDir)\"

mayo.pro

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,14 +151,21 @@ LIBS += -lTKVRML
151151
CASCADE_LIST_OPTBIN_DIR = $$split(CASCADE_OPTBIN_DIRS, ;)
152152
for(binPath, CASCADE_LIST_OPTBIN_DIR) {
153153
lowerBinPath = $$lower($${binPath})
154+
154155
findLib = $$find(lowerBinPath, "ffmpeg")
155156
!isEmpty(findLib):FFMPEG_BIN_DIR = $${binPath}
157+
156158
findLib = $$find(lowerBinPath, "freeimage")
157159
!isEmpty(findLib):FREEIMAGE_BIN_DIR = $${binPath}
160+
158161
findLib = $$find(lowerBinPath, "freetype")
159162
!isEmpty(findLib):FREETYPE_BIN_DIR = $${binPath}
163+
160164
findLib = $$find(lowerBinPath, "tbb")
161165
!isEmpty(findLib):TBB_BIN_DIR = $${binPath}
166+
167+
findLib = $$find(lowerBinPath, "openvr")
168+
!isEmpty(findLib):OPENVR_BIN_DIR = $${binPath}
162169
}
163170

164171
# -- Create file "opencascade_dlls.iss" that will contain the required OpenCascade DLL files to be

0 commit comments

Comments
 (0)