aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2017-08-10 13:24:15 +0200
committerDaniel Stenberg <daniel@haxx.se>2017-08-10 15:05:49 +0200
commitac8af8452706aa0d5244adb34efcec072d389070 (patch)
tree55d0b857127d06ecb7578d5d80e78d4c4113659f
parenta17e7721d247f41922e95f08e7e8e7a65ce06b06 (diff)
cmake: move cmake_uninstall.cmake to CMake/
Closes #1756
-rw-r--r--CMake/cmake_uninstall.cmake.in (renamed from cmake_uninstall.cmake.in)0
-rw-r--r--CMakeLists.txt6
-rw-r--r--Makefile.am2
3 files changed, 4 insertions, 4 deletions
diff --git a/cmake_uninstall.cmake.in b/CMake/cmake_uninstall.cmake.in
index d00a51665..d00a51665 100644
--- a/cmake_uninstall.cmake.in
+++ b/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