All headers (including libfreenect.hpp) are installed to `$PREFIX/inc…

…lude/libfreenect/`. All libfreenect files have `#include "libfreenect.h"` rather than `#include <libfreenect.h>`. This works during build and after installation all include files are in the same directory. Rename libfreenect-audio.h -> libfreenect_audio.h and libfreenect-registration.h -> libfreenect_registration.h. This makes them consistent with other libraries. THIS IS A BREAKING CHANGE; UPDATE YOUR INCLUDES Signed-off-by: Benn Snyder <benn.snyder@gmail.com>
OpenKinect · Feb 15, 2014 · 7b9a5de · 7b9a5de
1 parent cfe9c49
commit 7b9a5de
Show file tree

Hide file tree

Showing 14 changed files with 21 additions and 26 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -193,13 +193,13 @@ IF ( BUILD_CPACK )
 
   INSTALL(FILES "${CMAKE_BINARY_DIR}/lib/libfreenect.a" DESTINATION ${PROJECT_LIBRARY_INSTALL_DIR})
   if (BUILD_AUDIO)
-    INSTALL(FILES "include/libfreenect-audio.h" DESTINATION ${PROJECT_INCLUDE_INSTALL_DIR})
+    INSTALL(FILES "include/libfreenect_audio.h" DESTINATION ${PROJECT_INCLUDE_INSTALL_DIR})
   endif()
   INSTALL(FILES "include/libfreenect.h" DESTINATION ${PROJECT_INCLUDE_INSTALL_DIR})
-  INSTALL(FILES "include/libfreenect-registration.h" DESTINATION ${PROJECT_INCLUDE_INSTALL_DIR})
+  INSTALL(FILES "include/libfreenect_registration.h" DESTINATION ${PROJECT_INCLUDE_INSTALL_DIR})
   INSTALL(FILES "APACHE20" DESTINATION "share/doc/${CPACK_PACKAGE_NAME}")
   INSTALL(FILES "GPL2" DESTINATION "share/doc/${CPACK_PACKAGE_NAME}")
-  INSTALL(FILES "README.asciidoc" DESTINATION "share/doc/${CPACK_PACKAGE_NAME}")
+  INSTALL(FILES "README.md" DESTINATION "share/doc/${CPACK_PACKAGE_NAME}")
 
 ENDIF ( BUILD_CPACK )
 
diff --git a/examples/micview.c b/examples/micview.c
@@ -25,7 +25,7 @@
  */
 
 #include "libfreenect.h"
-#include "libfreenect-audio.h"
+#include "libfreenect_audio.h"
 #include <stdio.h>
 #include <string.h>
 #include <signal.h>

diff --git a/examples/wavrecord.c b/examples/wavrecord.c
@@ -25,7 +25,7 @@
  */
 
 #include "libfreenect.h"
-#include "libfreenect-audio.h"
+#include "libfreenect_audio.h"
 #include <stdio.h>
 #include <signal.h>
 

diff --git a/fakenect/fakenect.c b/fakenect/fakenect.c
@@ -23,7 +23,7 @@
  * either License.
  */
 
-#include <libfreenect.h>
+#include "libfreenect.h"
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>

diff --git a/fakenect/record.c b/fakenect/record.c
@@ -23,9 +23,9 @@
  * either License.
  */
 
+#include "libfreenect.h"
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <libfreenect.h>
 #include <stdio.h>
 #include <signal.h>
 #include <string.h>

diff --git a/include/libfreenect-audio.h → include/libfreenect_audio.h b/include/libfreenect-audio.h → include/libfreenect_audio.h
@@ -23,10 +23,9 @@
  * Binary distributions must follow the binary distribution requirements of
  * either License.
  */
-
 #pragma once
 
-#include <libfreenect.h>
+#include "libfreenect.h"
 #include <stdint.h>
 
 #ifdef __cplusplus

diff --git a/include/libfreenect-registration.h → include/libfreenect_registration.h b/include/libfreenect-registration.h → include/libfreenect_registration.h
@@ -23,10 +23,9 @@
  * Binary distributions must follow the binary distribution requirements of
  * either License.
  */
-
 #pragma once
 
-#include <libfreenect.h>
+#include "libfreenect.h"
 #include <stdint.h>
 
 #ifdef __cplusplus

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -48,10 +48,10 @@ target_link_libraries (freenect ${LIBUSB_1_LIBRARIES})
 target_link_libraries (freenectstatic ${LIBUSB_1_LIBRARIES})
 
 # Install the header files
-install (FILES "../include/libfreenect.h" "../include/libfreenect-registration.h"
+install (FILES "../include/libfreenect.h" "../include/libfreenect_registration.h"
   DESTINATION ${PROJECT_INCLUDE_INSTALL_DIR})
 if(BUILD_AUDIO)
-  install (FILES "../include/libfreenect-audio.h"
+  install (FILES "../include/libfreenect_audio.h"
     DESTINATION ${PROJECT_INCLUDE_INSTALL_DIR})
 endif()
 

diff --git a/src/audio.c b/src/audio.c
@@ -24,7 +24,7 @@
  * either License.
  */
 #include "libfreenect.h"
-#include "libfreenect-audio.h"
+#include "libfreenect_audio.h"
 #include "freenect_internal.h"
 
 #include <string.h>

diff --git a/src/freenect_internal.h b/src/freenect_internal.h
@@ -23,22 +23,21 @@
  * Binary distributions must follow the binary distribution requirements of
  * either License.
  */
-
 #pragma once
 
 #include <stdint.h>
 
 #include "libfreenect.h"
-#include "libfreenect-registration.h"
+#include "libfreenect_registration.h"
 
 #ifdef BUILD_AUDIO
-#include "libfreenect-audio.h"
+  #include "libfreenect_audio.h"
 #endif
 
 #ifdef __ELF__
-#define FN_INTERNAL	__attribute__ ((visibility ("hidden")))
+  #define FN_INTERNAL	__attribute__ ((visibility ("hidden")))
 #else
-#define FN_INTERNAL
+  #define FN_INTERNAL
 #endif
 
 

diff --git a/src/registration.c b/src/registration.c
@@ -24,8 +24,8 @@
  * either License.
  */
 
-#include <libfreenect.h>
-#include <freenect_internal.h>
+#include "libfreenect.h"
+#include "freenect_internal.h"
 #include "registration.h"
 #include <stdlib.h>
 #include <string.h>

diff --git a/wrappers/c_sync/libfreenect_sync.h b/wrappers/c_sync/libfreenect_sync.h
@@ -23,10 +23,9 @@
  * Binary distributions must follow the binary distribution requirements of
  * either License.
  */
-
 #pragma once
 
-#include <libfreenect.h>
+#include "libfreenect.h"
 #include <stdint.h>
 
 #ifdef __cplusplus

diff --git a/wrappers/cpp/CMakeLists.txt b/wrappers/cpp/CMakeLists.txt
@@ -1,5 +1,5 @@
 INSTALL(FILES libfreenect.hpp
-  DESTINATION include)
+  DESTINATION ${PROJECT_INCLUDE_INSTALL_DIR})
 
 IF(BUILD_EXAMPLES)
 

diff --git a/wrappers/cpp/libfreenect.hpp b/wrappers/cpp/libfreenect.hpp
@@ -23,10 +23,9 @@
  * Binary distributions must follow the binary distribution requirements of
  * either License.
  */
-
 #pragma once
 
-#include <libfreenect.h>
+#include "libfreenect.h"
 #include <stdexcept>
 #include <sstream>
 #include <map>