Skip to content

Commit 0ce650f

Browse files
committed
cmake: Simplify export.h usage
Rename it from "libfreenect2/libfreenect2_export.h" to <libfreenect2/export.h>.
1 parent b8aaef1 commit 0ce650f

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ INCLUDE_DIRECTORIES(
6868
LINK_DIRECTORIES(${LibUSB_LIBRARY_DIRS})
6969

7070
SET(RESOURCES_INC_FILE "${PROJECT_BINARY_DIR}/resources.inc.h")
71-
SET(CONFIG_H_FILE "${PROJECT_BINARY_DIR}/libfreenect2/config.h")
7271

7372
SET(SOURCES
7473
include/internal/libfreenect2/protocol/command.h
@@ -117,7 +116,8 @@ SET(SOURCES
117116

118117
${LIBFREENECT2_THREADING_SOURCE}
119118
${RESOURCES_INC_FILE}
120-
${CONFIG_H_FILE}
119+
"${PROJECT_BINARY_DIR}/libfreenect2/config.h"
120+
"${PROJECT_BINARY_DIR}/libfreenect2/export.h"
121121
)
122122

123123
SET(LIBRARIES
@@ -200,7 +200,7 @@ IF(DEFINED CMAKE_INSTALL_RPATH)
200200
MESSAGE(STATUS "RPATH set to ${CMAKE_INSTALL_RPATH}")
201201
ENDIF()
202202

203-
CONFIGURE_FILE("${MY_DIR}/include/libfreenect2/config.h.in" "${CONFIG_H_FILE}" @ONLY)
203+
CONFIGURE_FILE("${MY_DIR}/include/libfreenect2/config.h.in" "${PROJECT_BINARY_DIR}/libfreenect2/config.h" @ONLY)
204204
GENERATE_RESOURCES(${RESOURCES_INC_FILE} ${MY_DIR} ${RESOURCES})
205205

206206
ADD_DEFINITIONS(-DRESOURCES_INC)
@@ -212,6 +212,7 @@ INCLUDE(GenerateExportHeader)
212212
ADD_LIBRARY(freenect2 ${SOURCES})
213213
GENERATE_EXPORT_HEADER(freenect2
214214
BASE_NAME libfreenect2
215+
EXPORT_FILE_NAME libfreenect2/export.h
215216
)
216217

217218
IF(MSVC AND NOT BUILD_SHARED_LIBS)
@@ -226,8 +227,7 @@ CONFIGURE_FILE(freenect2.pc.in "${PROJECT_BINARY_DIR}/freenect2.pc" @ONLY)
226227

227228
INSTALL(TARGETS freenect2 DESTINATION lib)
228229
INSTALL(DIRECTORY "${MY_DIR}/include/${PROJECT_NAME}" DESTINATION include PATTERN "*.in" EXCLUDE)
229-
INSTALL(FILES "${CONFIG_H_FILE}" DESTINATION include/${PROJECT_NAME})
230-
INSTALL(FILES "${PROJECT_BINARY_DIR}/libfreenect2_export.h" DESTINATION include/${PROJECT_NAME})
230+
INSTALL(DIRECTORY "${PROJECT_BINARY_DIR}/${PROJECT_NAME}" DESTINATION include)
231231
INSTALL(FILES "${PROJECT_BINARY_DIR}/freenect2Config.cmake" DESTINATION lib/cmake/freenect2/)
232232
INSTALL(FILES "${PROJECT_BINARY_DIR}/freenect2.pc" DESTINATION lib/pkgconfig/)
233233

include/libfreenect2/config.h.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#define LIBFREENECT2_PACK( __Declaration__ ) __Declaration__ __attribute__((__packed__))
3434
#endif
3535

36-
#include "libfreenect2_export.h"
36+
#include <libfreenect2/export.h>
3737
#define LIBFREENECT2_API LIBFREENECT2_EXPORT
3838

3939
#cmakedefine LIBFREENECT2_WITH_OPENGL_SUPPORT

0 commit comments

Comments
 (0)