Merge pull request #530 from xlz/release-cleanup

Release cleanup, fix memleaks, packaging helpers.

Author: floe

CMakeLists.txt

@@ -1,5 +1,11 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12.1)
 
+SET(PROJECT_VER_MAJOR 0)
+SET(PROJECT_VER_MINOR 1)
+SET(PROJECT_VER_PATCH 0)
+SET(PROJECT_VER "${PROJECT_VER_MAJOR}.${PROJECT_VER_MINOR}.${PROJECT_VER_PATCH}")
+SET(PROJECT_APIVER "${PROJECT_VER_MAJOR}.${PROJECT_VER_MINOR}")
+
 if(WIN32 AND NOT MINGW)
   if(NOT DEFINED CMAKE_DEBUG_POSTFIX)
     set(CMAKE_DEBUG_POSTFIX "d")
@@ -32,6 +38,9 @@ IF(MSVC)
   # "zero-length array in struct" from libusb.h
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4267 /wd4244 /wd4200 /wd4305 /wd4146")
   ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS) # no warning for getenv()
+ELSE()
+  # Heed warnings from non-MSVC compilers
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
 ENDIF()
 
 IF(ENABLE_CXX11)
@@ -214,9 +223,9 @@ ENDIF(ENABLE_OPENCL)
 # Both command line -DCMAKE_INSTALL_RPATH=... and CMake GUI settings are accepted.
 #
 # Anyway if wrong versions of libusb is used, errors will be reported explicitly.
-IF(NOT DEFINED CMAKE_INSTALL_RPATH)
+IF(NOT DEFINED CMAKE_INSTALL_RPATH AND NOT ${LibUSB_LIBDIR} MATCHES "^/usr/lib")
   SET(CMAKE_INSTALL_RPATH ${LibUSB_LIBDIR} CACHE STRING "Set RPATH for a private libusb")
-ELSE()
+ELSEIF(DEFINED CMAKE_INSTALL_RPATH)
   SET(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH} CACHE STRING "Set RPATH for a private libusb")
 ENDIF()
 IF(DEFINED CMAKE_INSTALL_RPATH)
@@ -231,6 +240,8 @@ ADD_LIBRARY(freenect2 ${SOURCES})
 SET_TARGET_PROPERTIES(freenect2 PROPERTIES
   CXX_VISIBILITY_PRESET hidden
   VISIBILITY_INLINES_HIDDEN 1
+  VERSION ${PROJECT_VER}
+  SOVERSION ${PROJECT_APIVER}
 )
 INCLUDE(GenerateExportHeader)
 GENERATE_EXPORT_HEADER(freenect2
@@ -255,14 +266,7 @@ INSTALL(DIRECTORY "${PROJECT_BINARY_DIR}/${PROJECT_NAME}" DESTINATION include)
 INSTALL(FILES "${PROJECT_BINARY_DIR}/freenect2Config.cmake" DESTINATION lib/cmake/freenect2/)
 INSTALL(FILES "${PROJECT_BINARY_DIR}/freenect2.pc" DESTINATION lib/pkgconfig/)
 
-find_package(Doxygen)
-IF(DOXYGEN_FOUND)
-  CONFIGURE_FILE(Doxyfile.in "${PROJECT_BINARY_DIR}/Doxyfile" @ONLY)
-  add_custom_target(
-    doc
-    COMMAND ${DOXYGEN_EXECUTABLE} Doxyfile
-  )
-ENDIF()
+ADD_SUBDIRECTORY(${MY_DIR}/doc)
 
 IF(BUILD_EXAMPLES)
   MESSAGE(STATUS "Configurating examples")