Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity

[comms] fixes debug build configuration (#15159) 

* set include directory correctly

* Revert "set include directory correctly"

This reverts commit bde9f29021.

* 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 93546df688.

* 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>
This commit is contained in:
Mathis Logemann 2020-12-18 12:04:07 +01:00 committed by GitHub
parent fe5852514a
commit e1417916bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ports/comms-ublox/portfile.cmake
View File

@ -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)

1
ports/comms-ublox/vcpkg.json
View File

@ -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",

10
ports/comms/portfile.cmake
View File

@ -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)
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)

4
ports/comms/usage Normal file
View File

@ -0,0 +1,4 @@
The package comms provides CMake targets:
find_package(LibComms CONFIG REQUIRED)
target_link_libraries(main PRIVATE cc::comms)

1
ports/comms/vcpkg.json
View File

@ -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"

4
ports/commsdsl/portfile.cmake
View File

@ -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")

1
ports/commsdsl/vcpkg.json
View File

@ -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",