Win packaging: Fix 64-bit VC/GCC co-install issue

diff --git a/ChangeLog.md b/ChangeLog.md
index 3667d120b1c4c979033f799b99a929d88aebc973..4d6960f3db3bc2e5eab97801619415df41cc218d 100644 (file)
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,14 @@
+2.0.4
+=====
+
+### Significant changes relative to 2.0.3:
+
+1. Fixed a regression in the Windows packaging system (introduced by
+2.0 beta1[2]) whereby, if both the 64-bit libjpeg-turbo SDK for GCC and the
+64-bit libjpeg-turbo SDK for Visual C++ were installed on the same system, only
+one of them could be uninstalled.
+
+
 2.0.3
 =====
 

diff --git a/cmakescripts/BuildPackages.cmake b/cmakescripts/BuildPackages.cmake
index 11d542689abbf2f77469a58bb532778a120643cd..395dd9895c7830589b181f84b873a1e373ba2a8a 100644 (file)
--- a/cmakescripts/BuildPackages.cmake
+++ b/cmakescripts/BuildPackages.cmake
@@ -83,7 +83,7 @@ endif()
 if(BITS EQUAL 64)
   set(INST_PLATFORM "${INST_PLATFORM} 64-bit")
   set(INST_NAME ${INST_NAME}64)
-  set(INST_REG_NAME ${INST_DIR}64)
+  set(INST_REG_NAME ${INST_REG_NAME}64)
   set(INST_DEFS ${INST_DEFS} -DWIN64)
 endif()