packaging: do not put install manifest in the install location.

Instead, a new option INSTALL_MANIFEST gives location of the manifest file.

Author: rsomla1

packaging/CMakeLists.txt

@@ -31,26 +31,25 @@
 # Install manifest
 # ======================================================================
 
-# Generate and install install_manifest.cmake file which contains
-# information about install components and files in each component.
+# If requested, generate install manifest file which contains information
+# about install components and files in each component. INSTALL_MANIFEST
+# should be a path to the manifest file.
 # See the install_mainfest.cmake script in this directory.
 
+if(DEFINED INSTALL_MANIFEST)
+
 add_custom_target(generate_manifest
   ALL
   COMMAND ${CMAKE_COMMAND}
-    -D INSTALL_DIR=${CMAKE_INSTALL_PREFIX}
+    -D MANIFEST_FILE=${INSTALL_MANIFEST}
     -D BUILD_DIR=${PROJECT_BINARY_DIR}
     -D CONFIG=$<CONFIG>
     -P "${CMAKE_CURRENT_SOURCE_DIR}/install_manifest.cmake"
   WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
   COMMENT "Generating install manifest"
 )
 
-install(
-  FILES "${PROJECT_BINARY_DIR}/install_manifest.cmake"
-  DESTINATION .
-  COMPONENT Auxiliary
-)
+endif()
 
 
 # ======================================================================

packaging/WiX/CMakeLists.txt

@@ -26,16 +26,18 @@ cmake_minimum_required(VERSION 3.0)
 # Build MSI package from files installed in CMAKE_INSTALL_PREFIX location.
 #
 # Usage:
-#  cmake -D CMAKE_INSTALL_PREFIX=<install loc> ... <src>/packaging/WiX
+#  cmake -D CMAKE_INSTALL_PREFIX=<install loc> 
+#        -D INSTALL_MANIFEST=<manifest file> ... <src>/packaging/WiX
 #  cmake --build . --target MSI
 #  cmake --build . --target ZIP
 #
 # This should be invoked (in a dedicated location) after building and
 # installing main connector project. CMAKE_INSTALL_PREFIX should point
-# at install location of the main project. It is expected that it contains
-# install_manifest.cmake which describes install components defined in
-# the project and which is generated if connector was built under
-# WITH_PACKAGES option.
+# at install location of the main project. INSTALL_MANIFEST should point
+# at install manifest file generated by the builds (this happens if the
+# same INSTALL_MANIFEST option is given together with WITH_PACKAGES during
+# the builds). The manifest file describes install components defined in
+# the project.
 #
 # Generating MSI package
 # ----------------------
@@ -47,13 +49,13 @@ cmake_minimum_required(VERSION 3.0)
 # Some other options might need to be specified to correctly generate
 # the .wxs definition. For example STATIC_MSVCRT or
 # BUNDLE_RUNTIME_LIBRARIES. Otherwise most of the information is taken
-# from install_manifest.cmake and version.cmake, packaging/PackageSpecs.cmake
+# from the install manifest and version.cmake, packaging/PackageSpecs.cmake
 # files in the main project sources.
 #
 # Generating ZIP package
 # ----------------------
 # ZIP package simply includes all the files from the given install
-# location (excluding install_manifest.cmake etc.)
+# location.
 #
 
 IF(NOT WIN32)
@@ -75,16 +77,15 @@ if(NOT EXISTS "${BASE_DIR}/packaging/WiX")
 endif()
 
 #
-# Check the install location
+# Check the install location and the manifest file
 #
 
 file(TO_CMAKE_PATH ${CMAKE_INSTALL_PREFIX} INSTALL_DIR)
-set(INSTALL_MANIFEST ${INSTALL_DIR}/install_manifest.cmake)
 
 if(NOT EXISTS ${INSTALL_MANIFEST})
   message(FATAL_ERROR
-    "Could not find install_manifest.cmake in the install location:"
-    " ${CMAKE_INSTALL_PREFIX}"
+    "Could not find specified install manifest file:"
+    " ${INSTALL_MANIFEST}"
   )
 endif()
 

packaging/install_manifest.cmake

@@ -45,9 +45,6 @@
 # the same install location).
 #
 
-# The output file
-
-set(MANIFEST_FILE ${BUILD_DIR}/install_manifest.cmake)
 
 # Check if requiret input files exist
 
@@ -62,7 +59,7 @@ endif()
 # Read existing information to be extended (if present) and CPackConfig.cmake
 # to get list of install components. Update COMPONENTS basead on this.
 
-include("${INSTALL_DIR}/install_manifest.cmake" OPTIONAL)
+include("${MANIFEST_FILE}" OPTIONAL)
 include("${BUILD_DIR}/CPackConfig.cmake")
 
 list(APPEND COMPONENTS ${CPACK_COMPONENTS_ALL})