diff --git a/OpenNI2-FreenectDriver/CMakeLists.txt b/OpenNI2-FreenectDriver/CMakeLists.txt index a1be114a..d5f9bdee 100644 --- a/OpenNI2-FreenectDriver/CMakeLists.txt +++ b/OpenNI2-FreenectDriver/CMakeLists.txt @@ -8,11 +8,20 @@ add_library(FreenectDriver SHARED ${HEADERS} ${SOURCES}) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-function") +#if (APPLE) +# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -headerpad_max_install_names") +#endif(APPLE) + +set(CMAKE_MACOSX_RPATH TRUE) + set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib/OpenNI2-FreenectDriver) -set_target_properties(FreenectDriver PROPERTIES +set_target_properties( + FreenectDriver PROPERTIES VERSION ${PROJECT_VER} - SOVERSION ${PROJECT_APIVER} - OUTPUT_NAME FreenectDriver) + OUTPUT_NAME FreenectDriver + # OSX install_name + #BUILD_WITH_INSTALL_RPATH TRUE + #INSTALL_NAME_DIR "@executable_path/../OpenNI2/Drivers/") add_definitions(-DPROJECT_VER="${PROJECT_VER}") @@ -22,4 +31,4 @@ include_directories(${PROJECT_SOURCE_DIR}/wrappers/cpp) target_link_libraries(FreenectDriver freenectstatic ${MATH_LIB}) install (TARGETS FreenectDriver - DESTINATION "${PROJECT_LIBRARY_INSTALL_DIR}/OpenNI2-FreenectDriver") + DESTINATION "${PROJECT_LIBRARY_INSTALL_DIR}/OpenNI2/Drivers/") diff --git a/OpenNI2-FreenectDriver/README.md b/OpenNI2-FreenectDriver/README.md index 55fd3791..16326ea3 100644 --- a/OpenNI2-FreenectDriver/README.md +++ b/OpenNI2-FreenectDriver/README.md @@ -19,10 +19,10 @@ Install 3. Copy the driver to your OpenNI2 driver repository. You must first change `Repository` to match your project layout. Repository="/example/path/to/Samples/Bin/OpenNI2/Drivers/" - cp -L lib/OpenNI2-FreenectDriver/libFreenectDriver.{so,dylib} ${Repository} + cp -L lib/OpenNI2/Drivers/libFreenectDriver.{so,dylib} ${Repository} # you could instead make a symlink to avoid copying after every build - # ln -s lib/OpenNI2-FreenectDriver/libFreenectDriver.{so,dylib} ${Repository} + # ln -s lib/OpenNI2/Drivers/libFreenectDriver.{so,dylib} ${Repository} OpenNI2-FreenectDriver is built with a static libfreenect, so you do not need to include libfreenect when deploying. However, you will need to make sure target systems have libusb and all other dependencies listed in `ldd libFreenectDriver.so`.