From eb92719c5d41b3013050b269ba5ec85383789b17 Mon Sep 17 00:00:00 2001 From: Barath Kannan Date: Fri, 15 Dec 2017 07:02:25 +1100 Subject: fix naming issues --- ports/qt5modularscripts/qt_modular_library.cmake | 2 +- ports/qt5serial/CONTROL | 4 ---- ports/qt5serial/portfile.cmake | 5 ----- ports/qt5serialport/CONTROL | 4 ++++ ports/qt5serialport/portfile.cmake | 5 +++++ 5 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 ports/qt5serial/CONTROL delete mode 100644 ports/qt5serial/portfile.cmake create mode 100644 ports/qt5serialport/CONTROL create mode 100644 ports/qt5serialport/portfile.cmake diff --git a/ports/qt5modularscripts/qt_modular_library.cmake b/ports/qt5modularscripts/qt_modular_library.cmake index 7aff90f9b..b841d9eb7 100644 --- a/ports/qt5modularscripts/qt_modular_library.cmake +++ b/ports/qt5modularscripts/qt_modular_library.cmake @@ -61,7 +61,7 @@ function(qt_modular_library NAME HASH) foreach(DEBUG_MAKEFILE ${DEBUG_MAKEFILES}) file(READ "${DEBUG_MAKEFILE}" _contents) string(REPLACE "zlib.lib" "zlibd.lib" _contents "${_contents}") - string(REPLACE "vcpkg\\installed\\${TARGET_TRIPLET}\\lib" "vcpkg\\installed\\${TARGET_TRIPLET}\\debug\\lib" _contents "${_contents}") + string(REPLACE "installed\\${TARGET_TRIPLET}\\lib" "installed\\${TARGET_TRIPLET}\\debug\\lib" _contents "${_contents}") string(REPLACE "/LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib qtmaind.lib" "shell32.lib /LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib\\manual-link qtmaind.lib /LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib" _contents "${_contents}") file(WRITE "${DEBUG_MAKEFILE}" "${_contents}") endforeach() diff --git a/ports/qt5serial/CONTROL b/ports/qt5serial/CONTROL deleted file mode 100644 index 7782e6a53..000000000 --- a/ports/qt5serial/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: qt5serial -Version: 5.9.2-0 -Description: Qt5 Serial Port - provides access to hardware and virtual serial ports -Build-Depends: qt5modularscripts, qt5base \ No newline at end of file diff --git a/ports/qt5serial/portfile.cmake b/ports/qt5serial/portfile.cmake deleted file mode 100644 index f4a42f38f..000000000 --- a/ports/qt5serial/portfile.cmake +++ /dev/null @@ -1,5 +0,0 @@ -include(vcpkg_common_functions) - -include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) - -qt_modular_library(qtserialport cc8899c1ae2ed9fd8cf1c213ab7efaec12b3b16836006fdbf74cb7ea457705505a13e82c2f2873ee9426ae66473ec42259f4e728de64576ee44420f116cc433d) diff --git a/ports/qt5serialport/CONTROL b/ports/qt5serialport/CONTROL new file mode 100644 index 000000000..eb87231e0 --- /dev/null +++ b/ports/qt5serialport/CONTROL @@ -0,0 +1,4 @@ +Source: qt5serialport +Version: 5.9.2-0 +Description: Qt5 Serial Port - provides access to hardware and virtual serial ports +Build-Depends: qt5modularscripts, qt5base \ No newline at end of file diff --git a/ports/qt5serialport/portfile.cmake b/ports/qt5serialport/portfile.cmake new file mode 100644 index 000000000..f4a42f38f --- /dev/null +++ b/ports/qt5serialport/portfile.cmake @@ -0,0 +1,5 @@ +include(vcpkg_common_functions) + +include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) + +qt_modular_library(qtserialport cc8899c1ae2ed9fd8cf1c213ab7efaec12b3b16836006fdbf74cb7ea457705505a13e82c2f2873ee9426ae66473ec42259f4e728de64576ee44420f116cc433d) -- cgit v1.2.3