Bug#37179475 MSI installer should not install cmake configuration script in "Typical" profile

Author: rsomla1

buildinfo.cmake

@@ -42,10 +42,10 @@ function(generate_cmake_config)
     )
 
     install(
-      FILES 
+      FILES
         "${CMAKE_BINARY_DIR}/mysql-concpp${suffix}.cmake"
       DESTINATION .
-      COMPONENT Readme
+      COMPONENT DevCommon
     )
 
   endforeach()

packaging/WiX/connector-cpp.wxs.in

@@ -115,8 +115,26 @@
     <!-- License -->
     <WixVariable Id="WixUILicenseRtf" Value="@LICENSE_RTF@" />
 
-    <!-- Installation root-->
+    <!--
+      Register installed connector in the CMake system package registry.
+      See https://cmake.org/cmake/help/latest/manual/cmake-packages.7.html#system-package-registry
+    -->
+
+    <Component
+      Id="CMAKE_PACKAGE_REGISTRY"
+      Guid="7548d925-f065-482f-aea5-295500955198"
+      Directory="INSTALLDIR"
+    >
 
+      <RegistryValue
+        Root="HKLM"
+        Key="Software\Kitware\CMake\Packages\mysql-concpp"
+        Type="string"
+        Name="mysql-msi-installation"
+        Value="[INSTALLDIR]"
+      />
+
+    </Component>
 
     <!-- WIX_FEATURES -->
     <Feature Id="XDEVAPI" Title="New X DevAPI connector" Description="New X DevAPI connector" ConfigurableDirectory="INSTALLDIR" Level="1">
@@ -125,8 +143,10 @@
        <ComponentGroupRef Id="componentgroup.OpenSSLDll" />
     </Feature>
     <Feature Id="XDevAPIDev" Title="Development Components" Description="Connector C++ headers, static libraries and import libraries" ConfigurableDirectory="INSTALLDIR" Level="4">
+       <ComponentGroupRef Id="componentgroup.DevCommon" />
        <ComponentGroupRef Id="componentgroup.XDevAPIDev" />
        <ComponentGroupRef Id="componentgroup.OpenSSLDev" />
+       <ComponentRef Id="CMAKE_PACKAGE_REGISTRY" />
     </Feature>
    </Feature>
 
@@ -136,8 +156,10 @@
        <ComponentGroupRef Id="componentgroup.OpenSSLDll" />
     </Feature>
     <Feature Id="JDBCDev" Title="Development Components" Description="Installs legacy JDBC API connector dev files" ConfigurableDirectory="INSTALLDIR" Level="4">
+       <ComponentGroupRef Id="componentgroup.DevCommon" />
        <ComponentGroupRef Id="componentgroup.JDBCDev" />
        <ComponentGroupRef Id="componentgroup.OpenSSLDev" />
+       <ComponentRef Id="CMAKE_PACKAGE_REGISTRY" />
     </Feature>
    </Feature>
 
@@ -147,27 +169,6 @@
        <ComponentGroupRef Id="componentgroup.Readme" />
     </Feature>
 
-    <!--
-      Register installed connector in the CMake system package registry.
-      See https://cmake.org/cmake/help/latest/manual/cmake-packages.7.html#system-package-registry
-    -->
-
-    <Component
-      Id="CMAKE_PACKAGE_REGISTRY"
-      Guid="7548d925-f065-482f-aea5-295500955198"
-      Directory="INSTALLDIR"
-    >
-
-      <RegistryValue
-        Root="HKLM"
-        Key="Software\Kitware\CMake\Packages\mysql-concpp"
-        Type="string"
-        Name="mysql-msi-installation"
-        Value="[INSTALLDIR]"
-      />
-
-    </Component>
-
    </Feature>