diff options
| author | Phil Christensen <philc@microsoft.com> | 2019-08-28 12:24:23 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-28 12:24:23 -0700 |
| commit | 8a05dc0dcc4607ee9b07ea3a39fcd1c7c29d98b4 (patch) | |
| tree | f64eb3302dc7d2aa7f1b41167f0a3b648887b239 | |
| parent | 4b404e8cfbdde4277733adaacc399fa4e1b57320 (diff) | |
| parent | 20f7eb40a9a209dd0b240ae1a7a432ab50ad97f3 (diff) | |
| download | vcpkg-8a05dc0dcc4607ee9b07ea3a39fcd1c7c29d98b4.tar.gz vcpkg-8a05dc0dcc4607ee9b07ea3a39fcd1c7c29d98b4.zip | |
Merge pull request #7945 from ehsan-mohammadi/dev0
[liblsl] Fix installation
| -rw-r--r-- | ports/liblsl/fix-install.patch | 13 | ||||
| -rw-r--r-- | ports/liblsl/portfile.cmake | 8 |
2 files changed, 6 insertions, 15 deletions
diff --git a/ports/liblsl/fix-install.patch b/ports/liblsl/fix-install.patch deleted file mode 100644 index 66bfe0b18..000000000 --- a/ports/liblsl/fix-install.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6f2b0ff..c22360f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -184,7 +184,7 @@ else()
- set(LSLPREFIX "LSL/")
- endif()
-
--add_executable(lslver testing/lslver.c)
-+add_library(lslver STATIC testing/lslver.c)
- target_link_libraries(lslver PRIVATE lsl)
-
- install(TARGETS lsl lslver
diff --git a/ports/liblsl/portfile.cmake b/ports/liblsl/portfile.cmake index 8009f37de..bd1afddf1 100644 --- a/ports/liblsl/portfile.cmake +++ b/ports/liblsl/portfile.cmake @@ -8,8 +8,6 @@ vcpkg_from_github( REF 1.13.0-b11 # NOTE: when updating version, also change it in the parameter to vcpkg_configure_cmake
SHA512 212f28070b8239dc176d2e35bf4091896babbf7688e4cbe1c2bb0c3788f317ce2a80f92d4b008c6e577b01a09e8faf65228d396ff13e9ade0c1ffdc5e08cb9e5
HEAD_REF master
- PATCHES
- fix-install.patch
)
vcpkg_configure_cmake(
@@ -29,5 +27,11 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+if(VCPKG_TARGET_IS_WINDOWS)
+ file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/lslver.exe)
+ file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/lslver/)
+ file(RENAME ${CURRENT_PACKAGES_DIR}/bin/lslver.exe ${CURRENT_PACKAGES_DIR}/tools/lslver/lslver.exe)
+endif()
+
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/liblsl RENAME copyright)
file(INSTALL ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/liblsl)
|