From b5d4f24f7433bcdca17be72a78ce9b8cf6b64856 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Camilla=20L=C3=B6wy?= Date: Thu, 14 Nov 2019 19:57:08 +0100 Subject: [PATCH] Move CMake uninstall template file to CMake subdir --- cmake_uninstall.cmake.in => CMake/cmake_uninstall.cmake.in | 6 +++--- CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) rename cmake_uninstall.cmake.in => CMake/cmake_uninstall.cmake.in (78%) diff --git a/cmake_uninstall.cmake.in b/CMake/cmake_uninstall.cmake.in similarity index 78% rename from cmake_uninstall.cmake.in rename to CMake/cmake_uninstall.cmake.in index 4ea57b1c..5ecc476d 100644 --- a/cmake_uninstall.cmake.in +++ b/CMake/cmake_uninstall.cmake.in @@ -1,9 +1,9 @@ -if (NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt") - message(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"") +if (NOT EXISTS "@GLFW_BINARY_DIR@/install_manifest.txt") + message(FATAL_ERROR "Cannot find install manifest: \"@GLFW_BINARY_DIR@/install_manifest.txt\"") endif() -file(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files) +file(READ "@GLFW_BINARY_DIR@/install_manifest.txt" files) string(REGEX REPLACE "\n" ";" files "${files}") foreach (file ${files}) diff --git a/CMakeLists.txt b/CMakeLists.txt index 04174cd1..3c7ac819 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -367,7 +367,7 @@ if (GLFW_INSTALL) # Only generate this target if no higher-level project already has if (NOT TARGET uninstall) - configure_file(cmake_uninstall.cmake.in + configure_file(CMake/cmake_uninstall.cmake.in cmake_uninstall.cmake IMMEDIATE @ONLY) add_custom_target(uninstall