From 0646e0283c09d7b989a8520d8d52cda463ed5e8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?=
 <martin.horenovsky@gmail.com>
Date: Fri, 31 Aug 2018 11:40:55 +0200
Subject: [PATCH] Disable installation step when Catch is used as a subproject

This is because otherwise the installations paths provided via
GNUInstallDirs become messed up and parts of the installation
package will end up in the wrong place.

Also it doesn't make much sense to force dependees to also install
our header alongside them.

Closes #1373
---
 CMakeLists.txt | 181 +++++++++++++++++++++++++------------------------
 1 file changed, 93 insertions(+), 88 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 78b1fe22..21f52ff1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -91,102 +91,107 @@ target_include_directories(Catch2
 # provide a namespaced alias for clients to 'link' against if catch is included as a sub-project
 add_library(Catch2::Catch2 ALIAS Catch2)
 
-set(CATCH_CMAKE_CONFIG_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/Catch2")
+# Only perform the installation steps when Catch is not being used as
+# a subproject via `add_subdirectory`, or the destinations will break,
+# see https://github.com/catchorg/Catch2/issues/1373
+if (NOT_SUBPROJECT)
+    set(CATCH_CMAKE_CONFIG_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/Catch2")
 
-include(CMakePackageConfigHelpers)
-configure_package_config_file(
-    ${CMAKE_CURRENT_LIST_DIR}/CMake/Catch2Config.cmake.in
-    ${CMAKE_CURRENT_BINARY_DIR}/Catch2Config.cmake
-    INSTALL_DESTINATION
-      ${CATCH_CMAKE_CONFIG_DESTINATION}
-)
+    configure_package_config_file(
+        ${CMAKE_CURRENT_LIST_DIR}/CMake/Catch2Config.cmake.in
+        ${CMAKE_CURRENT_BINARY_DIR}/Catch2Config.cmake
+        INSTALL_DESTINATION
+          ${CATCH_CMAKE_CONFIG_DESTINATION}
+    )
 
 
-# create and install an export set for catch target as Catch2::Catch
-install(
-  TARGETS
-    Catch2
-  EXPORT
-    Catch2Targets
-  DESTINATION
-    ${CMAKE_INSTALL_LIBDIR}
-)
+    # create and install an export set for catch target as Catch2::Catch
+    install(
+      TARGETS
+        Catch2
+      EXPORT
+        Catch2Targets
+      DESTINATION
+        ${CMAKE_INSTALL_LIBDIR}
+    )
 
 
-install(
-  EXPORT
-    Catch2Targets
-  NAMESPACE
-    Catch2::
-  DESTINATION
-    ${CATCH_CMAKE_CONFIG_DESTINATION}
-)
+    install(
+      EXPORT
+        Catch2Targets
+      NAMESPACE
+        Catch2::
+      DESTINATION
+        ${CATCH_CMAKE_CONFIG_DESTINATION}
+    )
 
-write_basic_package_version_file(
-  "${CMAKE_CURRENT_BINARY_DIR}/Catch2ConfigVersion.cmake"
-  COMPATIBILITY
-    SameMajorVersion
-)
+    write_basic_package_version_file(
+      "${CMAKE_CURRENT_BINARY_DIR}/Catch2ConfigVersion.cmake"
+      COMPATIBILITY
+        SameMajorVersion
+    )
 
-install(
-  DIRECTORY
-    "single_include/"
-  DESTINATION
-    "${CMAKE_INSTALL_INCLUDEDIR}"
-)
-    
-install(
-  FILES 
-    "${CMAKE_CURRENT_BINARY_DIR}/Catch2Config.cmake"
-    "${CMAKE_CURRENT_BINARY_DIR}/Catch2ConfigVersion.cmake"
-  DESTINATION
-    ${CATCH_CMAKE_CONFIG_DESTINATION}
-)
+    install(
+      DIRECTORY
+        "single_include/"
+      DESTINATION
+        "${CMAKE_INSTALL_INCLUDEDIR}"
+    )
 
-# Install documentation
-if(CATCH_INSTALL_DOCS)
-  install(
-    DIRECTORY
-      docs/
-    DESTINATION
-      "${CMAKE_INSTALL_DOCDIR}"
-  )
-endif()
+    install(
+      FILES
+        "${CMAKE_CURRENT_BINARY_DIR}/Catch2Config.cmake"
+        "${CMAKE_CURRENT_BINARY_DIR}/Catch2ConfigVersion.cmake"
+      DESTINATION
+        ${CATCH_CMAKE_CONFIG_DESTINATION}
+    )
 
-if(CATCH_INSTALL_HELPERS)
-# Install CMake scripts
-install(
-  FILES
-    "contrib/ParseAndAddCatchTests.cmake"
-    "contrib/Catch.cmake"
-    "contrib/CatchAddTests.cmake"
-  DESTINATION
-    ${CATCH_CMAKE_CONFIG_DESTINATION}
-)
+    # Install documentation
+    if(CATCH_INSTALL_DOCS)
+      install(
+        DIRECTORY
+          docs/
+        DESTINATION
+          "${CMAKE_INSTALL_DOCDIR}"
+      )
+    endif()
 
-# Install debugger helpers
-install(
-  FILES
-    "contrib/gdbinit"
-    "contrib/lldbinit"
-  DESTINATION
-    ${CMAKE_INSTALL_DATAROOTDIR}/Catch2
-)
-endif()
+    if(CATCH_INSTALL_HELPERS)
+    # Install CMake scripts
+    install(
+      FILES
+        "contrib/ParseAndAddCatchTests.cmake"
+        "contrib/Catch.cmake"
+        "contrib/CatchAddTests.cmake"
+      DESTINATION
+        ${CATCH_CMAKE_CONFIG_DESTINATION}
+    )
 
-## Provide some pkg-config integration
-set(PKGCONFIG_INSTALL_DIR
-    "${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig"
-    CACHE PATH "Path where catch2.pc is installed"
-)
-configure_file(
-  ${CMAKE_CURRENT_SOURCE_DIR}/CMake/catch2.pc.in
-  ${CMAKE_CURRENT_BINARY_DIR}/catch2.pc
-  @ONLY
-)
-install(
-  FILES
-    "${CMAKE_CURRENT_BINARY_DIR}/catch2.pc"
-  DESTINATION
-    ${PKGCONFIG_INSTALL_DIR}
-)
+    # Install debugger helpers
+    install(
+      FILES
+        "contrib/gdbinit"
+        "contrib/lldbinit"
+      DESTINATION
+        ${CMAKE_INSTALL_DATAROOTDIR}/Catch2
+    )
+    endif()
+
+    ## Provide some pkg-config integration
+    set(PKGCONFIG_INSTALL_DIR
+        "${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig"
+        CACHE PATH "Path where catch2.pc is installed"
+    )
+    configure_file(
+      ${CMAKE_CURRENT_SOURCE_DIR}/CMake/catch2.pc.in
+      ${CMAKE_CURRENT_BINARY_DIR}/catch2.pc
+      @ONLY
+    )
+    install(
+      FILES
+        "${CMAKE_CURRENT_BINARY_DIR}/catch2.pc"
+      DESTINATION
+        ${PKGCONFIG_INSTALL_DIR}
+    )
+
+endif(NOT_SUBPROJECT)