diff options
| author | Cheney Wang <38240633+Cheney-W@users.noreply.github.com> | 2020-04-07 05:08:04 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-06 14:08:04 -0700 |
| commit | c4e7c83b0e0d6f0d92d8aed0a34718dff5030abb (patch) | |
| tree | f233e1391e8d204601d70a1103c288e752550db6 | |
| parent | 359661a22705ca101a27680fbe4d4815414be64f (diff) | |
| download | vcpkg-c4e7c83b0e0d6f0d92d8aed0a34718dff5030abb.tar.gz vcpkg-c4e7c83b0e0d6f0d92d8aed0a34718dff5030abb.zip | |
[nana] Add Xorg dependency libxcursor-dev and modify deprecated functions (#10605)
Co-authored-by: Cheney-Wang <v-xincwa@microsoft.com>
| -rw-r--r-- | ports/nana/CONTROL | 2 | ||||
| -rw-r--r-- | ports/nana/portfile.cmake | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/ports/nana/CONTROL b/ports/nana/CONTROL index a3d5736c3..551051140 100644 --- a/ports/nana/CONTROL +++ b/ports/nana/CONTROL @@ -1,5 +1,5 @@ Source: nana
-Version: 1.7.2 +Version: 1.7.2-1 Homepage: https://github.com/cnjinhao/nana
Description: Cross-platform library for GUI programming in modern C++ style.
Build-Depends: libpng, libjpeg-turbo, freetype (!uwp&&!windows), fontconfig (!uwp&&!windows)
diff --git a/ports/nana/portfile.cmake b/ports/nana/portfile.cmake index af85e02d9..d038242e1 100644 --- a/ports/nana/portfile.cmake +++ b/ports/nana/portfile.cmake @@ -1,9 +1,7 @@ -include(vcpkg_common_functions)
-
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
- message(WARNING "You will need to install Xorg dependencies to use nana:\napt install libx11-dev libxft-dev\n")
+if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_TARGET_IS_UWP)
+ message(WARNING "You will need to install Xorg dependencies to use nana:\napt install libx11-dev libxft-dev libxcursor-dev\n")
endif()
vcpkg_from_github(
@@ -34,5 +32,4 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-nana TARGET_PATH share/un vcpkg_copy_pdbs()
-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/nana)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/nana/LICENSE ${CURRENT_PACKAGES_DIR}/share/nana/copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|