From 62a384d99e943c362b4895356119bdb9281caca3 Mon Sep 17 00:00:00 2001
From: Francois Pomerleau <f.pomerleau@gmail.com>
Date: Thu, 4 Dec 2014 13:33:49 -0500
Subject: [PATCH] fine tune the find_package() capability and add uninstall
 target

---
 CMakeLists.txt           | 55 +++++++++++++++++++++++++++++++++++++---
 cmake_uninstall.cmake.in | 23 +++++++++++++++++
 2 files changed, 74 insertions(+), 4 deletions(-)
 create mode 100644 cmake_uninstall.cmake.in

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ad58dcf..93ebd2b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -99,7 +99,7 @@ find_path(EIGEN_INCLUDE_DIR Eigen/Core
 # endif(USE_OPEN_CL)
 
 # include all libs so far
-include_directories(${EIGEN_INCLUDE_DIR} ${Boost_INCLUDE_DIRS})
+include_directories(${CMAKE_SOURCE_DIR} ${EIGEN_INCLUDE_DIR} ${Boost_INCLUDE_DIRS})
 
 # main nabo lib
 set(NABO_SRC
@@ -140,18 +140,65 @@ add_subdirectory(python)
 # Install catkin package.xml
 install(FILES package.xml DESTINATION share/libnabo)
 
-# Create cmake configure scripts so other packages can find libnabo
+#=============================================
+# to allow find_package() on libnabo
+#=============================================
+# 
+# the following case be used in an external project requiring libnabo:
+#  ...
+#  find_package(libnabo) 
+#  include_directories(${libnabo_INCLUDE_DIRS}) 
+#  target_link_libraries(executableName ${libnabo_LIBRARIES})
+#  ...
+
+# NOTE: the following will support find_package for 1) local build (make) and 2) for installed files (make install)
+
+# 1- local build #
+
+# Register the local build in case one doesn't use "make install"
+export(PACKAGE libnabo)
+
+# Create variable with the library location
 get_property(libnabo_library TARGET ${LIB_NAME} PROPERTY LOCATION)
-set(libnabo_include_dirs ${CMAKE_INSTALL_PREFIX}/include)
 
+# Create variable for the local build tree
+get_property(libnabo_include_dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
+# Configure config file for local build tree
 configure_file(libnaboConfig.cmake.in
   "${PROJECT_BINARY_DIR}/libnaboConfig.cmake" @ONLY)
+
+# 2- installation build #
+
+# Change the library location for an install location
+get_filename_component(NABO_LIB_NAME ${libnabo_library} NAME)
+set(libnabo_library ${CMAKE_INSTALL_PREFIX}/lib/${NABO_LIB_NAME})
+
+# Change the include location for the case of an install location
+set(libnabo_include_dirs ${CMAKE_INSTALL_PREFIX}/include)
+
+# We put the generated file for installation in a different repository (i.e., ./CMakeFiles/)
+configure_file(libnaboConfig.cmake.in
+  "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/libnaboConfig.cmake" @ONLY)
+
+# The same versioning file can be used for both cases
 configure_file(libnaboConfigVersion.cmake.in
   "${PROJECT_BINARY_DIR}/libnaboConfigVersion.cmake" @ONLY)
 
 install(FILES
-  "${PROJECT_BINARY_DIR}/libnaboConfig.cmake"
+  "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/libnaboConfig.cmake"
   "${PROJECT_BINARY_DIR}/libnaboConfigVersion.cmake"
   "${PROJECT_BINARY_DIR}/libnaboTargets.cmake"
   DESTINATION share/libnabo/cmake COMPONENT dev)
 
+
+
+#=============================================
+# Add uninstall target
+#=============================================
+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)
diff --git a/cmake_uninstall.cmake.in b/cmake_uninstall.cmake.in
new file mode 100644
index 0000000..ac47a0f
--- /dev/null
+++ b/cmake_uninstall.cmake.in
@@ -0,0 +1,23 @@
+if(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+  message(FATAL_ERROR "Cannot find install manifest: @CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+endif(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+
+file(READ "@CMAKE_CURRENT_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}")
+    exec_program(
+    "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
+    OUTPUT_VARIABLE rm_out
+    RETURN_VALUE rm_retval
+    )
+    if(NOT "${rm_retval}" STREQUAL 0)
+      message(FATAL_ERROR "Problem when removing $ENV{DESTDIR}${file}")
+    endif(NOT "${rm_retval}" STREQUAL 0)
+    else(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
+      message(STATUS "File $ENV{DESTDIR}${file} does not exist.")
+  endif(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
+endforeach(file)
+
+