diff options
-rw-r--r-- | packaging/wix/CMakeLists.txt | 3 | ||||
-rw-r--r-- | packaging/wix/InputPaths.wxi | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/packaging/wix/CMakeLists.txt b/packaging/wix/CMakeLists.txt index ec4bf067d7..a38d483663 100644 --- a/packaging/wix/CMakeLists.txt +++ b/packaging/wix/CMakeLists.txt @@ -172,6 +172,7 @@ if (MAXMINDDB_FOUND) endif() set(WIX_CANDLE_DEFINES + -v -sw1076 -dPlatform=${TARGET_MACHINE} -dWiresharkName=${CMAKE_PROJECT_NAME} @@ -198,6 +199,7 @@ set(WIX_CANDLE_DEFINES # The NSIS CMakeFile sets the program name + version slightly differently. set(WIX_LIGHT_DEFINES + -v -out ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}-${WIRESHARK_TARGET_PLATFORM}-${PROJECT_VERSION}.msi -sw1076 -ext WixUIExtension @@ -206,6 +208,7 @@ set(WIX_LIGHT_DEFINES ) set(WIX_HEAT_FLAGS + -v -ag -nologo -srd diff --git a/packaging/wix/InputPaths.wxi b/packaging/wix/InputPaths.wxi index 8ae31b6689..0fae77b721 100644 --- a/packaging/wix/InputPaths.wxi +++ b/packaging/wix/InputPaths.wxi @@ -7,9 +7,6 @@ <?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?> <?endif?> - <?define VCRedist.Version = "VC141" ?> - <?define VCRedist.Dir ="C:\Program Files (x86)\Common Files\Merge Modules\" ?> - <?define Staging.Dir ="$(var.BuildOutputDir)" ?> <?define Plugins.Dir ="$(var.Staging.Dir)\plugins" ?> <?define Profiles.Dir ="$(var.Staging.Dir)\profiles" ?> |