Unverified Commit ac8af845 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

cmake: move cmake_uninstall.cmake to CMake/ 

Closes #1756
parent a17e7721

cmake_uninstall.cmake.in→CMake/cmake_uninstall.cmake.in

+0 −0

File moved.

View file

CMakeLists.txt

+3 −3
Original line number Original line Diff line number Diff line
@@ -1341,11 +1341,11 @@ endif() 




if(NOT TARGET uninstall)

if(NOT TARGET uninstall)

  configure_file(

  configure_file(

      ${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in

      ${CMAKE_CURRENT_SOURCE_DIR}/CMake/cmake_uninstall.cmake.in

      ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake

      ${CMAKE_CURRENT_BINARY_DIR}/CMake/cmake_uninstall.cmake

      IMMEDIATE @ONLY)

      IMMEDIATE @ONLY)





  add_custom_target(uninstall

  add_custom_target(uninstall

      COMMAND ${CMAKE_COMMAND} -P

      COMMAND ${CMAKE_COMMAND} -P

      ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)

      ${CMAKE_CURRENT_BINARY_DIR}/CMake/cmake_uninstall.cmake)

endif()
 
endif()

Makefile.am

+1 −1
Original line number Original line Diff line number Diff line
@@ -30,7 +30,7 @@ CMAKE_DIST = CMakeLists.txt CMake/CMakeConfigurableFile.in \ 
 CMake/Macros.cmake              \

 CMake/Macros.cmake              \

 CMake/CurlSymbolHiding.cmake CMake/FindCARES.cmake             \

 CMake/CurlSymbolHiding.cmake CMake/FindCARES.cmake             \

 CMake/FindLibSSH2.cmake CMake/FindNGHTTP2.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_LIBTMPL = projects/Windows/VC6/lib/libcurl.tmpl

VC6_LIBDSP = projects/Windows/VC6/lib/libcurl.dsp.dist

VC6_LIBDSP = projects/Windows/VC6/lib/libcurl.dsp.dist