diff options
| author | Griffin Downs <35574547+grdowns@users.noreply.github.com> | 2019-03-14 13:25:56 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-14 13:25:56 -0700 |
| commit | 03696669ca9cf0a42ae08fd49f3db9ac6debaf87 (patch) | |
| tree | 7103fd7603c1bb812fae828a54fffaa1e31f9e65 | |
| parent | fe419b289055cbe0d7ccd41e01332e3155eed7bd (diff) | |
| parent | 357d1bf4728a280708eb55c76cd92d2ea1a8c77e (diff) | |
| download | vcpkg-03696669ca9cf0a42ae08fd49f3db9ac6debaf87.tar.gz vcpkg-03696669ca9cf0a42ae08fd49f3db9ac6debaf87.zip | |
Merge pull request #5634 from edmBernard/fix_realsense2
[realsense2] fix cmake for linux
| -rw-r--r-- | ports/realsense2/CONTROL | 2 | ||||
| -rw-r--r-- | ports/realsense2/portfile.cmake | 22 |
2 files changed, 17 insertions, 7 deletions
diff --git a/ports/realsense2/CONTROL b/ports/realsense2/CONTROL index 959292d5c..435f49cd0 100644 --- a/ports/realsense2/CONTROL +++ b/ports/realsense2/CONTROL @@ -1,5 +1,5 @@ Source: realsense2 -Version: 2.16.1 +Version: 2.16.1-1 Description: Intel® RealSense™ SDK 2.0 is a cross-platform library for Intel® RealSense™ depth cameras (D400 series and the SR300). Feature: tools diff --git a/ports/realsense2/portfile.cmake b/ports/realsense2/portfile.cmake index e6073099c..8db63f04d 100644 --- a/ports/realsense2/portfile.cmake +++ b/ports/realsense2/portfile.cmake @@ -35,8 +35,8 @@ vcpkg_configure_cmake( -DBUILD_EXAMPLES=OFF -DBUILD_GRAPHICAL_EXAMPLES=OFF # CMAKE - "-DCMAKE_PDB_OUTPUT_DIRECTORY=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" - -DCMAKE_DEBUG_POSTFIX="_d" + -DCMAKE_PDB_OUTPUT_DIRECTORY=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg + -DCMAKE_DEBUG_POSTFIX=_d ) vcpkg_install_cmake() @@ -47,11 +47,21 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) if(BUILD_EXAMPLES) - file(GLOB EXEFILES_RELEASE ${CURRENT_PACKAGES_DIR}/bin/*.exe) - file(GLOB EXEFILES_DEBUG ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) - file(COPY ${EXEFILES_RELEASE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/realsense2) - file(REMOVE ${EXEFILES_RELEASE} ${EXEFILES_DEBUG}) + file(GLOB EXEFILES_RELEASE ${CURRENT_PACKAGES_DIR}/bin/rs-* ${CURRENT_PACKAGES_DIR}/bin/realsense-*) + if (EXEFILES_RELEASE) + file(COPY ${EXEFILES_RELEASE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/realsense2) + file(REMOVE ${EXEFILES_RELEASE}) + endif() + file(GLOB EXEFILES_DEBUG ${CURRENT_PACKAGES_DIR}/debug/bin/*) + if (EXEFILES_DEBUG) + file(REMOVE ${EXEFILES_RELEASE} ${EXEFILES_DEBUG}) + endif() vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/realsense2) + + file(GLOB BINS ${CURRENT_PACKAGES_DIR}/bin/*) + if(NOT BINS) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + endif() endif() file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/realsense2) |