Merge pull request #27 from Maximilian-Reuter/ftl

Add changing Package UUID based on OBS version
mixer · Nov 4, 2016 · 18c1125 · 18c1125
2 parents fa7c975 + db22e71
commit 18c1125
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/cmake/Modules/ObsCpack.cmake b/cmake/Modules/ObsCpack.cmake
@@ -59,27 +59,31 @@ set(CPACK_BUNDLE_STARTUP_COMMAND "${CMAKE_SOURCE_DIR}/cmake/osxbundle/obslaunch.
 
 set(CPACK_WIX_TEMPLATE "${CMAKE_SOURCE_DIR}/cmake/Modules/WIX.template.in")
 
+set(UUID_Namespace "69a3c93c-50c8-4c41-a2b7-7a11697e850c")
 if(INSTALLER_RUN)
 	set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "OBSStudio")
 	set(CPACK_WIX_UPGRADE_GUID "1f59ff79-2a3c-43c1-b2b2-033a5e6342eb")
-	set(CPACK_WIX_PRODUCT_GUID "0c7bec2a-4f07-41b2-9dff-d64b09c9c384")
+	#set(CPACK_WIX_PRODUCT_GUID "0c7bec2a-4f07-41b2-9dff-d64b09c9c384")
 	set(CPACK_PACKAGE_FILE_NAME "obs-studio-${OBS_VERSION}")
+	string(UUID CPACK_WIX_PRODUCT_GUID NAMESPACE ${UUID_Namespace} NAME ${CPACK_PACKAGE_FILE_NAME} TYPE SHA1 UPPER)
 elseif(CMAKE_SIZEOF_VOID_P EQUAL 8)
 	if(WIN32)
 		set(CPACK_PACKAGE_NAME "OBS Studio (64bit)")
 	endif()
 	set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "OBSStudio64")
 	set(CPACK_WIX_UPGRADE_GUID "44c72510-2e8e-489c-8bc0-2011a9631b0b")
-	set(CPACK_WIX_PRODUCT_GUID "ca5bf4fe-7b38-4003-9455-de249d03caac")
+	#set(CPACK_WIX_PRODUCT_GUID "ca5bf4fe-7b38-4003-9455-de249d03caac")
 	set(CPACK_PACKAGE_FILE_NAME "obs-studio-x64-${OBS_VERSION}")
+	string(UUID CPACK_WIX_PRODUCT_GUID NAMESPACE ${UUID_Namespace} NAME ${CPACK_PACKAGE_FILE_NAME} TYPE SHA1 UPPER)
 else()
 	if(WIN32)
 		set(CPACK_PACKAGE_NAME "OBS Studio (32bit)")
 	endif()
 	set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "OBSStudio32")
 	set(CPACK_WIX_UPGRADE_GUID "a26acea4-6190-4470-9fb9-f6d32f3ba030")
-	set(CPACK_WIX_PRODUCT_GUID "8e24982d-b0ab-4f66-9c90-f726f3b64682")
+	#set(CPACK_WIX_PRODUCT_GUID "8e24982d-b0ab-4f66-9c90-f726f3b64682")
 	set(CPACK_PACKAGE_FILE_NAME "obs-studio-x86-${OBS_VERSION}")
+	string(UUID CPACK_WIX_PRODUCT_GUID NAMESPACE ${UUID_Namespace} NAME ${CPACK_PACKAGE_FILE_NAME} TYPE SHA1 UPPER)
 endif()
 
 set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_NAME}")