Include openssl files in msi package

Author: Piotr Obrzut

cdk/cmake/ssl.cmake

@@ -412,11 +412,11 @@ function(bundle_ssl_libs)
         #message("result: ${lib_dll}")
 
         message("bundling: ${lib}")
-        install(FILES "${lib}" DESTINATION "${INSTALL_LIB_DIR_STATIC}")
+        install(FILES "${lib}" DESTINATION "${INSTALL_LIB_DIR_STATIC}" COMPONENT OpenSSL)
 
         if(lib_dll)
           message("bundling: ${lib_dll}")
-          install(FILES "${lib_dll}" DESTINATION "${INSTALL_LIB_DIR}")
+          install(FILES "${lib_dll}" DESTINATION "${INSTALL_LIB_DIR}" COMPONENT OpenSSL)
         else()
 
           message(WARNING "Could not find DLL library for openSSL library ${lib_name} at ${lib_path}. OpenSSL libraries can not be bundled with the connector.")
@@ -434,7 +434,7 @@ function(bundle_ssl_libs)
         else()
 
           message("bundling: ${lib_file}")
-          install(FILES "${lib_file}" DESTINATION "${INSTALL_LIB_DIR_STATIC}")
+          install(FILES "${lib_file}" DESTINATION "${INSTALL_LIB_DIR_STATIC}" COMPONENT OpenSSL)
           get_filename_component(lib_dir "${lib_file}" DIRECTORY)
           get_filename_component(lib_name "${lib_file}" NAME)
 

packaging/WiX/CPackWixConfig.cmake

@@ -21,7 +21,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 SET(CPACK_COMPONENTS_USED 
-    "XDevAPIDll;JDBCDll;XDevAPIDev;JDBCDev;Readme")
+    "XDevAPIDll;JDBCDll;XDevAPIDev;JDBCDev;OpenSSL;Readme")
 
 # Some components are optional
 # We will build MSI without optional components that are not selected for build
@@ -44,6 +44,7 @@ SET(CPACK_COMPONENTS_ALL ${CPACK_ALL})
 # Always install (hidden), includes Readme files
 SET(CPACK_COMPONENT_GROUP_ALWAYSINSTALL_HIDDEN 1)
 SET(CPACK_COMPONENT_README_GROUP "AlwaysInstall")
+SET(CPACK_COMPONENT_OPENSSL_GROUP "AlwaysInstall")
 
 # Feature Connector C++
 SET(CPACK_COMPONENT_GROUP_CONNECTORCPP_DISPLAY_NAME "Connector C++")