Skip to content

Commit

Permalink
Need Innosetup 6 for my files, Innosetup 5 doesn't support all features
Browse files Browse the repository at this point in the history
  • Loading branch information
christofmuc committed Jun 15, 2020
1 parent 17d8d3b commit f378364
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ builds/
*__pycache__*
.idea/
adaptions/CompiledAdaptions.h
third_party/Tools.InnoSetup.6.0.5/
2 changes: 1 addition & 1 deletion The-Orm/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ ENDIF()

IF(WIN32)
# Windows only: Build InnoSetup installer
find_program(INNOSETUP NAMES iscc ISCC HINTS "c:/program files (x86)/Inno Setup 6")
find_program(INNOSETUP NAMES iscc ISCC HINTS "${CMAKE_CURRENT_LIST_DIR}/../third_party/Tools.InnoSetup.6.0.5/tools" "c:/program files (x86)/Inno Setup 6")
if (INNOSETUP)
else()
message(WARNING "Didn't find InnoSetup 6 installation, skipping creation of Client installer '")
Expand Down
2 changes: 1 addition & 1 deletion packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="innosetup" version="5.6.1" targetFramework="any" />
<package id="Tools.InnoSetup" version="6.0.5" targetFramework="any" />
</packages>

0 comments on commit f378364

Please sign in to comment.