Skip to content
Browse files

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>
  • Loading branch information...
1 parent cfe9c49 commit 7b9a5defe4ba6204cee1ae185bdfd181477dd931 @piedar piedar committed Feb 14, 2014
View
6 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 )
View
2 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>
View
2 examples/wavrecord.c
@@ -25,7 +25,7 @@
*/
#include "libfreenect.h"
-#include "libfreenect-audio.h"
+#include "libfreenect_audio.h"
#include <stdio.h>
#include <signal.h>
View
2 fakenect/fakenect.c
@@ -23,7 +23,7 @@
* either License.
*/
-#include <libfreenect.h>
+#include "libfreenect.h"
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
View
2 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>
View
3 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
View
3 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
View
4 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()
View
2 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>
View
9 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
View
4 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>
View
3 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
View
2 wrappers/cpp/CMakeLists.txt
@@ -1,5 +1,5 @@
INSTALL(FILES libfreenect.hpp
- DESTINATION include)
+ DESTINATION ${PROJECT_INCLUDE_INSTALL_DIR})
IF(BUILD_EXAMPLES)
View
3 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>

0 comments on commit 7b9a5de

Please sign in to comment.
Something went wrong with that request. Please try again.