From 7c55ecac266fc3e554bc315053dc45c11ec811af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?=
 <47264268+JackBoosY@users.noreply.github.com>
Date: Tue, 25 May 2021 08:43:03 +0800
Subject: [jxrlib] Add usage and fix FindJXR.cmake (#17715)

* [jxrlib] Add usage and fix FindJXR.cmake

* update version record
---
 ports/jxrlib/CONTROL        | 5 -----
 ports/jxrlib/FindJXR.cmake  | 2 +-
 ports/jxrlib/portfile.cmake | 7 ++++---
 ports/jxrlib/usage          | 5 +++++
 ports/jxrlib/vcpkg.json     | 7 +++++++
 versions/baseline.json      | 2 +-
 versions/j-/jxrlib.json     | 5 +++++
 7 files changed, 23 insertions(+), 10 deletions(-)
 delete mode 100644 ports/jxrlib/CONTROL
 create mode 100644 ports/jxrlib/usage
 create mode 100644 ports/jxrlib/vcpkg.json

diff --git a/ports/jxrlib/CONTROL b/ports/jxrlib/CONTROL
deleted file mode 100644
index 1a8fa60ba..000000000
--- a/ports/jxrlib/CONTROL
+++ /dev/null
@@ -1,5 +0,0 @@
-Source: jxrlib
-Version: 2019.10.9
-Port-Version: 2
-Homepage: https://github.com/4creators/jxrlib
-Description: Open source implementation of the jpegxr image format standard.
diff --git a/ports/jxrlib/FindJXR.cmake b/ports/jxrlib/FindJXR.cmake
index 7e4a5d45e..79924d21d 100644
--- a/ports/jxrlib/FindJXR.cmake
+++ b/ports/jxrlib/FindJXR.cmake
@@ -21,7 +21,7 @@ find_library(JXRGLUE_LIBRARY_RELEASE NAMES jxrglue PATH_SUFFIXES lib)
 find_library(JXRGLUE_LIBRARY_DEBUG NAMES jxrglued PATH_SUFFIXES lib)
 select_library_configurations(JXRGLUE)
 
-set(JXR_LIBRARIES ${JPEGXR_LIBRARY} ${JXRGLUE_LIBRARY})
+set(JXR_LIBRARIES ${JXRGLUE_LIBRARY} ${JPEGXR_LIBRARY})
 mark_as_advanced(JXR_LIBRARIES)
 
 include(FindPackageHandleStandardArgs)
diff --git a/ports/jxrlib/portfile.cmake b/ports/jxrlib/portfile.cmake
index ed4e45940..a15541b99 100644
--- a/ports/jxrlib/portfile.cmake
+++ b/ports/jxrlib/portfile.cmake
@@ -26,9 +26,10 @@ vcpkg_copy_pdbs()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
-# Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-
 #install FindJXR.cmake file
 file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/FindJXR.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/jxr)
 file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/jxr)
+file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/jxr)
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/jxrlib/usage b/ports/jxrlib/usage
new file mode 100644
index 000000000..6668ba162
--- /dev/null
+++ b/ports/jxrlib/usage
@@ -0,0 +1,5 @@
+The package jxrlib provides CMake integration:
+
+    find_package(JXR REQUIRED)
+    target_include_directories(main PRIVATE ${JXR_INCLUDE_DIRS})
+    target_link_libraries(main PRIVATE ${JXR_LIBRARIES})
diff --git a/ports/jxrlib/vcpkg.json b/ports/jxrlib/vcpkg.json
new file mode 100644
index 000000000..bdd2c9eb1
--- /dev/null
+++ b/ports/jxrlib/vcpkg.json
@@ -0,0 +1,7 @@
+{
+  "name": "jxrlib",
+  "version": "2019.10.9",
+  "port-version": 3,
+  "description": "Open source implementation of the jpegxr image format standard.",
+  "homepage": "https://github.com/4creators/jxrlib"
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index 8eb7696b9..8ab78f030 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2786,7 +2786,7 @@
     },
     "jxrlib": {
       "baseline": "2019.10.9",
-      "port-version": 2
+      "port-version": 3
     },
     "kangaru": {
       "baseline": "4.2.4",
diff --git a/versions/j-/jxrlib.json b/versions/j-/jxrlib.json
index 4fb240ac2..4995aa67e 100644
--- a/versions/j-/jxrlib.json
+++ b/versions/j-/jxrlib.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2070ec06331c3cf93574ec82fa22791e3ba6172f",
+      "version": "2019.10.9",
+      "port-version": 3
+    },
     {
       "git-tree": "c24ffcc58c1c28bef405da5b56adad3a25cd441b",
       "version-string": "2019.10.9",
-- 
cgit v1.2.3