Merge pull request #362 from gmou3/main

Add CMake uninstall target

Author: oschwald

CMakeLists.txt

@@ -155,3 +155,14 @@ if (MAXMINDDB_INSTALL)
   install(FILES ${CMAKE_CURRENT_BINARY_DIR}/src/libmaxminddb.pc
     DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 endif()
+
+# uninstall target
+if(NOT TARGET uninstall)
+  configure_file(
+    "${CMAKE_CURRENT_SOURCE_DIR}/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)
+endif()

README.md

@@ -30,11 +30,13 @@ structure.
 
 To install this code, run the following commands:
 
-    $ ./configure
-    $ make
-    $ make check
-    $ sudo make install
-    $ sudo ldconfig
+```bash
+./configure
+make
+make check
+sudo make install
+sudo ldconfig
+```
 
 You can skip the `make check` step but it's always good to know that tests are
 passing on your platform.
@@ -47,8 +49,10 @@ you may need to add the `lib` directory in your `prefix` to your library path.
 On most Linux distributions when using the default prefix (`/usr/local`), you
 can do this by running the following commands:
 
-    $ sudo sh -c "echo /usr/local/lib  >> /etc/ld.so.conf.d/local.conf"
-    $ ldconfig
+```bash
+sudo sh -c "echo /usr/local/lib  >> /etc/ld.so.conf.d/local.conf"
+ldconfig
+```
 
 ## From a GitHub "Source Code" Archive / Git Repo Clone (Achtung!)
 
@@ -65,7 +69,9 @@ in addition to `make` and a compiler.
 
 You can clone this repository and build it by running:
 
-    $ git clone --recursive https://github.com/maxmind/libmaxminddb
+```bash
+git clone --recursive https://github.com/maxmind/libmaxminddb
+```
 
 After cloning, run `./bootstrap` from the `libmaxminddb` directory and then
 follow the instructions for installing from a named release tarball as
@@ -76,39 +82,57 @@ described above.
 We provide a CMake build script. This is primarily targeted at Windows users,
 but it can be used in other circumstances where the Autotools script does not
 work.
-    
-    $ mkdir build && cd build
-    $ cmake ..
-    $ cmake --build .
-    $ ctest -V .
-    $ cmake --build . --target install
+
+```bash
+cmake -B build
+cd build/
+cmake --build .
+ctest -V .
+cmake --build . --target install
+```
 
 When building with Visual Studio, you may build a multithreaded (MT/MTd)
 runtime library, using the `MSVC_STATIC_RUNTIME` setting:
 
-    $ cmake -DMSVC_STATIC_RUNTIME=ON -DBUILD_SHARED_LIBS=OFF ..
+```bash
+cmake -DMSVC_STATIC_RUNTIME=ON -DBUILD_SHARED_LIBS=OFF ..
+```
+
+We also include a CMake `uninstall` target:
+
+```bash
+cmake --build . --target uninstall
+```
 
 ## On Ubuntu via PPA
 
 MaxMind provides a PPA for recent version of Ubuntu. To add the PPA to your
 APT sources, run:
 
-    $ sudo add-apt-repository ppa:maxmind/ppa
+```bash
+sudo add-apt-repository ppa:maxmind/ppa
+```
 
 Then install the packages by running:
 
-    $ sudo apt update
-    $ sudo apt install libmaxminddb0 libmaxminddb-dev mmdb-bin
+```bash
+sudo apt update
+sudo apt install libmaxminddb0 libmaxminddb-dev mmdb-bin
+```
 
 ## On macOS via Homebrew or MacPorts
 
 You can install libmaxminddb on macOS using [Homebrew](https://brew.sh):
 
-    $ brew install libmaxminddb
+```bash
+brew install libmaxminddb
+```
 
 Or with [MacPorts](https://ports.macports.org/port/libmaxminddb):
 
-    $ sudo port install libmaxminddb
+```bash
+sudo port install libmaxminddb
+```
 
 # Requirements
 

cmake_uninstall.cmake.in

@@ -0,0 +1,21 @@
+if(NOT EXISTS "@CMAKE_BINARY_DIR@/install_manifest.txt")
+  message(FATAL_ERROR "Cannot find install manifest: @CMAKE_BINARY_DIR@/install_manifest.txt")
+endif()
+
+file(READ "@CMAKE_BINARY_DIR@/install_manifest.txt" files)
+string(REGEX REPLACE "\n" ";" files "${files}")
+foreach(file ${files})
+  message(STATUS "Uninstalling $ENV{DESTDIR}${file}")
+  if(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
+    execute_process(
+      COMMAND "@CMAKE_COMMAND@" -E remove "$ENV{DESTDIR}${file}"
+      OUTPUT_VARIABLE rm_out
+      RESULT_VARIABLE rm_retval
+      )
+    if(NOT "${rm_retval}" STREQUAL 0)
+      message(FATAL_ERROR "Problem when removing $ENV{DESTDIR}${file}")
+    endif()
+  else(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
+    message(STATUS "File $ENV{DESTDIR}${file} does not exist.")
+  endif()
+endforeach()