Skip to content

Commit

Permalink
[vcpkg baseline][quickfix] Remove from CI baseline (#23878)
Browse files Browse the repository at this point in the history
* Fix deprecated cmake

* Remove from CI baseline

* Fix trailing whitespaces

* version

* Also mark "supports": "!uwp"

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
  • Loading branch information
Thomas1664 and BillyONeal committed Apr 1, 2022
1 parent 6c617b9 commit 27fd32e
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 22 deletions.
19 changes: 9 additions & 10 deletions ports/quickfix/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ vcpkg_from_github(
fix_wsl_symlink_error.patch
)

file(GLOB_RECURSE SRC_FILES RELATIVE ${SOURCE_PATH}
file(GLOB_RECURSE SRC_FILES RELATIVE "${SOURCE_PATH}"
"${SOURCE_PATH}/src/*.cpp"
"${SOURCE_PATH}/src/*.h"
)
Expand All @@ -26,8 +26,8 @@ foreach(SRC_FILE IN LISTS SRC_FILES)
file(WRITE "${SOURCE_PATH}/${SRC_FILE}" "${_contents}")
endforeach()

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DHAVE_EMX=OFF
-DHAVE_MYSQL=OFF
Expand All @@ -36,15 +36,14 @@ vcpkg_configure_cmake(
-DHAVE_PYTHON2=OFF
-DHAVE_PYTHON3=OFF
-DHAVE_SSL=ON
PREFER_NINJA
)

vcpkg_install_cmake()
vcpkg_cmake_install()
vcpkg_copy_pdbs()
vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/quickfix)
vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/quickfix)

file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")

configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
15 changes: 12 additions & 3 deletions ports/quickfix/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,19 @@
{
"name": "quickfix",
"version-string": "1.15.1",
"port-version": 5,
"version": "1.15.1",
"port-version": 6,
"description": "QuickFIX is a free and open source implementation of the FIX protocol.",
"homepage": "https://github.com/quickfix/quickfix",
"supports": "!uwp",
"dependencies": [
"openssl"
"openssl",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}
7 changes: 0 additions & 7 deletions scripts/ci.baseline.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1053,13 +1053,6 @@ qt5-x11extras:x86-windows=fail
qt5-x11extras:x64-windows=fail
qt5-x11extras:x64-windows-static=fail
qt5-x11extras:x64-windows-static-md=fail
quickfix:arm-uwp=fail
quickfix:arm64-windows=fail
quickfix:x64-uwp=fail
quickfix:x64-windows-static=fail
quickfix:x64-windows-static-md=fail
quickfix:x64-windows=fail
quickfix:x86-windows=fail
qwt:x64-osx=fail
qwt-qt6:x64-osx=fail
qwtw:x64-windows=fail
Expand Down
2 changes: 1 addition & 1 deletion scripts/templates/portfile.in.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ vcpkg_cmake_install()
# # Moves all .cmake files from /debug/share/@PORT@/ to /share/@PORT@/
# # See /docs/maintainers/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.md for more details
# When you uncomment "vcpkg_cmake_config_fixup()", you need to add the following to "dependencies" vcpkg.json:
#{
#{
# "name": "vcpkg-cmake-config",
# "host": true
#}
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -5994,7 +5994,7 @@
},
"quickfix": {
"baseline": "1.15.1",
"port-version": 5
"port-version": 6
},
"quill": {
"baseline": "1.6.3",
Expand Down
5 changes: 5 additions & 0 deletions versions/q-/quickfix.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "a9ec8c3d5dfd310a3f5d5c54bebc6030b4cad0c6",
"version": "1.15.1",
"port-version": 6
},
{
"git-tree": "d374a1da06a6765ceeb510d6b65afd8ee97194ad",
"version-string": "1.15.1",
Expand Down

0 comments on commit 27fd32e

Please sign in to comment.