diff options
Diffstat (limited to 'packaging/wix')
| -rw-r--r-- | packaging/wix/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | packaging/wix/DirectoryStructure.wxi | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/packaging/wix/CMakeLists.txt b/packaging/wix/CMakeLists.txt index 9efad04503..cc976f3dd5 100644 --- a/packaging/wix/CMakeLists.txt +++ b/packaging/wix/CMakeLists.txt @@ -308,6 +308,8 @@ set(WIX_CANDLE_DEFINES -dPlatform=${TARGET_MACHINE} -dWiresharkName=${CMAKE_PROJECT_NAME} -dWiresharkVersion=${PRODUCT_VERSION} + -dWiresharkMajorVersion=${PROJECT_MAJOR_VERSION} + -dWiresharkMinorVersion=${PROJECT_MINOR_VERSION} -dAssetDir=${CMAKE_SOURCE_DIR}/packaging/wix -dBuildOutputDir=${EXECUTABLE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE} -dDiameterDir=${ARCHIVE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}/diameter diff --git a/packaging/wix/DirectoryStructure.wxi b/packaging/wix/DirectoryStructure.wxi index 6e24e2ce73..00c2dbfb5e 100644 --- a/packaging/wix/DirectoryStructure.wxi +++ b/packaging/wix/DirectoryStructure.wxi @@ -28,7 +28,7 @@ </Directory> <Directory Id="dirRadius" Name="radius"/> <Directory Id="dirPlugins" Name="plugins"> - <Directory Id="dirPluginsVersion" Name="$(var.WiresharkVersion)"/> + <Directory Id="dirPluginsVersion" Name="$(var.WiresharkMajorVersion).$(var.WiresharkMinorVersion)"/> </Directory> <Directory Id="dirProfiles" Name="profiles"/> <Directory Id="dirSnmp" Name="snmp"> |