CMake|Windows: Tweaks for WiX installer packaging

skyjake · Mar 1, 2015 · 671430d · 671430d
1 parent 8e78e6c
commit 671430d
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/doomsday/apps/libdoomsday/CMakeLists.txt b/doomsday/apps/libdoomsday/CMakeLists.txt
@@ -38,6 +38,9 @@ target_link_libraries (libdoomsday
 target_include_directories (libdoomsday PRIVATE ${ZLIB_INCLUDE_DIR})
 
 if (DENG_ENABLE_SDK)
-    install (DIRECTORY include/doomsday DESTINATION include)
+    install (DIRECTORY include/doomsday 
+        DESTINATION include
+        COMPONENT sdk
+    )
 endif ()
 deng_deploy_library (libdoomsday DengDoomsday)
diff --git a/doomsday/cmake/LegacyPK3s.cmake b/doomsday/cmake/LegacyPK3s.cmake
@@ -17,9 +17,9 @@ execute_process (COMMAND ${PYTHON_EXECUTABLE}
 message (STATUS "Compiling legacy PK3s...")
 
 macro (deng_add_pk3 target)
-    add_custom_target (${target} ALL)
+    add_custom_target (${target})
     set_target_properties (${target} PROPERTIES
-        LOCATION ${outDir}/${target}
+        DENG_LOCATION ${outDir}/${target}
         FOLDER Packages
     )
     if (NOT APPLE)

diff --git a/doomsday/cmake/Macros.cmake b/doomsday/cmake/Macros.cmake
@@ -202,7 +202,7 @@ function (deng_find_resources)
         endif ()
         if (TARGET ${fn})
             # Use the location of the target.
-            get_property (fn TARGET ${fn} PROPERTY LOCATION)
+            get_property (fn TARGET ${fn} PROPERTY DENG_LOCATION)
         endif ()
         set (origFn ${fn})
         if (NOT IS_ABSOLUTE ${fn})
@@ -268,9 +268,9 @@ function (deng_add_package packName)
     )
     clean_paths (msg ${msg})
     message (STATUS "${msg}")
-    add_custom_target (${packName} ALL DEPENDS ${outName})
+    add_custom_target (${packName})
     set_target_properties (${packName} PROPERTIES
-        LOCATION "${outDir}/${outName}"
+        DENG_LOCATION "${outDir}/${outName}"
         FOLDER Packages
     )
     if (NOT APPLE)

diff --git a/doomsday/cmake/Packaging.cmake b/doomsday/cmake/Packaging.cmake
@@ -17,7 +17,8 @@ if (APPLE)
 elseif (UNIX)
     set (CPACK_GENERATOR TGZ)
 else ()
-    set (CPACK_GENERATOR ZIP)
+    set (CPACK_GENERATOR WIX)
+    set (CPACK_PROJECT_CONFIG_FILE ${CMAKE_CURRENT_LIST_DIR}/WIX.cmake)
 endif ()
 
 # Install types.
@@ -34,11 +35,11 @@ if (NOT CPack_CMake_INCLUDED)
         HIDDEN        
     )
     cpack_add_component (libs
-        DISPLAY_NAME "Doomsday 2 Libraries"
+        DISPLAY_NAME "Runtime Libraries"
         INSTALL_TYPES gui
     )
     cpack_add_component (client
-        DISPLAY_NAME "Doomsday Engine and Plugins"
+        DISPLAY_NAME "Engine and Plugins"
         DESCRIPTION "The client and server executables plus game, audio, and other plugins."
         DEPENDS packs libs
         INSTALL_TYPES gui        
@@ -50,7 +51,7 @@ if (NOT CPack_CMake_INCLUDED)
         INSTALL_TYPES gui        
     )
     cpack_add_component (sdk
-        DISPLAY_NAME "Doomsday 2 SDK"
+        DISPLAY_NAME "SDK"
         DESCRIPTION "C++ headers and build configuration files for Doomsday 2."
         DEPENDS libs packs
         INSTALL_TYPES sdk
@@ -63,6 +64,6 @@ if (NOT CPack_CMake_INCLUDED)
         INSTALL_TYPES sdk
     )
 
-    cpack_add_install_type (gui DISPLAY_NAME "Normal")
+    cpack_add_install_type (gui DISPLAY_NAME "Standard")
     cpack_add_install_type (sdk DISPLAY_NAME "Developer")
 endif ()
diff --git a/doomsday/cmake/WIX.cmake b/doomsday/cmake/WIX.cmake
@@ -0,0 +1,2 @@
+set (CPACK_WIX_UPGRADE_GUID "9d4ede0d-dfa4-4695-9710-6d351f35a719")
+set (CPACK_COMPONENT_SDK_DISABLED TRUE)