From e1417916bc1ed24bacd9cbc54bd42a99f996f618 Mon Sep 17 00:00:00 2001
From: Mathis Logemann <mathisloge@gmail.com>
Date: Fri, 18 Dec 2020 12:04:07 +0100
Subject: [comms] fixes debug build configuration (#15159)

* set include directory correctly

* Revert "set include directory correctly"

This reverts commit bde9f290215dc685acdf115e5c2a5f332e2bbeb2.

* try suggested fix

* try changes

* apply fix for comms-ublox

* fix commsdsl

* try moving in port dir

* Revert "try moving in port dir"

This reverts commit 93546df6880c621aa3db36e7f60ef4bc7062d0e0.

* set port version

* fix port version

Co-authored-by: Victor Romero <romerosanchezv@gmail.com>

* add usage file to comms

* add line to usage

Co-authored-by: Victor Romero <romerosanchezv@gmail.com>
---
 ports/comms-ublox/portfile.cmake |  6 ++++--
 ports/comms-ublox/vcpkg.json     |  1 +
 ports/comms/portfile.cmake       | 10 ++++++----
 ports/comms/usage                |  4 ++++
 ports/comms/vcpkg.json           |  1 +
 ports/commsdsl/portfile.cmake    |  4 ++++
 ports/commsdsl/vcpkg.json        |  1 +
 7 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 ports/comms/usage

diff --git a/ports/comms-ublox/portfile.cmake b/ports/comms-ublox/portfile.cmake
index 87011252d..1bd6a7745 100644
--- a/ports/comms-ublox/portfile.cmake
+++ b/ports/comms-ublox/portfile.cmake
@@ -21,8 +21,10 @@ vcpkg_configure_cmake(
 )
 vcpkg_install_cmake()
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/ublox/cmake TARGET_PATH share/ublox)
+# currently this is only a header only library. after moving lib/ublox to share this lib path will be empty
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
 
 # Handle copyright
 file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/comms-ublox/vcpkg.json b/ports/comms-ublox/vcpkg.json
index 2c18c713c..65b4f327f 100644
--- a/ports/comms-ublox/vcpkg.json
+++ b/ports/comms-ublox/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "comms-ublox",
   "version-string": "0.20.0",
+  "port-version": 1,
   "description": "UBLOX (UBX) protocol definition, generated out of cc.ublox.commsdsl",
   "homepage": "https://commschamp.github.io/",
   "documentation": "https://github.com/commschamp/cc.ublox.generated",
diff --git a/ports/comms/portfile.cmake b/ports/comms/portfile.cmake
index 5a2a6d2fa..d1526e236 100644
--- a/ports/comms/portfile.cmake
+++ b/ports/comms/portfile.cmake
@@ -16,9 +16,11 @@ vcpkg_configure_cmake(
         -DCC_NO_UNIT_TESTS=ON
 )
 vcpkg_install_cmake()
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/LibComms/cmake TARGET_PATH share/LibComms)
+# currently this is only a header only library. after moving lib/LibComms to share this lib path will be empty
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
 
 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage @ONLY)
\ No newline at end of file
diff --git a/ports/comms/usage b/ports/comms/usage
new file mode 100644
index 000000000..9273c0283
--- /dev/null
+++ b/ports/comms/usage
@@ -0,0 +1,4 @@
+The package comms provides CMake targets:
+
+    find_package(LibComms CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE cc::comms)
diff --git a/ports/comms/vcpkg.json b/ports/comms/vcpkg.json
index cabbd6dee..313580685 100644
--- a/ports/comms/vcpkg.json
+++ b/ports/comms/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "comms",
   "version-string": "3.1.3",
+  "port-version": 1,
   "description": "COMMS is the C++(11) headers only, platform independent library, which makes the implementation of a communication protocol to be an easy and relatively quick process.",
   "homepage": "https://commschamp.github.io/",
   "documentation": "https://github.com/commschamp/comms_champion"
diff --git a/ports/commsdsl/portfile.cmake b/ports/commsdsl/portfile.cmake
index 0aaba7e8c..df428c0f8 100644
--- a/ports/commsdsl/portfile.cmake
+++ b/ports/commsdsl/portfile.cmake
@@ -24,7 +24,11 @@ vcpkg_copy_tools(
     AUTO_CLEAN
 )
 
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/LibCommsdsl/cmake TARGET_PATH share/LibCommsdsl)
+# after fixing the following dirs are empty
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/LibCommsdsl")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/LibCommsdsl")
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
diff --git a/ports/commsdsl/vcpkg.json b/ports/commsdsl/vcpkg.json
index 6b4b8b6a4..c01c9e27d 100644
--- a/ports/commsdsl/vcpkg.json
+++ b/ports/commsdsl/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "commsdsl",
   "version-string": "3.6.0",
+  "port-version": 1,
   "description": "DSL schemas parser and code generator for CommsChampion Ecosystem",
   "homepage": "https://commschamp.github.io/",
   "documentation": "https://github.com/commschamp/commsdsl",
-- 
cgit v1.2.3