Merge pull request microsoft#7945 from ehsan-mohammadi/dev0

[liblsl] Fix installation
nonameentername · Aug 28, 2019 · 8a05dc0 · 8a05dc0
2 parents 4b404e8 + 20f7eb4
commit 8a05dc0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 15 deletions.
diff --git a/ports/liblsl/fix-install.patch b/ports/liblsl/fix-install.patch
diff --git 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)