From 92e3d77f5c6d96c04e17320a15d9ce987a0b542c Mon Sep 17 00:00:00 2001
From: Juan Ramos <gitlab@jpr.mozmail.com>
Date: Wed, 10 May 2023 16:16:44 -0600
Subject: [PATCH] Install GSL.natvis

---
 CMakeLists.txt            |  7 +++----
 README.md                 |  4 +---
 cmake/gsl_functions.cmake | 20 --------------------
 3 files changed, 4 insertions(+), 27 deletions(-)
 delete mode 100644 cmake/gsl_functions.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bc1f38c8e..71bb99759 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,4 @@
 cmake_minimum_required(VERSION 3.14...3.16)
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/")
-include(gsl_functions)
 
 project(GSL VERSION 4.0.0 LANGUAGES CXX)
 
@@ -19,8 +17,7 @@ target_compile_features(GSL INTERFACE "cxx_std_14")
 # Setup include directory
 add_subdirectory(include)
 
-# Add natvis file
-gsl_add_native_visualizer_support()
+target_sources(GSL INTERFACE $<BUILD_INTERFACE:${GSL_SOURCE_DIR}/GSL.natvis>)
 
 if (GSL_TEST)
     enable_testing()
@@ -46,4 +43,6 @@ if (GSL_INSTALL)
     write_basic_package_version_file(${gls_config_version} COMPATIBILITY SameMajorVersion ARCH_INDEPENDENT)
 
     install(FILES ${gls_config_version} DESTINATION ${cmake_files_install_dir})
+
+    install(FILES GSL.natvis DESTINATION ${cmake_files_install_dir})
 endif()
diff --git a/README.md b/README.md
index a498637f0..725bf66b3 100644
--- a/README.md
+++ b/README.md
@@ -214,7 +214,5 @@ target_link_libraries(foobar PRIVATE Microsoft.GSL::GSL)
 ```
 
 ## Debugging visualization support
-For Visual Studio users, the file [GSL.natvis](./GSL.natvis) in the root directory of the repository can be added to your project if you would like more helpful visualization of GSL types in the Visual Studio debugger than would be offered by default.
 
-If you are using CMake this will be done automatically for you.
-See `GSL_VS_ADD_NATIVE_VISUALIZERS`
+For Visual Studio users, the file [GSL.natvis](./GSL.natvis) in the root directory of the repository can be added to your project if you would like more helpful visualization of GSL types in the Visual Studio debugger than would be offered by default.
diff --git a/cmake/gsl_functions.cmake b/cmake/gsl_functions.cmake
deleted file mode 100644
index e01c44ae0..000000000
--- a/cmake/gsl_functions.cmake
+++ /dev/null
@@ -1,20 +0,0 @@
-# This cmake module is meant to hold helper functions/macros
-# that make maintaining the cmake build system much easier.
-# This is especially helpful since gsl needs to provide coverage
-# for multiple versions of cmake.
-#
-# Any functions/macros should have a gsl_* prefix to avoid problems
-
-# Adding the GSL.natvis files improves the debugging experience for users of this library.
-function(gsl_add_native_visualizer_support)
-    if (MSVC_IDE)
-        option(GSL_VS_ADD_NATIVE_VISUALIZERS "Configure project to use Visual Studio native visualizers" TRUE)
-    else()
-        set(GSL_VS_ADD_NATIVE_VISUALIZERS FALSE CACHE INTERNAL "Native visualizers are Visual Studio extension" FORCE)
-    endif()
-
-    # add natvis file to the library so it will automatically be loaded into Visual Studio
-    if(GSL_VS_ADD_NATIVE_VISUALIZERS)
-        target_sources(GSL INTERFACE $<BUILD_INTERFACE:${GSL_SOURCE_DIR}/GSL.natvis>)
-    endif()
-endfunction()