diff options
| author | Victor Romero <romerosanchezv@gmail.com> | 2019-03-06 16:33:09 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-06 16:33:09 -0800 |
| commit | 4b150c0484750ef754920b35236086b955b00cb1 (patch) | |
| tree | f97f4eec2771fbce5fd89c663f85bb45a9a575d7 | |
| parent | 1b373245d28ce506f1a1995316a07e2bcd713612 (diff) | |
| download | vcpkg-4b150c0484750ef754920b35236086b955b00cb1.tar.gz vcpkg-4b150c0484750ef754920b35236086b955b00cb1.zip | |
Revert "[realsense2] fix cmake for linux (#4564)" (#5575)
This reverts commit 1b373245d28ce506f1a1995316a07e2bcd713612.
| -rw-r--r-- | ports/realsense2/portfile.cmake | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/ports/realsense2/portfile.cmake b/ports/realsense2/portfile.cmake index 8db63f04d..e6073099c 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,21 +47,11 @@ 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/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() + 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}) 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) |