fix: uninstall cleanup (#2346)

b8047245 · Henry Schreiner · GitHub · 6f6e9394 · b8047245 · b8047245
Unverified Commit b8047245 authored Jul 31, 2020 by Henry Schreiner Committed by GitHub Jul 31, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 7 deletions

.gitignore .gitignore +1 -0

CMakeLists.txt CMakeLists.txt +7 -7

tools/cmake_uninstall.cmake.in tools/cmake_uninstall.cmake.in +0 -0

No files found.
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@ CMakeCache.txt
 CMakeFiles
 Makefile
 cmake_install.cmake
+cmake_uninstall.cmake
 .DS_Store
 *.so
 *.pyd

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -245,13 +245,13 @@ if(PYBIND11_INSTALL)
    EXPORT "${PYBIND11_EXPORT_NAME}"
    NAMESPACE "pybind11::"
    DESTINATION ${PYBIND11_CMAKECONFIG_INSTALL_DIR})
-endif()

-# Uninstall target
-if(PYBIND11_MASTER_PROJECT)
-  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
-                 "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY)
+  # Uninstall target
+  if(PYBIND11_MASTER_PROJECT)
+    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/tools/cmake_uninstall.cmake.in"
+                   "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY)

-  add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P
-                                      ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
+    add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P
+                                        ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
+  endif()
 endif()
--- a/cmake/cmake_uninstall.cmake.in
+++ b/cmake/cmake_uninstall.cmake.in