diff options
| author | Lily <47812810+wangli28@users.noreply.github.com> | 2019-08-28 06:44:26 +0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-08-27 15:44:26 -0700 |
| commit | 85d575c0ab9abbd111b819b1dfdec031c1a099b4 (patch) | |
| tree | 9eadc3aae88f76b46e6effe3c834a50e249c4923 | |
| parent | b8270c2a4bbe4d8730efdd6333108e744175b511 (diff) | |
| download | vcpkg-85d575c0ab9abbd111b819b1dfdec031c1a099b4.tar.gz vcpkg-85d575c0ab9abbd111b819b1dfdec031c1a099b4.zip | |
[moos-ui] Fix install path (#7812)
| -rw-r--r-- | ports/moos-ui/CONTROL | 4 | ||||
| -rw-r--r-- | ports/moos-ui/portfile.cmake | 19 |
2 files changed, 9 insertions, 14 deletions
diff --git a/ports/moos-ui/CONTROL b/ports/moos-ui/CONTROL index 08279ce15..8894e8b09 100644 --- a/ports/moos-ui/CONTROL +++ b/ports/moos-ui/CONTROL @@ -1,7 +1,5 @@ Source: moos-ui
-Version: 10.0.1-1
+Version: 10.0.1-2
Description: set of user interface tools to use and leverage the MOOS project.
Homepage: https://sites.google.com/site/moossoftware/
Build-Depends: moos-core
-
-
diff --git a/ports/moos-ui/portfile.cmake b/ports/moos-ui/portfile.cmake index 3f4b880e2..55cbebb7f 100644 --- a/ports/moos-ui/portfile.cmake +++ b/ports/moos-ui/portfile.cmake @@ -19,19 +19,16 @@ vcpkg_configure_cmake( vcpkg_install_cmake() file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/MOOS) -if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/uPoke") - file(RENAME ${CURRENT_PACKAGES_DIR}/bin/uPoke ${CURRENT_PACKAGES_DIR}/tools/MOOS/uPoke) - file(RENAME ${CURRENT_PACKAGES_DIR}/bin/iRemoteLite ${CURRENT_PACKAGES_DIR}/tools/MOOS/iRemoteLite) +if (VCPKG_TARGET_IS_WINDOWS) + file(RENAME ${CURRENT_PACKAGES_DIR}/bin/uPoke.exe ${CURRENT_PACKAGES_DIR}/tools/MOOS/uPoke.exe) + file(RENAME ${CURRENT_PACKAGES_DIR}/bin/iRemoteLite.exe ${CURRENT_PACKAGES_DIR}/tools/MOOS/iRemoteLite.exe) +else() + file(RENAME ${CURRENT_PACKAGES_DIR}/bin/uPoke ${CURRENT_PACKAGES_DIR}/tools/MOOS/uPoke) + file(RENAME ${CURRENT_PACKAGES_DIR}/bin/iRemoteLite ${CURRENT_PACKAGES_DIR}/tools/MOOS/iRemoteLite) endif() +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/MOOS) -# file(RENAME ${CURRENT_PACKAGES_DIR}/bin/uMS ${CURRENT_PACKAGES_DIR}/tools/uMS) -# file(RENAME ${CURRENT_PACKAGES_DIR}/bin/uPlayback ${CURRENT_PACKAGES_DIR}/tools/uPlayback) -# file(RENAME ${CURRENT_PACKAGES_DIR}/bin/pShare ${CURRENT_PACKAGES_DIR}/tools/pShare) -#endif() - -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug) -endif() +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug) file(WRITE ${CURRENT_PACKAGES_DIR}/include/fake_header_ui.h "// fake header to pass vcpkg post install check \n") file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright "see moos-core for copyright\n" ) |