Modernize cmake; make cmake compatible with git submoduling

CMakeLists.txt

@@ -154,13 +154,18 @@ set(SHARED_LIBS FALSE CACHE BOOL "Set to TRUE to build shared library")
 if (SHARED_LIBS)
 	add_library(${LIB_NAME} SHARED ${NABO_SRC})
 	install(TARGETS ${LIB_NAME} LIBRARY DESTINATION lib)
-else (SHARED_LIBS)
-	add_library(${LIB_NAME} ${NABO_SRC})
+else ()
+	add_library(${LIB_NAME} STATIC ${NABO_SRC})
 	add_definitions(-fPIC)
 	install(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib)
-endif (SHARED_LIBS)
+endif ()
 set_target_properties(${LIB_NAME} PROPERTIES VERSION "${PROJECT_VERSION}" SOVERSION 1)
 
+target_include_directories(${LIB_NAME} PUBLIC
+  $<INSTALL_INTERFACE:>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+  )
+
 # create doc before installing
 set(DOC_INSTALL_TARGET "share/doc/${PROJECT_NAME}/api" CACHE STRING "Target where to install doxygen documentation")
 install(FILES nabo/nabo.h DESTINATION include/nabo)
@@ -172,9 +177,21 @@ endif (DOXYGEN_FOUND)
 
 enable_testing()
 
-add_subdirectory(examples)
-add_subdirectory(tests)
-add_subdirectory(python)
+
+option(LIBNABO_BUILD_EXAMPLES "Build libnabo examples" ON)
+if (LIBNABO_BUILD_EXAMPLES)
+  add_subdirectory(examples)
+endif()
+
+option(LIBNABO_BUILD_TESTS "Build libnabo tests" ON)
+if(LIBNABO_BUILD_TESTS)
+  add_subdirectory(tests)
+endif()
+
+option(LIBNABO_BUILD_PYTHON "Build libnabo python" ON)
+if(LIBNABO_BUILD_PYTHON)
+  add_subdirectory(python)
+endif()
 
 # Install catkin package.xml
 install(FILES package.xml DESTINATION share/libnabo)
@@ -197,6 +214,26 @@ install(FILES package.xml DESTINATION share/libnabo)
 # Register the local build in case one doesn't use "make install"
 export(PACKAGE libnabo)
 
+include(GNUInstallDirs)
+
+# 'make install' to the correct locations (provided by GNUInstallDirs).
+install(TARGETS ${LIB_NAME} EXPORT ${PROJECT_NAME}-config
+    ARCHIVE  DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    LIBRARY  DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME  DESTINATION ${CMAKE_INSTALL_BINDIR})  # This is for Windows
+#install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+
+add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${LIB_NAME})
+
+# This makes the project importable from the install directory
+# Put config file in per-project dir (name MUST match), can also
+# just go into 'cmake'.
+install(EXPORT ${PROJECT_NAME}-config DESTINATION share/${PROJECT_NAME}/cmake)
+
+# This makes the project importable from the build directory
+export(TARGETS ${LIB_NAME} FILE ${PROJECT_NAME}-config.cmake)
+
+
 # Create variable with the library location
 set(libnabo_library $<TARGET_FILE:${LIB_NAME}>)
 
@@ -237,10 +274,12 @@ install(FILES
 #=============================================
 # 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)
+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()