diff options
| author | Erwan BERNARD <edmBernard@users.noreply.github.com> | 2019-03-07 01:32:07 +0100 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-03-06 16:32:07 -0800 |
| commit | 1b373245d28ce506f1a1995316a07e2bcd713612 (patch) | |
| tree | a14eab9bf5c2da30032e6c8e3bf14d6a43bb7343 | |
| parent | 7e97b94e67525d152bcc153ca0f52fc8c87c9f9b (diff) | |
| download | vcpkg-1b373245d28ce506f1a1995316a07e2bcd713612.tar.gz vcpkg-1b373245d28ce506f1a1995316a07e2bcd713612.zip | |
[realsense2] fix cmake for linux (#4564)
* [realsense2] fix quotation mark in cmake command
* [realsense2] fix executable cleaning
| -rw-r--r-- | ports/realsense2/portfile.cmake | 22 |
1 files changed, 16 insertions, 6 deletions
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) |