From ac8af8452706aa0d5244adb34efcec072d389070 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 10 Aug 2017 13:24:15 +0200 Subject: [PATCH] cmake: move cmake_uninstall.cmake to CMake/ Closes #1756 --- cmake_uninstall.cmake.in => CMake/cmake_uninstall.cmake.in | 0 CMakeLists.txt | 6 +++--- Makefile.am | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename cmake_uninstall.cmake.in => CMake/cmake_uninstall.cmake.in (100%) diff --git a/cmake_uninstall.cmake.in b/CMake/cmake_uninstall.cmake.in similarity index 100% rename from cmake_uninstall.cmake.in rename to CMake/cmake_uninstall.cmake.in diff --git a/CMakeLists.txt b/CMakeLists.txt index 0caf3dc1d..d9b9c42cf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1341,11 +1341,11 @@ endif() if(NOT TARGET uninstall) configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake + ${CMAKE_CURRENT_SOURCE_DIR}/CMake/cmake_uninstall.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/CMake/cmake_uninstall.cmake IMMEDIATE @ONLY) add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P - ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake) + ${CMAKE_CURRENT_BINARY_DIR}/CMake/cmake_uninstall.cmake) endif() diff --git a/Makefile.am b/Makefile.am index 5aaeda5fd..ab8f11cbc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,7 +30,7 @@ CMAKE_DIST = CMakeLists.txt CMake/CMakeConfigurableFile.in \ CMake/Macros.cmake \ CMake/CurlSymbolHiding.cmake CMake/FindCARES.cmake \ CMake/FindLibSSH2.cmake CMake/FindNGHTTP2.cmake \ - CMake/FindMbedTLS.cmake cmake_uninstall.cmake.in + CMake/FindMbedTLS.cmake CMake/cmake_uninstall.cmake.in VC6_LIBTMPL = projects/Windows/VC6/lib/libcurl.tmpl VC6_LIBDSP = projects/Windows/VC6/lib/libcurl.dsp.dist