From e58f9d0c73810cca44f4e28a11c7f9d18c1baa0d Mon Sep 17 00:00:00 2001
From: Bill Somerville <g4wjs@classdesign.com>
Date: Mon, 21 Apr 2014 12:21:44 +0000
Subject: [PATCH] Backed out component install changes that inadvertenly got
 commited as part of r4046. These caused GUI installer packages to be
 incomplete.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4058 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 CMakeCPackOptions.cmake.in |  2 +-
 CMakeLists.txt             | 35 +++++++++++++++++++++++------------
 debian/CMakeLists.txt      |  2 +-
 manpages/CMakeLists.txt    |  1 +
 4 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/CMakeCPackOptions.cmake.in b/CMakeCPackOptions.cmake.in
index 2946ad647..8b9ca9154 100644
--- a/CMakeCPackOptions.cmake.in
+++ b/CMakeCPackOptions.cmake.in
@@ -15,7 +15,7 @@ set (CPACK_STRIP_FILES TRUE)
 #
 # components
 #
-set (CPACK_COMPONENTS_ALL Runtime)
+#set (CPACK_COMPONENTS_ALL Unspecified Runtime)
 #set (CPACK_COMPONENT_APPLICATIONS_DISPLAY_NAME "WSJT-X Application")
 #set (CPACK_COMPONENT_APPLICATIONS_DESCRIPTION "@WSJTX_DESCRIPTION_SUMMARY@")
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index db82ee2b3..94d1e3aab 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -660,20 +660,20 @@ install (TARGETS wsjtx
   RUNTIME DESTINATION ${WSJT_BIN_DESTINATION}
   LIBRARY DESTINATION ${WSJT_LIB_DESTINATION}
   BUNDLE DESTINATION .
-  COMPONENT Runtime
+  #COMPONENT Runtime
   )
 
 install (TARGETS jt9
   RUNTIME DESTINATION ${WSJT_BIN_DESTINATION}
   LIBRARY DESTINATION ${WSJT_LIB_DESTINATION}
   BUNDLE DESTINATION ${WSJT_BIN_DESTINATION}
-  COMPONENT Runtime
+  #COMPONENT Runtime
   )
 
 install (PROGRAMS
   ${CMAKE_BINARY_DIR}/contrib/kvasd${CMAKE_EXECUTABLE_SUFFIX}
   DESTINATION ${WSJT_BIN_DESTINATION}
-  COMPONENT Runtime
+  #COMPONENT Runtime
   )
 
 
@@ -713,8 +713,16 @@ include_directories ("${PROJECT_BINARY_DIR}")
 if (NOT WIN32 AND NOT APPLE)
   # install a desktop file so wsjtx appears in the application start
   # menu with an icon
-  install (FILES wsjtx.desktop DESTINATION share/applications)
-  install (FILES icons/Unix/wsjtx_icon.png DESTINATION share/pixmaps)
+  install (
+    FILES wsjtx.desktop
+    DESTINATION share/applications
+    #COMPONENT Runtime
+    )
+  install (
+    FILES icons/Unix/wsjtx_icon.png
+    DESTINATION share/pixmaps
+    #COMPONENT Runtime
+    )
 endif (NOT WIN32 AND NOT APPLE)
 
 
@@ -746,7 +754,8 @@ if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
   file (WRITE \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${WSJT_QT_CONF_DESTINATION}/qt.conf\"
 \"[Paths]
 \")
-" #COMPONENT Runtime
+"
+      #COMPONENT Runtime
       )
 
     # if a system Qt is used (e.g. installed in /usr/lib/), it will not be included in the installation
@@ -761,7 +770,7 @@ if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
 	${QT_PLUGINS_DIR}/audio
 	DESTINATION ${WSJT_PLUGIN_DESTINATION}
 	CONFIGURATIONS Release MinSizeRel
-	#      COMPONENT Runtime
+	#COMPONENT Runtime
 	FILES_MATCHING PATTERN "*${CMAKE_SHARED_LIBRARY_SUFFIX}"
 	PATTERN "*minimal*${CMAKE_SHARED_LIBRARY_SUFFIX}" EXCLUDE
 	PATTERN "*offscreen*${CMAKE_SHARED_LIBRARY_SUFFIX}" EXCLUDE
@@ -773,7 +782,7 @@ if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
       # 	${QT_PLUGINS_DIR}/audio
       # 	DESTINATION ${WSJT_PLUGIN_DESTINATION}
       # 	CONFIGURATIONS Debug
-      # 	#      COMPONENT Runtime
+      # 	#COMPONENT Runtime
       # 	FILES_MATCHING PATTERN "*_debug${CMAKE_SHARED_LIBRARY_SUFFIX}"
       # 	PATTERN "*minimal*${CMAKE_SHARED_LIBRARY_SUFFIX}" EXCLUDE
       # 	PATTERN "*offscreen*${CMAKE_SHARED_LIBRARY_SUFFIX}" EXCLUDE
@@ -784,7 +793,8 @@ if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
 file (APPEND \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${WSJT_QT_CONF_DESTINATION}/qt.conf\"
 \"Plugins = Plugins
 \")
-" #COMPONENT Runtime
+"
+	#COMPONENT Runtime
 	)
     endif (APPLE)
 
@@ -801,7 +811,7 @@ file (APPEND \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${WSJT_QT_CONF_DESTINATION
 	${QT_PLUGINS_DIR}/platforms
 	DESTINATION ${WSJT_PLUGIN_DESTINATION}
 	CONFIGURATIONS Release MinSizeRel
-	#      COMPONENT Runtime
+	#COMPONENT Runtime
 	FILES_MATCHING PATTERN "*${CMAKE_SHARED_LIBRARY_SUFFIX}"
 	PATTERN "*minimal*${CMAKE_SHARED_LIBRARY_SUFFIX}" EXCLUDE
 	PATTERN "*offscreen*${CMAKE_SHARED_LIBRARY_SUFFIX}" EXCLUDE
@@ -812,7 +822,7 @@ file (APPEND \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${WSJT_QT_CONF_DESTINATION
       # 	${QT_PLUGINS_DIR}/platforms
       # 	DESTINATION ${WSJT_PLUGIN_DESTINATION}
       # 	CONFIGURATIONS Debug
-      # 	#      COMPONENT Runtime
+      # 	#COMPONENT Runtime
       # 	FILES_MATCHING PATTERN "*d${CMAKE_SHARED_LIBRARY_SUFFIX}"
       # 	PATTERN "*minimal*${CMAKE_SHARED_LIBRARY_SUFFIX}" EXCLUDE
       # 	PATTERN "*offscreen*${CMAKE_SHARED_LIBRARY_SUFFIX}" EXCLUDE
@@ -824,7 +834,8 @@ file (APPEND \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${WSJT_QT_CONF_DESTINATION
 file (APPEND \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${WSJT_QT_CONF_DESTINATION}/qt.conf\"
 \"Plugins = ${_plugins_path}
 \")
-" #COMPONENT Runtime
+"
+	#COMPONENT Runtime
 	)
 
       # set (gp_tool "objdump")	# we want MinGW tool - not MSVC (See GetPrerequisites.cmake)
diff --git a/debian/CMakeLists.txt b/debian/CMakeLists.txt
index ef8849d2e..3ed86e88b 100644
--- a/debian/CMakeLists.txt
+++ b/debian/CMakeLists.txt
@@ -34,5 +34,5 @@ install (FILES
   ${CMAKE_CURRENT_BINARY_DIR}/changelog.gz
   ${CMAKE_CURRENT_BINARY_DIR}/copyright
   DESTINATION ${WSJT_DOC_DESTINATION}
-  COMPONENT Debian
+  #COMPONENT Debian
   )
diff --git a/manpages/CMakeLists.txt b/manpages/CMakeLists.txt
index 472876f79..b078b3720 100644
--- a/manpages/CMakeLists.txt
+++ b/manpages/CMakeLists.txt
@@ -60,6 +60,7 @@ if (A2X_EXECUTABLE AND GZIP_EXECUTABLE AND SED_EXECUTABLE)
     DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man
     DESTINATION ${WSJT_MANPAGE_DESTINATION}
     PATTERN "*.orig" EXCLUDE
+    #COMPONENT Runtime
     )
 endif (A2X_EXECUTABLE AND GZIP_EXECUTABLE AND SED_EXECUTABLE)