diff --git a/ports/quickfix/portfile.cmake b/ports/quickfix/portfile.cmake index d41a13c7c7436d..6ae5f2991a6718 100644 --- a/ports/quickfix/portfile.cmake +++ b/ports/quickfix/portfile.cmake @@ -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" ) @@ -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 @@ -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) diff --git a/ports/quickfix/vcpkg.json b/ports/quickfix/vcpkg.json index 5a6e940a3b69bd..f9cc60c36dfde2 100644 --- a/ports/quickfix/vcpkg.json +++ b/ports/quickfix/vcpkg.json @@ -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 + } ] } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 1f58327463eb07..2597ccae1bbc4a 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -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 diff --git a/scripts/templates/portfile.in.cmake b/scripts/templates/portfile.in.cmake index 2ca68351a5dbea..3ceac93d11fa7b 100644 --- a/scripts/templates/portfile.in.cmake +++ b/scripts/templates/portfile.in.cmake @@ -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 #} diff --git a/versions/baseline.json b/versions/baseline.json index a095414ad645f7..efc94fc022287b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5994,7 +5994,7 @@ }, "quickfix": { "baseline": "1.15.1", - "port-version": 5 + "port-version": 6 }, "quill": { "baseline": "1.6.3", diff --git a/versions/q-/quickfix.json b/versions/q-/quickfix.json index 45666d9a0f4d95..dc3fb096ce29f3 100644 --- a/versions/q-/quickfix.json +++ b/versions/q-/quickfix.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a9ec8c3d5dfd310a3f5d5c54bebc6030b4cad0c6", + "version": "1.15.1", + "port-version": 6 + }, { "git-tree": "d374a1da06a6765ceeb510d6b65afd8ee97194ad", "version-string": "1.15.1",