From ac1f57e7cda116c39d07959c2026154abc1845b2 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 11 Jan 2021 09:55:28 +0100 Subject: [PATCH 001/131] force bla vendor in blas --- ports/blas/CONTROL | 1 + ports/blas/portfile.cmake | 31 ++++++++++++++++++++++++- ports/blas/vcpkg-cmake-wrapper.cmake.in | 5 ++++ 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 ports/blas/vcpkg-cmake-wrapper.cmake.in diff --git a/ports/blas/CONTROL b/ports/blas/CONTROL index 6f660d228e5580..e9e1a785b347c2 100644 --- a/ports/blas/CONTROL +++ b/ports/blas/CONTROL @@ -1,4 +1,5 @@ Source: blas Version: 1 +Port-Version: 1 Description: Metapackage for packages which provide BLAS Build-Depends: openblas diff --git a/ports/blas/portfile.cmake b/ports/blas/portfile.cmake index f70aa46eabd3fb..a37948d649c1ec 100644 --- a/ports/blas/portfile.cmake +++ b/ports/blas/portfile.cmake @@ -1,5 +1,34 @@ SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) +# OpenBLAS +set(BLA_VENDOR OpenBLAS) + +# For possible overlays: + +#NETLIB reference implementation (contained in lapack-reference) +#set(BLA_VENDOR Generic) + +# Intel MKL +#if(VCPKG_TARGET_ARCHITECTURE STREQUAL x64) +# set(BLA_VENDOR Intel10_64lp) +#elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL x86) +# set(BLA_VENDOR Intel10_32) +#else() +# message(FATAL_ERROR "Unsupported target architecture for Intel MKL!") +#endif() + +# Apple Accelerate Framework +# set(BLA_VENDOR Apple) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(BLA_STATIC ON) +else() + set(BLA_STATIC OFF) +endif() + +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) # Make sure BLAS can be found vcpkg_configure_cmake(SOURCE_PATH ${CURRENT_PORT_DIR} - OPTIONS -DCMAKE_PREFIX_PATH="${CURRENT_PACKAGES_DIR}") + OPTIONS -DCMAKE_PREFIX_PATH="${CURRENT_PACKAGES_DIR}" + -DBLA_VENDOR=${BLA_VENDOR} + -DBLA_STATIC=${BLA_STATIC}) diff --git a/ports/blas/vcpkg-cmake-wrapper.cmake.in b/ports/blas/vcpkg-cmake-wrapper.cmake.in new file mode 100644 index 00000000000000..bda7ab98d8f5ff --- /dev/null +++ b/ports/blas/vcpkg-cmake-wrapper.cmake.in @@ -0,0 +1,5 @@ +set(BLA_VENDOR @BLA_VENDOR@) +set(BLA_STATIC @BLA_STATIC@) +_find_package(${ARGS}) +unset(BLA_VENDOR) +unset(BLA_STATIC) \ No newline at end of file From f2df1fa681544ca19fa1741ff4e908e3d792c0e2 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 11 Jan 2021 09:57:54 +0100 Subject: [PATCH 002/131] force BLA_VENDOR for lapack. --- ports/lapack/CONTROL | 2 +- ports/lapack/portfile.cmake | 14 +++++++++++++- ports/lapack/vcpkg-cmake-wrapper.cmake.in | 5 +++++ 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 ports/lapack/vcpkg-cmake-wrapper.cmake.in diff --git a/ports/lapack/CONTROL b/ports/lapack/CONTROL index 6147ef3a807f8f..b040b6ddff36a0 100644 --- a/ports/lapack/CONTROL +++ b/ports/lapack/CONTROL @@ -1,5 +1,5 @@ Source: lapack Version: 3 -Port-Version: 1 +Port-Version: 2 Description: Metapackage for packages which provide LAPACK Build-Depends: clapack(arm&windows), lapack-reference(!arm|!windows) diff --git a/ports/lapack/portfile.cmake b/ports/lapack/portfile.cmake index 2a59fa7267d7c2..a9b34d2279985f 100644 --- a/ports/lapack/portfile.cmake +++ b/ports/lapack/portfile.cmake @@ -1,5 +1,17 @@ SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) +set(BLA_VENDOR Generic) +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(BLA_STATIC ON) +else() + set(BLA_STATIC OFF) +endif() + # Make sure LAPACK can be found vcpkg_configure_cmake(SOURCE_PATH ${CURRENT_PORT_DIR} - OPTIONS -DCMAKE_PREFIX_PATH="${CURRENT_PACKAGES_DIR}") + OPTIONS -DCMAKE_PREFIX_PATH="${CURRENT_PACKAGES_DIR}" + -DBLA_VENDOR=${BLA_VENDOR} + -DBLA_STATIC=${BLA_STATIC}) + diff --git a/ports/lapack/vcpkg-cmake-wrapper.cmake.in b/ports/lapack/vcpkg-cmake-wrapper.cmake.in new file mode 100644 index 00000000000000..bda7ab98d8f5ff --- /dev/null +++ b/ports/lapack/vcpkg-cmake-wrapper.cmake.in @@ -0,0 +1,5 @@ +set(BLA_VENDOR @BLA_VENDOR@) +set(BLA_STATIC @BLA_STATIC@) +_find_package(${ARGS}) +unset(BLA_VENDOR) +unset(BLA_STATIC) \ No newline at end of file From f14cac729cc416428b44c52e03ae835fcb4a23c5 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 19 Jan 2021 13:37:58 +0100 Subject: [PATCH 003/131] fix wrapper install --- ports/lapack-reference/CONTROL | 2 +- ports/lapack-reference/portfile.cmake | 10 ++++++++-- ports/lapack-reference/vcpkg-cmake-wrapper.cmake | 2 ++ ports/lapack/portfile.cmake | 8 ++++---- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/ports/lapack-reference/CONTROL b/ports/lapack-reference/CONTROL index 701e48b7d3b2f1..3e18ebd2b3db1c 100644 --- a/ports/lapack-reference/CONTROL +++ b/ports/lapack-reference/CONTROL @@ -1,6 +1,6 @@ Source: lapack-reference Version: 3.8.0 -Port-Version: 4 +Port-Version: 5 Description: LAPACK — Linear Algebra PACKage http://www.netlib.org/lapack/ Default-Features: blas-select Build-Depends: vcpkg-gfortran (windows) diff --git a/ports/lapack-reference/portfile.cmake b/ports/lapack-reference/portfile.cmake index 11655858c9d384..deaa1c4959b3ed 100644 --- a/ports/lapack-reference/portfile.cmake +++ b/ports/lapack-reference/portfile.cmake @@ -138,6 +138,12 @@ if(VCPKG_TARGET_IS_WINDOWS) endif() if(NOT VCPKG_TARGET_IS_WINDOWS) - file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/lapack) - file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindLAPACK.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/lapack) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(BLA_STATIC ON) + else() + set(BLA_STATIC OFF) + endif() + set(BLA_VENDOR Generic) + configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/lapack/vcpkg-cmake-wrapper.cmake" @ONLY) + file(COPY "${CMAKE_CURRENT_LIST_DIR}/FindLAPACK.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/lapack") endif() diff --git a/ports/lapack-reference/vcpkg-cmake-wrapper.cmake b/ports/lapack-reference/vcpkg-cmake-wrapper.cmake index b3a7128fff0150..d945ec8d9e6b29 100644 --- a/ports/lapack-reference/vcpkg-cmake-wrapper.cmake +++ b/ports/lapack-reference/vcpkg-cmake-wrapper.cmake @@ -6,6 +6,8 @@ list(REMOVE_ITEM ARGS "NO_MODULE") list(REMOVE_ITEM ARGS "CONFIG") list(REMOVE_ITEM ARGS "MODULE") +set(BLA_VENDOR @BLA_VENDOR@) +set(BLA_STATIC @BLA_STATIC@) _find_package(${ARGS}) set(CMAKE_MODULE_PATH ${LAPACK_PREV_MODULE_PATH}) diff --git a/ports/lapack/portfile.cmake b/ports/lapack/portfile.cmake index a9b34d2279985f..6610dc604d04fd 100644 --- a/ports/lapack/portfile.cmake +++ b/ports/lapack/portfile.cmake @@ -1,14 +1,14 @@ SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) -set(BLA_VENDOR Generic) -configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) - if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") set(BLA_STATIC ON) else() set(BLA_STATIC OFF) endif() - +set(BLA_VENDOR Generic) +if(VCPKG_TARGET_IS_WINDOWS) # The other wrapper is in lapack-reference + configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/lapack/vcpkg-cmake-wrapper.cmake" @ONLY) +endif() # Make sure LAPACK can be found vcpkg_configure_cmake(SOURCE_PATH ${CURRENT_PORT_DIR} OPTIONS -DCMAKE_PREFIX_PATH="${CURRENT_PACKAGES_DIR}" From 995f5b2cb172bc82f7540f1c025e5330b2c2fe91 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 19 Jan 2021 13:39:10 +0100 Subject: [PATCH 004/131] add version info --- versions/b-/blas.json | 5 +++++ versions/baseline.json | 6 +++--- versions/l-/lapack-reference.json | 5 +++++ versions/l-/lapack.json | 5 +++++ 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/versions/b-/blas.json b/versions/b-/blas.json index 7fb01927b6b3e0..e766feae419fc8 100644 --- a/versions/b-/blas.json +++ b/versions/b-/blas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e9b2b37537892de237c078a3d12963654c7dbbe1", + "version-string": "1", + "port-version": 1 + }, { "git-tree": "2877c1693c63195d4edacfb42156c9d8874ad046", "version-string": "1", diff --git a/versions/baseline.json b/versions/baseline.json index f45c801d233d49..0cbeb92b6b2047 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -350,7 +350,7 @@ }, "blas": { "baseline": "1", - "port-version": 0 + "port-version": 1 }, "blaze": { "baseline": "3.8", @@ -2762,11 +2762,11 @@ }, "lapack": { "baseline": "3", - "port-version": 1 + "port-version": 2 }, "lapack-reference": { "baseline": "3.8.0", - "port-version": 4 + "port-version": 5 }, "lastools": { "baseline": "2020-05-09", diff --git a/versions/l-/lapack-reference.json b/versions/l-/lapack-reference.json index 0fd9ba4d7e79f5..1f5cca68611a6b 100644 --- a/versions/l-/lapack-reference.json +++ b/versions/l-/lapack-reference.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b517efd51168209fcdc218bd43bb487656fb0dba", + "version-string": "3.8.0", + "port-version": 5 + }, { "git-tree": "34971ac86a76f6bffefe5962980c3991abf87a58", "version-string": "3.8.0", diff --git a/versions/l-/lapack.json b/versions/l-/lapack.json index 5d618ffb530d51..c5c7d817e20aaa 100644 --- a/versions/l-/lapack.json +++ b/versions/l-/lapack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "459d9d4feb9b3dd3820651e696a38f7bd278e2ea", + "version-string": "3", + "port-version": 2 + }, { "git-tree": "e3e10603a14f3b981ce689ba768d42a1a2ec07d4", "version-string": "3", From ef5943711425d1787f7cb6a0ac5fbe0558e062b4 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 22 Apr 2022 09:10:05 +0200 Subject: [PATCH 005/131] install wrapper if not exist. --- ports/lapack/portfile.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ports/lapack/portfile.cmake b/ports/lapack/portfile.cmake index 6610dc604d04fd..1f2ebbfabbecb7 100644 --- a/ports/lapack/portfile.cmake +++ b/ports/lapack/portfile.cmake @@ -7,7 +7,9 @@ else() endif() set(BLA_VENDOR Generic) if(VCPKG_TARGET_IS_WINDOWS) # The other wrapper is in lapack-reference - configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/lapack/vcpkg-cmake-wrapper.cmake" @ONLY) + if(NOT EXISTS "${CURRENT_INSTALLED_DIR}/share/lapack/vcpkg-cmake-wrapper.cmake") + configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/lapack/vcpkg-cmake-wrapper.cmake" @ONLY) + endif() endif() # Make sure LAPACK can be found vcpkg_configure_cmake(SOURCE_PATH ${CURRENT_PORT_DIR} From d8870619e8715cccd355a9d09f4d4a7ade011b71 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 22 Apr 2022 11:13:18 +0200 Subject: [PATCH 006/131] cleanup stuff --- ports/blas/portfile.cmake | 8 ++++++-- ports/blas/vcpkg.json | 11 ++++++++++- ports/clapack/FindLAPACK.cmake | 13 +++++++------ ports/clapack/portfile.cmake | 19 +++++++++---------- ports/clapack/vcpkg.json | 12 ++++++++++-- ports/lapack-reference/portfile.cmake | 5 ++--- ports/lapack/portfile.cmake | 21 ++++++++++++++------- ports/lapack/vcpkg-cmake-wrapper.cmake.in | 1 + ports/lapack/vcpkg.json | 5 +++++ 9 files changed, 64 insertions(+), 31 deletions(-) diff --git a/ports/blas/portfile.cmake b/ports/blas/portfile.cmake index a37948d649c1ec..73999abc2ea60a 100644 --- a/ports/blas/portfile.cmake +++ b/ports/blas/portfile.cmake @@ -1,7 +1,11 @@ SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) # OpenBLAS -set(BLA_VENDOR OpenBLAS) +if(VCPKG_TARGET_IS_OSX) + set(BLA_VENDOR Apple) +else() + set(BLA_VENDOR OpenBLAS) +endif() # For possible overlays: @@ -28,7 +32,7 @@ endif() configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) # Make sure BLAS can be found -vcpkg_configure_cmake(SOURCE_PATH ${CURRENT_PORT_DIR} +vcpkg_cmake_configure(SOURCE_PATH "${CURRENT_PORT_DIR}" OPTIONS -DCMAKE_PREFIX_PATH="${CURRENT_PACKAGES_DIR}" -DBLA_VENDOR=${BLA_VENDOR} -DBLA_STATIC=${BLA_STATIC}) diff --git a/ports/blas/vcpkg.json b/ports/blas/vcpkg.json index 6591fb2d7d0784..40861e063fb8a2 100644 --- a/ports/blas/vcpkg.json +++ b/ports/blas/vcpkg.json @@ -1,8 +1,17 @@ { + "$comment": "Keep the platform expressions in sync with the wrappers installed by the portfiles!", "name": "blas", "version-date": "2022-04-22", "description": "Metapackage for packages which provide BLAS", + "license": null, "dependencies": [ - "openblas" + { + "name": "openblas", + "platform": "!osx" + }, + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/clapack/FindLAPACK.cmake b/ports/clapack/FindLAPACK.cmake index aa546e672be054..428a1e8dcc2a08 100644 --- a/ports/clapack/FindLAPACK.cmake +++ b/ports/clapack/FindLAPACK.cmake @@ -103,15 +103,15 @@ if(NOT LAPACK_LIBRARY) list(APPEND LAPACK_LIBRARY_RELEASE ${F2C_LIBRARY_RELEASE}) list(APPEND LAPACK_LIBRARY_DEBUG ${F2C_LIBRARY_DEBUG}) - find_dependency(OpenBLAS) - get_property(_loc TARGET OpenBLAS::OpenBLAS PROPERTY IMPORTED_IMPLIB_RELEASE) + find_dependency(BLAS) + get_property(_loc TARGET BLAS::BLAS PROPERTY IMPORTED_IMPLIB_RELEASE) if(NOT _loc) - get_property(_loc TARGET OpenBLAS::OpenBLAS PROPERTY LOCATION_RELEASE) + get_property(_loc TARGET BLAS::BLAS PROPERTY LOCATION_RELEASE) endif() set(LAPACK_BLAS_LIBRARY_RELEASE ${_loc}) - get_property(_loc TARGET OpenBLAS::OpenBLAS PROPERTY IMPORTED_IMPLIB_DEBUG) + get_property(_loc TARGET BLAS::BLAS PROPERTY IMPORTED_IMPLIB_DEBUG) if(NOT _loc) - get_property(_loc TARGET OpenBLAS::OpenBLAS PROPERTY LOCATION_DEBUG) + get_property(_loc TARGET BLAS::BLAS PROPERTY LOCATION_DEBUG) endif() set(LAPACK_BLAS_LIBRARY_DEBUG ${_loc}) select_library_configurations(LAPACK_BLAS) @@ -235,5 +235,6 @@ endif() # Preserve backwards compatibility and also register the 'lapack' target if(CLAPACK_FOUND AND NOT TARGET lapack) - add_library(lapack ALIAS LAPACK::LAPACK) + add_library(lapack INTERFACE IMPORTED) + target_link_libraries(lapack INTERFACE LAPACK::LAPACK) endif() diff --git a/ports/clapack/portfile.cmake b/ports/clapack/portfile.cmake index d84c864e207ee6..fd14d04a69bec4 100644 --- a/ports/clapack/portfile.cmake +++ b/ports/clapack/portfile.cmake @@ -12,7 +12,7 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" PATCHES remove_internal_blas.patch fix-ConfigFile.patch @@ -44,24 +44,23 @@ Continuing with trying to run arithchk anyway.") endif() endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DCMAKE_DEBUG_POSTFIX=d ${ARITH_PATH} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() #TODO: fix the official exported targets, since they are broken (luckily it seems that no-one uses them for now) -vcpkg_fixup_cmake_targets(CONFIG_PATH share/clapack) +vcpkg_cmake_config_fixup() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Install clapack wrappers. -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/lapack) -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/FindLAPACK.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/lapack) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/FindLAPACK.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/clapack/vcpkg.json b/ports/clapack/vcpkg.json index 78b840f56495cd..b3d28c2965c9e3 100644 --- a/ports/clapack/vcpkg.json +++ b/ports/clapack/vcpkg.json @@ -1,10 +1,18 @@ { "name": "clapack", "version": "3.2.1", - "port-version": 20, + "port-version": 21, "description": "CLAPACK (f2c'ed version of LAPACK)", "homepage": "https://www.netlib.org/clapack", "dependencies": [ - "blas" + "blas", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/lapack-reference/portfile.cmake b/ports/lapack-reference/portfile.cmake index 7ff7e64fa5b369..b1995d95a5246d 100644 --- a/ports/lapack-reference/portfile.cmake +++ b/ports/lapack-reference/portfile.cmake @@ -145,6 +145,5 @@ else() endif() set(BLA_VENDOR Generic) - -file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/lapack") -file(COPY "${CMAKE_CURRENT_LIST_DIR}/FindLAPACK.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/lapack") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/FindLAPACK.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/lapack/portfile.cmake b/ports/lapack/portfile.cmake index 1f2ebbfabbecb7..4e4c5fc6f2c988 100644 --- a/ports/lapack/portfile.cmake +++ b/ports/lapack/portfile.cmake @@ -5,15 +5,22 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") else() set(BLA_STATIC OFF) endif() + set(BLA_VENDOR Generic) -if(VCPKG_TARGET_IS_WINDOWS) # The other wrapper is in lapack-reference - if(NOT EXISTS "${CURRENT_INSTALLED_DIR}/share/lapack/vcpkg-cmake-wrapper.cmake") - configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/lapack/vcpkg-cmake-wrapper.cmake" @ONLY) - endif() +if(VCPKG_TARGET_IS_OSX) + set(BLA_VENDOR Apple) + configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/lapack/vcpkg-cmake-wrapper.cmake" @ONLY) +elseif((VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE MATCHES "arm") OR VCPKG_TARGET_IS_UWP) + configure_file("${CURRENT_INSTALLED_DIR}/share/clapack/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/lapack/vcpkg-cmake-wrapper.cmake" COPYONLY) + configure_file("${CURRENT_INSTALLED_DIR}/share/clapack/FindLAPACK.cmake" "${CURRENT_PACKAGES_DIR}/share/lapack/FindLAPACK.cmake" COPYONLY) +else() + configure_file("${CURRENT_INSTALLED_DIR}/share/lapack-reference/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/lapack/vcpkg-cmake-wrapper.cmake" COPYONLY) + configure_file("${CURRENT_INSTALLED_DIR}/share/lapack-reference/FindLAPACK.cmake" "${CURRENT_PACKAGES_DIR}/share/lapack/FindLAPACK.cmake" COPYONLY) endif() + # Make sure LAPACK can be found -vcpkg_configure_cmake(SOURCE_PATH ${CURRENT_PORT_DIR} +vcpkg_cmake_configure(SOURCE_PATH "${CURRENT_PORT_DIR}" OPTIONS -DCMAKE_PREFIX_PATH="${CURRENT_PACKAGES_DIR}" - -DBLA_VENDOR=${BLA_VENDOR} - -DBLA_STATIC=${BLA_STATIC}) + -DBLA_VENDOR="${BLA_VENDOR}" + -DBLA_STATIC="${BLA_STATIC}") diff --git a/ports/lapack/vcpkg-cmake-wrapper.cmake.in b/ports/lapack/vcpkg-cmake-wrapper.cmake.in index bda7ab98d8f5ff..22f4fc07732d70 100644 --- a/ports/lapack/vcpkg-cmake-wrapper.cmake.in +++ b/ports/lapack/vcpkg-cmake-wrapper.cmake.in @@ -1,3 +1,4 @@ +_find_package(BLAS) # Find BLAS before setting BLA_VENDOR (Will set/unset BLA_VENDOR itself) set(BLA_VENDOR @BLA_VENDOR@) set(BLA_STATIC @BLA_STATIC@) _find_package(${ARGS}) diff --git a/ports/lapack/vcpkg.json b/ports/lapack/vcpkg.json index 70a2aabec304fe..8a26a743e98a27 100644 --- a/ports/lapack/vcpkg.json +++ b/ports/lapack/vcpkg.json @@ -1,4 +1,5 @@ { + "$comment": "Keep the platform expressions in sync with the wrappers installed by the portfiles!", "name": "lapack", "version-date": "2022-02-22", "description": "Metapackage for packages which provide LAPACK", @@ -11,6 +12,10 @@ { "name": "lapack-reference", "platform": "!((arm & windows) | uwp)" + }, + { + "name": "vcpkg-cmake", + "host": true } ] } From c12bad7d5762a5a2384706c4763dfb02960b9e34 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 22 Apr 2022 11:23:00 +0200 Subject: [PATCH 007/131] rename to cmake.in --- .../{vcpkg-cmake-wrapper.cmake => vcpkg-cmake-wrapper.cmake.in} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename ports/lapack-reference/{vcpkg-cmake-wrapper.cmake => vcpkg-cmake-wrapper.cmake.in} (100%) diff --git a/ports/lapack-reference/vcpkg-cmake-wrapper.cmake b/ports/lapack-reference/vcpkg-cmake-wrapper.cmake.in similarity index 100% rename from ports/lapack-reference/vcpkg-cmake-wrapper.cmake rename to ports/lapack-reference/vcpkg-cmake-wrapper.cmake.in From c50945d3e16e4eb1dda63d163ceeea6ef42fb26f Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 22 Apr 2022 11:25:57 +0200 Subject: [PATCH 008/131] details --- ports/lapack-reference/portfile.cmake | 2 +- ports/lapack/portfile.cmake | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/lapack-reference/portfile.cmake b/ports/lapack-reference/portfile.cmake index b1995d95a5246d..abbadcdae9b341 100644 --- a/ports/lapack-reference/portfile.cmake +++ b/ports/lapack-reference/portfile.cmake @@ -145,5 +145,5 @@ else() endif() set(BLA_VENDOR Generic) -file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake") file(COPY "${CMAKE_CURRENT_LIST_DIR}/FindLAPACK.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/lapack/portfile.cmake b/ports/lapack/portfile.cmake index 4e4c5fc6f2c988..c3af28b697cf69 100644 --- a/ports/lapack/portfile.cmake +++ b/ports/lapack/portfile.cmake @@ -21,6 +21,7 @@ endif() # Make sure LAPACK can be found vcpkg_cmake_configure(SOURCE_PATH "${CURRENT_PORT_DIR}" OPTIONS -DCMAKE_PREFIX_PATH="${CURRENT_PACKAGES_DIR}" + -DCMAKE_MODULE_PATH="${CURRENT_PACKAGES_DIR}/share/lapack" -DBLA_VENDOR="${BLA_VENDOR}" -DBLA_STATIC="${BLA_STATIC}") From 16373d0fa3613c1aa7281ac6b5d2b902c1063188 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 22 Apr 2022 12:48:43 +0200 Subject: [PATCH 009/131] drastically simplify FindLAPACK by clapack --- ports/clapack/FindLAPACK.cmake | 245 ++++----------------------------- 1 file changed, 26 insertions(+), 219 deletions(-) diff --git a/ports/clapack/FindLAPACK.cmake b/ports/clapack/FindLAPACK.cmake index 428a1e8dcc2a08..b98847adf83660 100644 --- a/ports/clapack/FindLAPACK.cmake +++ b/ports/clapack/FindLAPACK.cmake @@ -2,239 +2,46 @@ # clapack config for vcpkg # ------------ # -# Find the clapack includes and library. +# Find clapack as a valid LAPACK implementation. # -# Result Variables -# ^^^^^^^^^^^^^^^^ -# -# This script defines the following variables: -# -# ``CLAPACK_FOUND`` -# True if clapack library found -# -# ``CLAPACK_VERSION`` -# Containing the clapack version tag (manually defined) -# -# ``CLAPACK_INCLUDE_DIR`` -# Location of clapack headers -# -# ``CLAPACK_LIBRARY`` -# List of libraries to link with when using clapack -# -# Result Targets -# ^^^^^^^^^^^^^^ -# -# This script defines the following targets: -# -# ``clapack::clapack`` -# Target to use clapack -# -# Compatibility Variables -# ^^^^^^^^^^^^^^^^^^^^^^^ -# -# This script defines the following variables for compatibility reasons: -# -# ``F2C_FOUND`` -# True if f2c (fortran-to-c wrap layer) library found -# -# ``F2C_INCLUDE_DIR`` -# Location of clapack headers -# -# ``F2C_LIBRARY`` -# Library containing the fortran-to-c wrap layer, necessary for clapack and automatically included when used -# -# ``LAPACK_FOUND`` -# True if clapack library found -# -# ``LAPACK_VERSION`` -# Containing the clapack version tag (manually defined) -# -# ``LAPACK_INCLUDE_DIR`` -# Location of clapack headers -# -# ``LAPACK_LIBRARY`` -# List of libraries to link with when using clapack -# -# Compatibility Targets -# ^^^^^^^^^^^^^^ -# -# This script defines the following targets for compatibility reasons: -# -# ``lapack`` -# Target to use lapack +# The module defines the same outputs as FindLAPACK by cmake include(${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake) -include(${CMAKE_ROOT}/Modules/CheckSymbolExists.cmake) include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake) -include(${CMAKE_ROOT}/Modules/CMakeFindDependencyMacro.cmake) set(CLAPACK_VERSION "3.2.1") - -set(CMAKE_THREAD_PREFER_PTHREAD TRUE) +set(LAPACK_VERSION "${CLAPACK_VERSION}") +#set(CMAKE_THREAD_PREFER_PTHREAD TRUE) find_dependency(Threads) -if(UNIX) - find_library(ADDITIONAL_LAPACK_LIBRARY m) - set(PTHREAD_LINK_NAME "-pthread") -endif() - -if(NOT F2C_LIBRARY) - find_library(F2C_LIBRARY_RELEASE NAMES f2c libf2c) - find_library(F2C_LIBRARY_DEBUG NAMES f2cd libf2cd) - select_library_configurations(F2C) - - #keep a list of "pure" f2c libs, without dependencies - set(oF2C_LIBRARY_RELEASE ${F2C_LIBRARY_RELEASE}) - set(oF2C_LIBRARY_DEBUG ${F2C_LIBRARY_DEBUG}) - set(oF2C_LIBRARY ${F2C_LIBRARY}) - - list(APPEND F2C_LIBRARY ${ADDITIONAL_LAPACK_LIBRARY}) -endif() - -if(NOT LAPACK_LIBRARY) - find_library(LAPACK_LIBRARY_RELEASE NAMES lapack) - find_library(LAPACK_LIBRARY_DEBUG NAMES lapackd) - - #keep a list of "pure" lapack libs, without dependencies - set(oLAPACK_LIBRARY_RELEASE ${LAPACK_LIBRARY_RELEASE}) - set(oLAPACK_LIBRARY_DEBUG ${LAPACK_LIBRARY_DEBUG}) - select_library_configurations(oLAPACK) - - list(APPEND LAPACK_LIBRARY_RELEASE ${F2C_LIBRARY_RELEASE}) - list(APPEND LAPACK_LIBRARY_DEBUG ${F2C_LIBRARY_DEBUG}) - - find_dependency(BLAS) - get_property(_loc TARGET BLAS::BLAS PROPERTY IMPORTED_IMPLIB_RELEASE) - if(NOT _loc) - get_property(_loc TARGET BLAS::BLAS PROPERTY LOCATION_RELEASE) - endif() - set(LAPACK_BLAS_LIBRARY_RELEASE ${_loc}) - get_property(_loc TARGET BLAS::BLAS PROPERTY IMPORTED_IMPLIB_DEBUG) - if(NOT _loc) - get_property(_loc TARGET BLAS::BLAS PROPERTY LOCATION_DEBUG) - endif() - set(LAPACK_BLAS_LIBRARY_DEBUG ${_loc}) - select_library_configurations(LAPACK_BLAS) - list(APPEND LAPACK_LIBRARY_RELEASE ${LAPACK_BLAS_LIBRARY_RELEASE}) - list(APPEND LAPACK_LIBRARY_DEBUG ${LAPACK_BLAS_LIBRARY_DEBUG}) +find_package(clapack CONFIG REQUIRED) # This will be found ! - select_library_configurations(LAPACK) - if(UNIX) - list(APPEND LAPACK_LIBRARY ${PTHREAD_LINK_NAME}) - endif() +if(NOT TARGET lapack) + message(FATAL_ERROR "Target lapack was not created by find_package(clapack)!") endif() -if(NOT F2C_INCLUDE_DIR) - find_path(F2C_INCLUDE_DIR NAMES f2c.h) -endif() - -if(NOT LAPACK_INCLUDE_DIR) - find_path(LAPACK_INCLUDE_DIR NAMES clapack.h) -endif() - -list(APPEND LAPACK_INCLUDE_DIR ${F2C_INCLUDE_DIR}) -set(LAPACK_INCLUDE_DIR "${LAPACK_INCLUDE_DIR}" CACHE PATH "" FORCE) -set(LAPACK_INCLUDE_DIRS "${LAPACK_INCLUDE_DIR}" CACHE PATH "" FORCE) -set(CLAPACK_INCLUDE_DIR "${LAPACK_INCLUDE_DIR}" CACHE PATH "" FORCE) -set(CLAPACK_INCLUDE_DIRS "${LAPACK_INCLUDE_DIR}" CACHE PATH "" FORCE) -set(F2C_INCLUDE_DIRS "${F2C_INCLUDE_DIR}" CACHE PATH "" FORCE) - -set(LAPACK_DLL_DIR ${LAPACK_INCLUDE_DIR}) -list(TRANSFORM LAPACK_DLL_DIR APPEND "/../bin") -message(STATUS "LAPACK_DLL_DIR: ${LAPACK_DLL_DIR}") +if(NOT TARGET LAPACK::LAPACK) + add_library(LAPACK::LAPACK INTERFACE IMPORTED) + target_link_libraries(LAPACK::LAPACK INTERFACE lapack) -if(WIN32) - find_file(LAPACK_LIBRARY_RELEASE_DLL NAMES lapack.dll PATHS ${LAPACK_DLL_DIR}) - find_file(LAPACK_LIBRARY_DEBUG_FOLDER NAMES lapackd.dll PATHS ${LAPACK_DLL_DIR}) - find_file(F2C_LIBRARY_RELEASE_DLL NAMES f2c.dll libf2c.dll PATHS ${LAPACK_DLL_DIR}) - find_file(F2C_LIBRARY_DEBUG_DLL NAMES f2cd.dll libf2cd.dll PATHS ${LAPACK_DLL_DIR}) -endif() - -set(LAPACK_BLAS_LIBRARY "${LAPACK_BLAS_LIBRARY}" CACHE STRING "" FORCE) -set(F2C_LIBRARIES "${F2C_LIBRARY}" CACHE STRING "" FORCE) -set(LAPACK_VERSION "${CLAPACK_VERSION}" CACHE STRING "" FORCE) -set(LAPACK_LIBRARIES "${LAPACK_LIBRARY}" CACHE STRING "" FORCE) -set(CLAPACK_LIBRARY "${LAPACK_LIBRARY}" CACHE STRING "" FORCE) -set(CLAPACK_LIBRARIES "${LAPACK_LIBRARY}" CACHE STRING "" FORCE) + set(lib_prop IMPORTED_LOCATION) + #if(@VCPKG_LIBRARY_LINKAGE@ STREQUAL "dynamic" AND WIN32) + # set(lib_prop IMPORTED_IMPLIB) + #endif() -set(LAPACK_LIBRARY "${LAPACK_LIBRARY}" CACHE STRING "" FORCE) -set(F2C_LIBRARY "${F2C_LIBRARY}" CACHE STRING "" FORCE) -set(LAPACK_LIBRARY_RELEASE "${LAPACK_LIBRARY_RELEASE}" CACHE STRING "" FORCE) -set(LAPACK_LIBRARY_DEBUG "${LAPACK_LIBRARY_DEBUG}" CACHE STRING "" FORCE) -set(F2C_LIBRARY_RELEASE "${F2C_LIBRARY_RELEASE}" CACHE STRING "" FORCE) -set(F2C_LIBRARY_DEBUG "${F2C_LIBRARY_DEBUG}" CACHE STRING "" FORCE) + get_property(LAPACK_LIBRARY_RELEASE TARGET lapack PROPERTY ${lib_prop}_RELEASE) + get_property(LAPACK_LIBRARY_DEBUG TARGET lapack PROPERTY ${lib_prop}_DEBUG) -find_package_handle_standard_args(LAPACK DEFAULT_MSG LAPACK_LIBRARY LAPACK_INCLUDE_DIR) -mark_as_advanced(LAPACK_INCLUDE_DIR LAPACK_LIBRARY) + get_property(LAPACK_INCLUDE_DIR TARGET lapack PROPERTY INTERFACE_INCLUDE_DIRECTORIES) # Doesn't make much sense but ok. + select_library_configurations(LAPACK) -#TARGETS -if(CLAPACK_FOUND AND NOT TARGET clapack::clapack) - if(EXISTS "${LAPACK_LIBRARY_RELEASE_DLL}") - add_library(clapack::clapack SHARED IMPORTED) - set_target_properties(clapack::clapack PROPERTIES - IMPORTED_LOCATION_RELEASE "${LAPACK_LIBRARY_RELEASE_DLL}" - IMPORTED_IMPLIB_RELEASE "${oLAPACK_LIBRARY_RELEASE}" - INTERFACE_INCLUDE_DIRECTORIES "${LAPACK_INCLUDE_DIR}" - INTERFACE_LINK_LIBRARIES "$<$>:${oF2C_LIBRARY_RELEASE}>;$<$:${oF2C_LIBRARY_DEBUG}>;$<$>:${LAPACK_BLAS_LIBRARY_RELEASE}>;$<$:${LAPACK_BLAS_LIBRARY_DEBUG}>;$;$" - IMPORTED_CONFIGURATIONS Release - IMPORTED_LINK_INTERFACE_LANGUAGES "C") - if(EXISTS "${LAPACK_LIBRARY_DEBUG_DLL}") - set_property(TARGET clapack::clapack APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug) - set_target_properties(clapack::clapack PROPERTIES - IMPORTED_LOCATION_DEBUG "${LAPACK_LIBRARY_DEBUG_DLL}" - IMPORTED_IMPLIB_DEBUG "${oLAPACK_LIBRARY_DEBUG}") - endif() - else() - add_library(clapack::clapack UNKNOWN IMPORTED) - set_target_properties(clapack::clapack PROPERTIES - IMPORTED_LOCATION_RELEASE "${oLAPACK_LIBRARY_RELEASE}" - INTERFACE_INCLUDE_DIRECTORIES "${LAPACK_INCLUDE_DIR}" - INTERFACE_LINK_LIBRARIES "$<$>:${oF2C_LIBRARY_RELEASE}>;$<$:${oF2C_LIBRARY_DEBUG}>;$<$>:${LAPACK_BLAS_LIBRARY_RELEASE}>;$<$:${LAPACK_BLAS_LIBRARY_DEBUG}>;$;$" - IMPORTED_CONFIGURATIONS Release - IMPORTED_LINK_INTERFACE_LANGUAGES "C") - if(EXISTS "${LAPACK_LIBRARY_DEBUG}") - set_property(TARGET clapack::clapack APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug) - set_target_properties(clapack::clapack PROPERTIES - IMPORTED_LOCATION_DEBUG "${oLAPACK_LIBRARY_DEBUG}") - endif() - endif() -endif() - -# Ensure consistency with both CMake's vanilla as well as lapack-reference's FindLAPACK.cmake module and register the LAPACK::LAPACK target -if(CLAPACK_FOUND AND NOT TARGET LAPACK::LAPACK) - if(EXISTS "${LAPACK_LIBRARY_RELEASE_DLL}") - add_library(LAPACK::LAPACK SHARED IMPORTED) - set_target_properties(LAPACK::LAPACK PROPERTIES - IMPORTED_LOCATION_RELEASE "${LAPACK_LIBRARY_RELEASE_DLL}" - IMPORTED_IMPLIB_RELEASE "${oLAPACK_LIBRARY_RELEASE}" - INTERFACE_INCLUDE_DIRECTORIES "${LAPACK_INCLUDE_DIR}" - INTERFACE_LINK_LIBRARIES "$<$>:${oF2C_LIBRARY_RELEASE}>;$<$:${oF2C_LIBRARY_DEBUG}>;$<$>:${LAPACK_BLAS_LIBRARY_RELEASE}>;$<$:${LAPACK_BLAS_LIBRARY_DEBUG}>;$;$" - IMPORTED_CONFIGURATIONS Release - IMPORTED_LINK_INTERFACE_LANGUAGES "C") - if(EXISTS "${LAPACK_LIBRARY_DEBUG_DLL}") - set_property(TARGET LAPACK::LAPACK APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug) - set_target_properties(LAPACK::LAPACK PROPERTIES - IMPORTED_LOCATION_DEBUG "${LAPACK_LIBRARY_DEBUG_DLL}" - IMPORTED_IMPLIB_DEBUG "${oLAPACK_LIBRARY_DEBUG}") - endif() - else() - add_library(LAPACK::LAPACK UNKNOWN IMPORTED) - set_target_properties(LAPACK::LAPACK PROPERTIES - IMPORTED_LOCATION_RELEASE "${oLAPACK_LIBRARY_RELEASE}" - INTERFACE_INCLUDE_DIRECTORIES "${LAPACK_INCLUDE_DIR}" - IMPORTED_CONFIGURATIONS Release - INTERFACE_LINK_LIBRARIES "$<$>:${oF2C_LIBRARY_RELEASE}>;$<$:${oF2C_LIBRARY_DEBUG}>;$<$>:${LAPACK_BLAS_LIBRARY_RELEASE}>;$<$:${LAPACK_BLAS_LIBRARY_DEBUG}>;$;$" - IMPORTED_LINK_INTERFACE_LANGUAGES "C") - if(EXISTS "${LAPACK_LIBRARY_DEBUG}") - set_property(TARGET LAPACK::LAPACK APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug) - set_target_properties(LAPACK::LAPACK PROPERTIES - IMPORTED_LOCATION_DEBUG "${oLAPACK_LIBRARY_DEBUG}") - endif() - endif() -endif() + get_property(LAPACK_LINKER_FLAGS_RELEASE TARGET lapack PROPERTY IMPORTED_LINK_INTERFACE_LIBRARIES_RELEASE) + get_property(LAPACK_LINKER_FLAGS_DEBUG TARGET lapack PROPERTY IMPORTED_LINK_INTERFACE_LIBRARIES_DEBUG) -# Preserve backwards compatibility and also register the 'lapack' target -if(CLAPACK_FOUND AND NOT TARGET lapack) - add_library(lapack INTERFACE IMPORTED) - target_link_libraries(lapack INTERFACE LAPACK::LAPACK) + set(LAPACK_LIBRARIES "${LAPACK_LIBRARIES};$<$:${IMPORTED_LINK_INTERFACE_LIBRARIES_DEBUG}>;$<$>:${IMPORTED_LINK_INTERFACE_LIBRARIES_RELEASE}>") + set(LAPACK95_LIBRARIES "${LAPACK_LIBRARIES}") + set(LAPACK95_FOUND "TRUE") + set(LAPACK_LINKER_FLAGS "${LAPACK_LIBRARIES}") endif() +find_package_handle_standard_args(LAPACK DEFAULT_MSG LAPACK_LIBRARY LAPACK_INCLUDE_DIR ) +mark_as_advanced(LAPACK_INCLUDE_DIR LAPACK_LIBRARY) \ No newline at end of file From 9759dd20dabdda69b6251ab9aa272ca15d22503b Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 22 Apr 2022 13:20:53 +0200 Subject: [PATCH 010/131] no find_dependency in modules! --- ports/clapack/FindLAPACK.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/clapack/FindLAPACK.cmake b/ports/clapack/FindLAPACK.cmake index b98847adf83660..25e363af5fe270 100644 --- a/ports/clapack/FindLAPACK.cmake +++ b/ports/clapack/FindLAPACK.cmake @@ -12,7 +12,7 @@ include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake) set(CLAPACK_VERSION "3.2.1") set(LAPACK_VERSION "${CLAPACK_VERSION}") #set(CMAKE_THREAD_PREFER_PTHREAD TRUE) -find_dependency(Threads) +find_package(Threads) find_package(clapack CONFIG REQUIRED) # This will be found ! From a8df6e7d64e183c3e459029e320b0d24bcf41303 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 22 Apr 2022 14:24:13 +0200 Subject: [PATCH 011/131] add missing @ONLY --- ports/lapack-reference/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/lapack-reference/portfile.cmake b/ports/lapack-reference/portfile.cmake index abbadcdae9b341..39d60096ef8f2f 100644 --- a/ports/lapack-reference/portfile.cmake +++ b/ports/lapack-reference/portfile.cmake @@ -145,5 +145,5 @@ else() endif() set(BLA_VENDOR Generic) -configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake") +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) file(COPY "${CMAKE_CURRENT_LIST_DIR}/FindLAPACK.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") From 1e1819cced9e86ded7de7f78bb3d16e1d703d0f8 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 22 Apr 2022 16:43:17 +0200 Subject: [PATCH 012/131] move stuff around --- ports/blas-impl/blas.pc.in | 8 ++++ ports/blas-impl/portfile.cmake | 44 +++++++++++++++++++ .../vcpkg-cmake-wrapper.cmake.in | 0 ports/blas-impl/vcpkg.json | 17 +++++++ ports/blas/portfile.cmake | 34 +------------- ports/blas/vcpkg.json | 5 +-- ports/lapack-impl/portfile.cmake | 22 ++++++++++ .../vcpkg-cmake-wrapper.cmake.in | 0 ports/lapack-impl/vcpkg.json | 21 +++++++++ ports/lapack-reference/portfile.cmake | 27 +++--------- ports/lapack/portfile.cmake | 23 +--------- ports/lapack/vcpkg.json | 9 +--- 12 files changed, 123 insertions(+), 87 deletions(-) create mode 100644 ports/blas-impl/blas.pc.in create mode 100644 ports/blas-impl/portfile.cmake rename ports/{blas => blas-impl}/vcpkg-cmake-wrapper.cmake.in (100%) create mode 100644 ports/blas-impl/vcpkg.json create mode 100644 ports/lapack-impl/portfile.cmake rename ports/{lapack => lapack-impl}/vcpkg-cmake-wrapper.cmake.in (100%) create mode 100644 ports/lapack-impl/vcpkg.json diff --git a/ports/blas-impl/blas.pc.in b/ports/blas-impl/blas.pc.in new file mode 100644 index 00000000000000..49f7f103dc1420 --- /dev/null +++ b/ports/blas-impl/blas.pc.in @@ -0,0 +1,8 @@ +prefix=${pcfiledir}/../.. + +Name: BLAS +Description: Implementation of BLAS +Version: +Requires: @requires@ +Libs: @libs@ +Cflags: @cflags@ diff --git a/ports/blas-impl/portfile.cmake b/ports/blas-impl/portfile.cmake new file mode 100644 index 00000000000000..0e1a537de6b823 --- /dev/null +++ b/ports/blas-impl/portfile.cmake @@ -0,0 +1,44 @@ +SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +# OpenBLAS +if(VCPKG_TARGET_IS_OSX) + set(BLA_VENDOR Apple) + set(requires "") # TODO: figure out the flags required? + set(libs "-framework Accelerate") + set(cflags "-framework Accelerate") +else() + set(BLA_VENDOR OpenBLAS) + set(requires openblas) +endif() + +if(NOT (VCPKG_TARGET_IS_WINDOWS AND VCPKG_CRT_LINKAGE STREQUAL "static")) + configure_file("${CMAKE_CURRENT_LIST_DIR}/blas.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/blas.pc" @ONLY) + if(NOT VCPKG_BUILD_TYPE) + configure_file("${CMAKE_CURRENT_LIST_DIR}/blas.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/blas.pc" @ONLY) + endif() +endif() + +# For possible overlays: + +#NETLIB reference implementation (contained in lapack-reference) +#set(BLA_VENDOR Generic) + +# Intel MKL +#if(VCPKG_TARGET_ARCHITECTURE STREQUAL x64) +# set(BLA_VENDOR Intel10_64lp) +#elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL x86) +# set(BLA_VENDOR Intel10_32) +#else() +# message(FATAL_ERROR "Unsupported target architecture for Intel MKL!") +#endif() + +# Apple Accelerate Framework +# set(BLA_VENDOR Apple) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(BLA_STATIC ON) +else() + set(BLA_STATIC OFF) +endif() + +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/blas/vcpkg-cmake-wrapper.cmake" @ONLY) diff --git a/ports/blas/vcpkg-cmake-wrapper.cmake.in b/ports/blas-impl/vcpkg-cmake-wrapper.cmake.in similarity index 100% rename from ports/blas/vcpkg-cmake-wrapper.cmake.in rename to ports/blas-impl/vcpkg-cmake-wrapper.cmake.in diff --git a/ports/blas-impl/vcpkg.json b/ports/blas-impl/vcpkg.json new file mode 100644 index 00000000000000..5246d26a11002b --- /dev/null +++ b/ports/blas-impl/vcpkg.json @@ -0,0 +1,17 @@ +{ + "$comment": "Keep the platform expressions in sync with the wrappers installed by the portfiles!", + "name": "blas-impl", + "version-date": "2022-04-22", + "description": "Metapackage for packages which provide BLAS", + "license": null, + "dependencies": [ + { + "name": "openblas", + "platform": "!osx | (staticcrt & windows)" + }, + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/ports/blas/portfile.cmake b/ports/blas/portfile.cmake index 73999abc2ea60a..d45bd8906b8b79 100644 --- a/ports/blas/portfile.cmake +++ b/ports/blas/portfile.cmake @@ -1,38 +1,6 @@ SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) -# OpenBLAS -if(VCPKG_TARGET_IS_OSX) - set(BLA_VENDOR Apple) -else() - set(BLA_VENDOR OpenBLAS) -endif() - -# For possible overlays: - -#NETLIB reference implementation (contained in lapack-reference) -#set(BLA_VENDOR Generic) - -# Intel MKL -#if(VCPKG_TARGET_ARCHITECTURE STREQUAL x64) -# set(BLA_VENDOR Intel10_64lp) -#elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL x86) -# set(BLA_VENDOR Intel10_32) -#else() -# message(FATAL_ERROR "Unsupported target architecture for Intel MKL!") -#endif() - -# Apple Accelerate Framework -# set(BLA_VENDOR Apple) - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(BLA_STATIC ON) -else() - set(BLA_STATIC OFF) -endif() - -configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) # Make sure BLAS can be found vcpkg_cmake_configure(SOURCE_PATH "${CURRENT_PORT_DIR}" OPTIONS -DCMAKE_PREFIX_PATH="${CURRENT_PACKAGES_DIR}" - -DBLA_VENDOR=${BLA_VENDOR} - -DBLA_STATIC=${BLA_STATIC}) + ) diff --git a/ports/blas/vcpkg.json b/ports/blas/vcpkg.json index 40861e063fb8a2..8d9792d862e9d7 100644 --- a/ports/blas/vcpkg.json +++ b/ports/blas/vcpkg.json @@ -5,10 +5,7 @@ "description": "Metapackage for packages which provide BLAS", "license": null, "dependencies": [ - { - "name": "openblas", - "platform": "!osx" - }, + "blas-impl", { "name": "vcpkg-cmake", "host": true diff --git a/ports/lapack-impl/portfile.cmake b/ports/lapack-impl/portfile.cmake new file mode 100644 index 00000000000000..8fc00948fa3f3d --- /dev/null +++ b/ports/lapack-impl/portfile.cmake @@ -0,0 +1,22 @@ +SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(BLA_STATIC ON) +else() + set(BLA_STATIC OFF) +endif() + +set(BLA_VENDOR Generic) +set(installed_wrapper "${CURRENT_INSTALLED_DIR}/share/lapack/vcpkg-cmake-wrapper.cmake") +set(installed_module "${CURRENT_INSTALLED_DIR}/share/lapack/FindLAPACK.cmake") +if(VCPKG_TARGET_IS_OSX) + set(BLA_VENDOR Apple) + configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/lapack/vcpkg-cmake-wrapper.cmake" @ONLY) + unset(installed_module) +elseif((VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE MATCHES "arm") OR VCPKG_TARGET_IS_UWP) + configure_file("${CURRENT_INSTALLED_DIR}/share/clapack/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/lapack/vcpkg-cmake-wrapper.cmake" COPYONLY) + configure_file("${CURRENT_INSTALLED_DIR}/share/clapack/FindLAPACK.cmake" "${CURRENT_PACKAGES_DIR}/share/lapack/FindLAPACK.cmake" COPYONLY) +else() + configure_file("${CURRENT_INSTALLED_DIR}/share/lapack-reference/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/lapack/vcpkg-cmake-wrapper.cmake" COPYONLY) + configure_file("${CURRENT_INSTALLED_DIR}/share/lapack-reference/FindLAPACK.cmake" "${CURRENT_PACKAGES_DIR}/share/lapack/FindLAPACK.cmake" COPYONLY) +endif() diff --git a/ports/lapack/vcpkg-cmake-wrapper.cmake.in b/ports/lapack-impl/vcpkg-cmake-wrapper.cmake.in similarity index 100% rename from ports/lapack/vcpkg-cmake-wrapper.cmake.in rename to ports/lapack-impl/vcpkg-cmake-wrapper.cmake.in diff --git a/ports/lapack-impl/vcpkg.json b/ports/lapack-impl/vcpkg.json new file mode 100644 index 00000000000000..ca27c5d887b7f5 --- /dev/null +++ b/ports/lapack-impl/vcpkg.json @@ -0,0 +1,21 @@ +{ + "$comment": "Keep the platform expressions in sync with the wrappers installed by the portfiles!", + "name": "lapack-impl", + "version-date": "2022-02-22", + "description": "Metapackage for packages which provide LAPACK", + "license": null, + "dependencies": [ + { + "name": "clapack", + "platform": "(arm & windows) | uwp" + }, + { + "name": "lapack-reference", + "platform": "!((arm & windows) | uwp | osx)" + }, + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/ports/lapack-reference/portfile.cmake b/ports/lapack-reference/portfile.cmake index 39d60096ef8f2f..59ea46a8619a37 100644 --- a/ports/lapack-reference/portfile.cmake +++ b/ports/lapack-reference/portfile.cmake @@ -36,14 +36,6 @@ endif() set(USE_OPTIMIZED_BLAS OFF) if("noblas" IN_LIST FEATURES) set(USE_OPTIMIZED_BLAS ON) - set(pcfile "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/openblas.pc") - if(EXISTS "${pcfile}") - file(CREATE_LINK "${pcfile}" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/blas.pc" COPY_ON_ERROR) - endif() - set(pcfile "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/openblas.pc") - if(EXISTS "${pcfile}") - file(CREATE_LINK "${pcfile}" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/blas.pc" COPY_ON_ERROR) - endif() endif() set(VCPKG_CRT_LINKAGE_BACKUP ${VCPKG_CRT_LINKAGE}) @@ -76,41 +68,36 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME lapack-${lapack_ver} CONFIG_PATH lib/cmake set(pcfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/lapack.pc") if(EXISTS "${pcfile}") file(READ "${pcfile}" _contents) - set(_contents "prefix=${CURRENT_INSTALLED_DIR}\n${_contents}") - file(WRITE "${pcfile}" "${_contents}") + file(WRITE "${pcfile}" "prefix=${CURRENT_INSTALLED_DIR}\n${_contents}") endif() set(pcfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/lapack.pc") if(EXISTS "${pcfile}") file(READ "${pcfile}" _contents) - set(_contents "prefix=${CURRENT_INSTALLED_DIR}/debug\n${_contents}") - file(WRITE "${pcfile}" "${_contents}") + file(WRITE "${pcfile}" "prefix=${CURRENT_INSTALLED_DIR}/debug\n${_contents}") endif() + if(NOT USE_OPTIMIZED_BLAS AND NOT (VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")) set(pcfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/blas.pc") if(EXISTS "${pcfile}") file(READ "${pcfile}" _contents) - set(_contents "prefix=${CURRENT_INSTALLED_DIR}\n${_contents}") - file(WRITE "${pcfile}" "${_contents}") + file(WRITE "${pcfile}" "prefix=${CURRENT_INSTALLED_DIR}\n${_contents}") endif() set(pcfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/blas.pc") if(EXISTS "${pcfile}") file(READ "${pcfile}" _contents) - set(_contents "prefix=${CURRENT_INSTALLED_DIR}/debug\n${_contents}") - file(WRITE "${pcfile}" "${_contents}") + file(WRITE "${pcfile}" "prefix=${CURRENT_INSTALLED_DIR}/debug\n${_contents}") endif() endif() if("cblas" IN_LIST FEATURES) set(pcfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/cblas.pc") if(EXISTS "${pcfile}") file(READ "${pcfile}" _contents) - set(_contents "prefix=${CURRENT_INSTALLED_DIR}\n${_contents}") - file(WRITE "${pcfile}" "${_contents}") + file(WRITE "${pcfile}" "prefix=${CURRENT_INSTALLED_DIR}\n${_contents}") endif() set(pcfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/cblas.pc") if(EXISTS "${pcfile}") file(READ "${pcfile}" _contents) - set(_contents "prefix=${CURRENT_INSTALLED_DIR}/debug\n${_contents}") - file(WRITE "${pcfile}" "${_contents}") + file(WRITE "${pcfile}" "prefix=${CURRENT_INSTALLED_DIR}/debug\n${_contents}") endif() endif() vcpkg_fixup_pkgconfig() diff --git a/ports/lapack/portfile.cmake b/ports/lapack/portfile.cmake index c3af28b697cf69..37b09592d62865 100644 --- a/ports/lapack/portfile.cmake +++ b/ports/lapack/portfile.cmake @@ -1,27 +1,6 @@ SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(BLA_STATIC ON) -else() - set(BLA_STATIC OFF) -endif() - -set(BLA_VENDOR Generic) -if(VCPKG_TARGET_IS_OSX) - set(BLA_VENDOR Apple) - configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/lapack/vcpkg-cmake-wrapper.cmake" @ONLY) -elseif((VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE MATCHES "arm") OR VCPKG_TARGET_IS_UWP) - configure_file("${CURRENT_INSTALLED_DIR}/share/clapack/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/lapack/vcpkg-cmake-wrapper.cmake" COPYONLY) - configure_file("${CURRENT_INSTALLED_DIR}/share/clapack/FindLAPACK.cmake" "${CURRENT_PACKAGES_DIR}/share/lapack/FindLAPACK.cmake" COPYONLY) -else() - configure_file("${CURRENT_INSTALLED_DIR}/share/lapack-reference/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/lapack/vcpkg-cmake-wrapper.cmake" COPYONLY) - configure_file("${CURRENT_INSTALLED_DIR}/share/lapack-reference/FindLAPACK.cmake" "${CURRENT_PACKAGES_DIR}/share/lapack/FindLAPACK.cmake" COPYONLY) -endif() - # Make sure LAPACK can be found vcpkg_cmake_configure(SOURCE_PATH "${CURRENT_PORT_DIR}" OPTIONS -DCMAKE_PREFIX_PATH="${CURRENT_PACKAGES_DIR}" - -DCMAKE_MODULE_PATH="${CURRENT_PACKAGES_DIR}/share/lapack" - -DBLA_VENDOR="${BLA_VENDOR}" - -DBLA_STATIC="${BLA_STATIC}") - + -DCMAKE_MODULE_PATH="${CURRENT_PACKAGES_DIR}/share/lapack") diff --git a/ports/lapack/vcpkg.json b/ports/lapack/vcpkg.json index 8a26a743e98a27..4c972d1b72df34 100644 --- a/ports/lapack/vcpkg.json +++ b/ports/lapack/vcpkg.json @@ -5,14 +5,7 @@ "description": "Metapackage for packages which provide LAPACK", "license": null, "dependencies": [ - { - "name": "clapack", - "platform": "(arm & windows) | uwp" - }, - { - "name": "lapack-reference", - "platform": "!((arm & windows) | uwp)" - }, + "lapack-impl", { "name": "vcpkg-cmake", "host": true From 63b429da1970e2ceb07e050b44a3dfb42a8370d0 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 22 Apr 2022 16:58:45 +0200 Subject: [PATCH 013/131] fix platform expr --- ports/blas-impl/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/blas-impl/vcpkg.json b/ports/blas-impl/vcpkg.json index 5246d26a11002b..a61d4b459ad3f9 100644 --- a/ports/blas-impl/vcpkg.json +++ b/ports/blas-impl/vcpkg.json @@ -7,7 +7,7 @@ "dependencies": [ { "name": "openblas", - "platform": "!osx | (staticcrt & windows)" + "platform": "!osx | (static & windows)" }, { "name": "vcpkg-cmake", From dc751ce07b2234f6320333dd4e47db85d29d99cb Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 22 Apr 2022 17:08:43 +0200 Subject: [PATCH 014/131] be consistent as the comment says --- ports/blas-impl/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/blas-impl/portfile.cmake b/ports/blas-impl/portfile.cmake index 0e1a537de6b823..c1574a28f3981b 100644 --- a/ports/blas-impl/portfile.cmake +++ b/ports/blas-impl/portfile.cmake @@ -11,7 +11,7 @@ else() set(requires openblas) endif() -if(NOT (VCPKG_TARGET_IS_WINDOWS AND VCPKG_CRT_LINKAGE STREQUAL "static")) +if(NOT (VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")) configure_file("${CMAKE_CURRENT_LIST_DIR}/blas.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/blas.pc" @ONLY) if(NOT VCPKG_BUILD_TYPE) configure_file("${CMAKE_CURRENT_LIST_DIR}/blas.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/blas.pc" @ONLY) From 677cb689f13548b3f75ff6cd076e14c7e3dd6f24 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 22 Apr 2022 23:20:53 +0200 Subject: [PATCH 015/131] rename test ports with -test rename -impl ports to old name move -test ports into script/test_ports --- ports/blas-impl/portfile.cmake | 44 ------------------ ports/{blas-impl => blas}/blas.pc.in | 0 ports/blas/portfile.cmake | 46 +++++++++++++++++-- .../vcpkg-cmake-wrapper.cmake.in | 0 ports/blas/vcpkg.json | 5 +- ports/lapack-impl/portfile.cmake | 22 --------- ports/lapack/portfile.cmake | 24 ++++++++-- .../vcpkg-cmake-wrapper.cmake.in | 0 ports/lapack/vcpkg.json | 9 +++- .../test_ports/blas-test}/CMakeLists.txt | 0 scripts/test_ports/blas-test/portfile.cmake | 6 +++ .../test_ports/blas-test}/vcpkg.json | 7 +-- .../test_ports/lapack-test}/CMakeLists.txt | 0 scripts/test_ports/lapack-test/portfile.cmake | 6 +++ .../test_ports/lapack-test}/vcpkg.json | 11 +---- 15 files changed, 90 insertions(+), 90 deletions(-) delete mode 100644 ports/blas-impl/portfile.cmake rename ports/{blas-impl => blas}/blas.pc.in (100%) rename ports/{blas-impl => blas}/vcpkg-cmake-wrapper.cmake.in (100%) delete mode 100644 ports/lapack-impl/portfile.cmake rename ports/{lapack-impl => lapack}/vcpkg-cmake-wrapper.cmake.in (100%) rename {ports/blas => scripts/test_ports/blas-test}/CMakeLists.txt (100%) create mode 100644 scripts/test_ports/blas-test/portfile.cmake rename {ports/blas-impl => scripts/test_ports/blas-test}/vcpkg.json (73%) rename {ports/lapack => scripts/test_ports/lapack-test}/CMakeLists.txt (100%) create mode 100644 scripts/test_ports/lapack-test/portfile.cmake rename {ports/lapack-impl => scripts/test_ports/lapack-test}/vcpkg.json (60%) diff --git a/ports/blas-impl/portfile.cmake b/ports/blas-impl/portfile.cmake deleted file mode 100644 index c1574a28f3981b..00000000000000 --- a/ports/blas-impl/portfile.cmake +++ /dev/null @@ -1,44 +0,0 @@ -SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) - -# OpenBLAS -if(VCPKG_TARGET_IS_OSX) - set(BLA_VENDOR Apple) - set(requires "") # TODO: figure out the flags required? - set(libs "-framework Accelerate") - set(cflags "-framework Accelerate") -else() - set(BLA_VENDOR OpenBLAS) - set(requires openblas) -endif() - -if(NOT (VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")) - configure_file("${CMAKE_CURRENT_LIST_DIR}/blas.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/blas.pc" @ONLY) - if(NOT VCPKG_BUILD_TYPE) - configure_file("${CMAKE_CURRENT_LIST_DIR}/blas.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/blas.pc" @ONLY) - endif() -endif() - -# For possible overlays: - -#NETLIB reference implementation (contained in lapack-reference) -#set(BLA_VENDOR Generic) - -# Intel MKL -#if(VCPKG_TARGET_ARCHITECTURE STREQUAL x64) -# set(BLA_VENDOR Intel10_64lp) -#elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL x86) -# set(BLA_VENDOR Intel10_32) -#else() -# message(FATAL_ERROR "Unsupported target architecture for Intel MKL!") -#endif() - -# Apple Accelerate Framework -# set(BLA_VENDOR Apple) - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(BLA_STATIC ON) -else() - set(BLA_STATIC OFF) -endif() - -configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/blas/vcpkg-cmake-wrapper.cmake" @ONLY) diff --git a/ports/blas-impl/blas.pc.in b/ports/blas/blas.pc.in similarity index 100% rename from ports/blas-impl/blas.pc.in rename to ports/blas/blas.pc.in diff --git a/ports/blas/portfile.cmake b/ports/blas/portfile.cmake index d45bd8906b8b79..c1574a28f3981b 100644 --- a/ports/blas/portfile.cmake +++ b/ports/blas/portfile.cmake @@ -1,6 +1,44 @@ SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) -# Make sure BLAS can be found -vcpkg_cmake_configure(SOURCE_PATH "${CURRENT_PORT_DIR}" - OPTIONS -DCMAKE_PREFIX_PATH="${CURRENT_PACKAGES_DIR}" - ) +# OpenBLAS +if(VCPKG_TARGET_IS_OSX) + set(BLA_VENDOR Apple) + set(requires "") # TODO: figure out the flags required? + set(libs "-framework Accelerate") + set(cflags "-framework Accelerate") +else() + set(BLA_VENDOR OpenBLAS) + set(requires openblas) +endif() + +if(NOT (VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")) + configure_file("${CMAKE_CURRENT_LIST_DIR}/blas.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/blas.pc" @ONLY) + if(NOT VCPKG_BUILD_TYPE) + configure_file("${CMAKE_CURRENT_LIST_DIR}/blas.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/blas.pc" @ONLY) + endif() +endif() + +# For possible overlays: + +#NETLIB reference implementation (contained in lapack-reference) +#set(BLA_VENDOR Generic) + +# Intel MKL +#if(VCPKG_TARGET_ARCHITECTURE STREQUAL x64) +# set(BLA_VENDOR Intel10_64lp) +#elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL x86) +# set(BLA_VENDOR Intel10_32) +#else() +# message(FATAL_ERROR "Unsupported target architecture for Intel MKL!") +#endif() + +# Apple Accelerate Framework +# set(BLA_VENDOR Apple) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(BLA_STATIC ON) +else() + set(BLA_STATIC OFF) +endif() + +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/blas/vcpkg-cmake-wrapper.cmake" @ONLY) diff --git a/ports/blas-impl/vcpkg-cmake-wrapper.cmake.in b/ports/blas/vcpkg-cmake-wrapper.cmake.in similarity index 100% rename from ports/blas-impl/vcpkg-cmake-wrapper.cmake.in rename to ports/blas/vcpkg-cmake-wrapper.cmake.in diff --git a/ports/blas/vcpkg.json b/ports/blas/vcpkg.json index 8d9792d862e9d7..f0b8d2c49f0281 100644 --- a/ports/blas/vcpkg.json +++ b/ports/blas/vcpkg.json @@ -5,7 +5,10 @@ "description": "Metapackage for packages which provide BLAS", "license": null, "dependencies": [ - "blas-impl", + { + "name": "openblas", + "platform": "!osx | (static & windows)" + }, { "name": "vcpkg-cmake", "host": true diff --git a/ports/lapack-impl/portfile.cmake b/ports/lapack-impl/portfile.cmake deleted file mode 100644 index 8fc00948fa3f3d..00000000000000 --- a/ports/lapack-impl/portfile.cmake +++ /dev/null @@ -1,22 +0,0 @@ -SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(BLA_STATIC ON) -else() - set(BLA_STATIC OFF) -endif() - -set(BLA_VENDOR Generic) -set(installed_wrapper "${CURRENT_INSTALLED_DIR}/share/lapack/vcpkg-cmake-wrapper.cmake") -set(installed_module "${CURRENT_INSTALLED_DIR}/share/lapack/FindLAPACK.cmake") -if(VCPKG_TARGET_IS_OSX) - set(BLA_VENDOR Apple) - configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/lapack/vcpkg-cmake-wrapper.cmake" @ONLY) - unset(installed_module) -elseif((VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE MATCHES "arm") OR VCPKG_TARGET_IS_UWP) - configure_file("${CURRENT_INSTALLED_DIR}/share/clapack/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/lapack/vcpkg-cmake-wrapper.cmake" COPYONLY) - configure_file("${CURRENT_INSTALLED_DIR}/share/clapack/FindLAPACK.cmake" "${CURRENT_PACKAGES_DIR}/share/lapack/FindLAPACK.cmake" COPYONLY) -else() - configure_file("${CURRENT_INSTALLED_DIR}/share/lapack-reference/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/lapack/vcpkg-cmake-wrapper.cmake" COPYONLY) - configure_file("${CURRENT_INSTALLED_DIR}/share/lapack-reference/FindLAPACK.cmake" "${CURRENT_PACKAGES_DIR}/share/lapack/FindLAPACK.cmake" COPYONLY) -endif() diff --git a/ports/lapack/portfile.cmake b/ports/lapack/portfile.cmake index 37b09592d62865..8fc00948fa3f3d 100644 --- a/ports/lapack/portfile.cmake +++ b/ports/lapack/portfile.cmake @@ -1,6 +1,22 @@ SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) -# Make sure LAPACK can be found -vcpkg_cmake_configure(SOURCE_PATH "${CURRENT_PORT_DIR}" - OPTIONS -DCMAKE_PREFIX_PATH="${CURRENT_PACKAGES_DIR}" - -DCMAKE_MODULE_PATH="${CURRENT_PACKAGES_DIR}/share/lapack") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(BLA_STATIC ON) +else() + set(BLA_STATIC OFF) +endif() + +set(BLA_VENDOR Generic) +set(installed_wrapper "${CURRENT_INSTALLED_DIR}/share/lapack/vcpkg-cmake-wrapper.cmake") +set(installed_module "${CURRENT_INSTALLED_DIR}/share/lapack/FindLAPACK.cmake") +if(VCPKG_TARGET_IS_OSX) + set(BLA_VENDOR Apple) + configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/lapack/vcpkg-cmake-wrapper.cmake" @ONLY) + unset(installed_module) +elseif((VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE MATCHES "arm") OR VCPKG_TARGET_IS_UWP) + configure_file("${CURRENT_INSTALLED_DIR}/share/clapack/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/lapack/vcpkg-cmake-wrapper.cmake" COPYONLY) + configure_file("${CURRENT_INSTALLED_DIR}/share/clapack/FindLAPACK.cmake" "${CURRENT_PACKAGES_DIR}/share/lapack/FindLAPACK.cmake" COPYONLY) +else() + configure_file("${CURRENT_INSTALLED_DIR}/share/lapack-reference/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/lapack/vcpkg-cmake-wrapper.cmake" COPYONLY) + configure_file("${CURRENT_INSTALLED_DIR}/share/lapack-reference/FindLAPACK.cmake" "${CURRENT_PACKAGES_DIR}/share/lapack/FindLAPACK.cmake" COPYONLY) +endif() diff --git a/ports/lapack-impl/vcpkg-cmake-wrapper.cmake.in b/ports/lapack/vcpkg-cmake-wrapper.cmake.in similarity index 100% rename from ports/lapack-impl/vcpkg-cmake-wrapper.cmake.in rename to ports/lapack/vcpkg-cmake-wrapper.cmake.in diff --git a/ports/lapack/vcpkg.json b/ports/lapack/vcpkg.json index 4c972d1b72df34..5d8921f44b6579 100644 --- a/ports/lapack/vcpkg.json +++ b/ports/lapack/vcpkg.json @@ -5,7 +5,14 @@ "description": "Metapackage for packages which provide LAPACK", "license": null, "dependencies": [ - "lapack-impl", + { + "name": "clapack", + "platform": "(arm & windows) | uwp" + }, + { + "name": "lapack-reference", + "platform": "!((arm & windows) | uwp | osx)" + }, { "name": "vcpkg-cmake", "host": true diff --git a/ports/blas/CMakeLists.txt b/scripts/test_ports/blas-test/CMakeLists.txt similarity index 100% rename from ports/blas/CMakeLists.txt rename to scripts/test_ports/blas-test/CMakeLists.txt diff --git a/scripts/test_ports/blas-test/portfile.cmake b/scripts/test_ports/blas-test/portfile.cmake new file mode 100644 index 00000000000000..d45bd8906b8b79 --- /dev/null +++ b/scripts/test_ports/blas-test/portfile.cmake @@ -0,0 +1,6 @@ +SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +# Make sure BLAS can be found +vcpkg_cmake_configure(SOURCE_PATH "${CURRENT_PORT_DIR}" + OPTIONS -DCMAKE_PREFIX_PATH="${CURRENT_PACKAGES_DIR}" + ) diff --git a/ports/blas-impl/vcpkg.json b/scripts/test_ports/blas-test/vcpkg.json similarity index 73% rename from ports/blas-impl/vcpkg.json rename to scripts/test_ports/blas-test/vcpkg.json index a61d4b459ad3f9..01765640511687 100644 --- a/ports/blas-impl/vcpkg.json +++ b/scripts/test_ports/blas-test/vcpkg.json @@ -1,14 +1,11 @@ { "$comment": "Keep the platform expressions in sync with the wrappers installed by the portfiles!", - "name": "blas-impl", + "name": "blas-test", "version-date": "2022-04-22", "description": "Metapackage for packages which provide BLAS", "license": null, "dependencies": [ - { - "name": "openblas", - "platform": "!osx | (static & windows)" - }, + "blas", { "name": "vcpkg-cmake", "host": true diff --git a/ports/lapack/CMakeLists.txt b/scripts/test_ports/lapack-test/CMakeLists.txt similarity index 100% rename from ports/lapack/CMakeLists.txt rename to scripts/test_ports/lapack-test/CMakeLists.txt diff --git a/scripts/test_ports/lapack-test/portfile.cmake b/scripts/test_ports/lapack-test/portfile.cmake new file mode 100644 index 00000000000000..37b09592d62865 --- /dev/null +++ b/scripts/test_ports/lapack-test/portfile.cmake @@ -0,0 +1,6 @@ +SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +# Make sure LAPACK can be found +vcpkg_cmake_configure(SOURCE_PATH "${CURRENT_PORT_DIR}" + OPTIONS -DCMAKE_PREFIX_PATH="${CURRENT_PACKAGES_DIR}" + -DCMAKE_MODULE_PATH="${CURRENT_PACKAGES_DIR}/share/lapack") diff --git a/ports/lapack-impl/vcpkg.json b/scripts/test_ports/lapack-test/vcpkg.json similarity index 60% rename from ports/lapack-impl/vcpkg.json rename to scripts/test_ports/lapack-test/vcpkg.json index ca27c5d887b7f5..60dcd751d682e4 100644 --- a/ports/lapack-impl/vcpkg.json +++ b/scripts/test_ports/lapack-test/vcpkg.json @@ -1,18 +1,11 @@ { "$comment": "Keep the platform expressions in sync with the wrappers installed by the portfiles!", - "name": "lapack-impl", + "name": "lapack-test", "version-date": "2022-02-22", "description": "Metapackage for packages which provide LAPACK", "license": null, "dependencies": [ - { - "name": "clapack", - "platform": "(arm & windows) | uwp" - }, - { - "name": "lapack-reference", - "platform": "!((arm & windows) | uwp | osx)" - }, + "lapack", { "name": "vcpkg-cmake", "host": true From 5fe252b99b2a404c20eaf81b365039c4a5d02853 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 22 Apr 2022 23:39:59 +0200 Subject: [PATCH 016/131] use version-string to define blas impl. --- ports/blas/portfile.cmake | 75 ++++++++++++++++++++----------------- ports/blas/vcpkg.json | 2 +- ports/lapack/portfile.cmake | 43 +++++++++++---------- ports/lapack/vcpkg.json | 2 +- 4 files changed, 66 insertions(+), 56 deletions(-) diff --git a/ports/blas/portfile.cmake b/ports/blas/portfile.cmake index c1574a28f3981b..18300f6b7c3530 100644 --- a/ports/blas/portfile.cmake +++ b/ports/blas/portfile.cmake @@ -1,44 +1,49 @@ SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) -# OpenBLAS -if(VCPKG_TARGET_IS_OSX) - set(BLA_VENDOR Apple) - set(requires "") # TODO: figure out the flags required? - set(libs "-framework Accelerate") - set(cflags "-framework Accelerate") -else() - set(BLA_VENDOR OpenBLAS) - set(requires openblas) -endif() - -if(NOT (VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")) - configure_file("${CMAKE_CURRENT_LIST_DIR}/blas.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/blas.pc" @ONLY) - if(NOT VCPKG_BUILD_TYPE) - configure_file("${CMAKE_CURRENT_LIST_DIR}/blas.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/blas.pc" @ONLY) +file(READ "${CURRENT_PORT_DIR}/vcpkg.json" manifest_contents) +string(JSON ver_str GET "${manifest_contents}" version-string) + +if(ver_str STREQUAL "default") + # OpenBLAS + if(VCPKG_TARGET_IS_OSX) + set(BLA_VENDOR Apple) + set(requires "") # TODO: figure out the flags required? + set(libs "-framework Accelerate") + set(cflags "-framework Accelerate") + else() + set(BLA_VENDOR OpenBLAS) + set(requires openblas) endif() -endif() -# For possible overlays: + if(NOT (VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")) + configure_file("${CMAKE_CURRENT_LIST_DIR}/blas.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/blas.pc" @ONLY) + if(NOT VCPKG_BUILD_TYPE) + configure_file("${CMAKE_CURRENT_LIST_DIR}/blas.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/blas.pc" @ONLY) + endif() + endif() + + # For possible overlays: -#NETLIB reference implementation (contained in lapack-reference) -#set(BLA_VENDOR Generic) + #NETLIB reference implementation (contained in lapack-reference) + #set(BLA_VENDOR Generic) -# Intel MKL -#if(VCPKG_TARGET_ARCHITECTURE STREQUAL x64) -# set(BLA_VENDOR Intel10_64lp) -#elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL x86) -# set(BLA_VENDOR Intel10_32) -#else() -# message(FATAL_ERROR "Unsupported target architecture for Intel MKL!") -#endif() + # Intel MKL + #if(VCPKG_TARGET_ARCHITECTURE STREQUAL x64) + # set(BLA_VENDOR Intel10_64lp) + #elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL x86) + # set(BLA_VENDOR Intel10_32) + #else() + # message(FATAL_ERROR "Unsupported target architecture for Intel MKL!") + #endif() -# Apple Accelerate Framework -# set(BLA_VENDOR Apple) + # Apple Accelerate Framework + # set(BLA_VENDOR Apple) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(BLA_STATIC ON) -else() - set(BLA_STATIC OFF) -endif() + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(BLA_STATIC ON) + else() + set(BLA_STATIC OFF) + endif() -configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/blas/vcpkg-cmake-wrapper.cmake" @ONLY) + configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/blas/vcpkg-cmake-wrapper.cmake" @ONLY) +endif() \ No newline at end of file diff --git a/ports/blas/vcpkg.json b/ports/blas/vcpkg.json index f0b8d2c49f0281..6dd5232201bd33 100644 --- a/ports/blas/vcpkg.json +++ b/ports/blas/vcpkg.json @@ -1,7 +1,7 @@ { "$comment": "Keep the platform expressions in sync with the wrappers installed by the portfiles!", "name": "blas", - "version-date": "2022-04-22", + "version-string": "default", "description": "Metapackage for packages which provide BLAS", "license": null, "dependencies": [ diff --git a/ports/lapack/portfile.cmake b/ports/lapack/portfile.cmake index 8fc00948fa3f3d..113af12d929ccb 100644 --- a/ports/lapack/portfile.cmake +++ b/ports/lapack/portfile.cmake @@ -1,22 +1,27 @@ SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(BLA_STATIC ON) -else() - set(BLA_STATIC OFF) -endif() +file(READ "${CURRENT_PORT_DIR}/vcpkg.json" manifest_contents) +string(JSON ver_str GET "${manifest_contents}" version-string) -set(BLA_VENDOR Generic) -set(installed_wrapper "${CURRENT_INSTALLED_DIR}/share/lapack/vcpkg-cmake-wrapper.cmake") -set(installed_module "${CURRENT_INSTALLED_DIR}/share/lapack/FindLAPACK.cmake") -if(VCPKG_TARGET_IS_OSX) - set(BLA_VENDOR Apple) - configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/lapack/vcpkg-cmake-wrapper.cmake" @ONLY) - unset(installed_module) -elseif((VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE MATCHES "arm") OR VCPKG_TARGET_IS_UWP) - configure_file("${CURRENT_INSTALLED_DIR}/share/clapack/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/lapack/vcpkg-cmake-wrapper.cmake" COPYONLY) - configure_file("${CURRENT_INSTALLED_DIR}/share/clapack/FindLAPACK.cmake" "${CURRENT_PACKAGES_DIR}/share/lapack/FindLAPACK.cmake" COPYONLY) -else() - configure_file("${CURRENT_INSTALLED_DIR}/share/lapack-reference/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/lapack/vcpkg-cmake-wrapper.cmake" COPYONLY) - configure_file("${CURRENT_INSTALLED_DIR}/share/lapack-reference/FindLAPACK.cmake" "${CURRENT_PACKAGES_DIR}/share/lapack/FindLAPACK.cmake" COPYONLY) -endif() +if(ver_str STREQUAL "default") + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(BLA_STATIC ON) + else() + set(BLA_STATIC OFF) + endif() + + set(BLA_VENDOR Generic) + set(installed_wrapper "${CURRENT_INSTALLED_DIR}/share/lapack/vcpkg-cmake-wrapper.cmake") + set(installed_module "${CURRENT_INSTALLED_DIR}/share/lapack/FindLAPACK.cmake") + if(VCPKG_TARGET_IS_OSX) + set(BLA_VENDOR Apple) + configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/lapack/vcpkg-cmake-wrapper.cmake" @ONLY) + unset(installed_module) + elseif((VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE MATCHES "arm") OR VCPKG_TARGET_IS_UWP) + configure_file("${CURRENT_INSTALLED_DIR}/share/clapack/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/lapack/vcpkg-cmake-wrapper.cmake" COPYONLY) + configure_file("${CURRENT_INSTALLED_DIR}/share/clapack/FindLAPACK.cmake" "${CURRENT_PACKAGES_DIR}/share/lapack/FindLAPACK.cmake" COPYONLY) + else() + configure_file("${CURRENT_INSTALLED_DIR}/share/lapack-reference/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/lapack/vcpkg-cmake-wrapper.cmake" COPYONLY) + configure_file("${CURRENT_INSTALLED_DIR}/share/lapack-reference/FindLAPACK.cmake" "${CURRENT_PACKAGES_DIR}/share/lapack/FindLAPACK.cmake" COPYONLY) + endif() +endif() \ No newline at end of file diff --git a/ports/lapack/vcpkg.json b/ports/lapack/vcpkg.json index 5d8921f44b6579..3446f3b57349e0 100644 --- a/ports/lapack/vcpkg.json +++ b/ports/lapack/vcpkg.json @@ -1,7 +1,7 @@ { "$comment": "Keep the platform expressions in sync with the wrappers installed by the portfiles!", "name": "lapack", - "version-date": "2022-02-22", + "version-string": "default", "description": "Metapackage for packages which provide LAPACK", "license": null, "dependencies": [ From 272a28cb810d3f9b2a4ecd72e7e319825fb3f0cc Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 22 Apr 2022 23:42:36 +0200 Subject: [PATCH 017/131] add version stuff --- versions/b-/blas.json | 5 +++++ versions/baseline.json | 12 ++++++------ versions/c-/clapack.json | 5 +++++ versions/l-/lapack-reference.json | 5 +++++ versions/l-/lapack.json | 5 +++++ versions/o-/openblas.json | 5 +++++ 6 files changed, 31 insertions(+), 6 deletions(-) diff --git a/versions/b-/blas.json b/versions/b-/blas.json index c8b3ade64a24bc..3aeac030d9f12a 100644 --- a/versions/b-/blas.json +++ b/versions/b-/blas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "43f1fce5e91c782e5a75cce19f6ba7cc9be6e9ec", + "version-string": "default", + "port-version": 0 + }, { "git-tree": "0d105be9337f4a6f294a7eced2da18e8cdb99051", "version-string": "1", diff --git a/versions/baseline.json b/versions/baseline.json index 053f8a940803ea..c7847eb87e90fd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -489,8 +489,8 @@ "port-version": 0 }, "blas": { - "baseline": "1", - "port-version": 1 + "baseline": "default", + "port-version": 0 }, "blaze": { "baseline": "3.8", @@ -1390,7 +1390,7 @@ }, "clapack": { "baseline": "3.2.1", - "port-version": 20 + "port-version": 21 }, "clara": { "baseline": "1.1.5", @@ -3317,12 +3317,12 @@ "port-version": 0 }, "lapack": { - "baseline": "2022-02-22", + "baseline": "default", "port-version": 0 }, "lapack-reference": { "baseline": "3.10.0", - "port-version": 0 + "port-version": 1 }, "lastools": { "baseline": "2020-05-09", @@ -5050,7 +5050,7 @@ }, "openblas": { "baseline": "0.3.19", - "port-version": 0 + "port-version": 1 }, "opencascade": { "baseline": "7.6.0", diff --git a/versions/c-/clapack.json b/versions/c-/clapack.json index 421ccf45a63691..397fbc55e8fa3e 100644 --- a/versions/c-/clapack.json +++ b/versions/c-/clapack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "53ec27c8e5305579c6447950fb127e79cab4e214", + "version": "3.2.1", + "port-version": 21 + }, { "git-tree": "2fd47cedfcd13b7c3a339c7acf4b89c14caea8d5", "version": "3.2.1", diff --git a/versions/l-/lapack-reference.json b/versions/l-/lapack-reference.json index 999e4f135ff049..1ff0f84c9ed4fb 100644 --- a/versions/l-/lapack-reference.json +++ b/versions/l-/lapack-reference.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "da59cc546e4177caca786c3fcec9344c5cb6ad71", + "version": "3.10.0", + "port-version": 1 + }, { "git-tree": "14b5e3ab7315ce36951f759c6254712ed41cc0af", "version": "3.10.0", diff --git a/versions/l-/lapack.json b/versions/l-/lapack.json index 5803b592258a71..c349379898c57c 100644 --- a/versions/l-/lapack.json +++ b/versions/l-/lapack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b5e4901fcfb82f012faf9106ef45df4f534c4fdc", + "version-string": "default", + "port-version": 0 + }, { "git-tree": "3a9c5b51e3480db058719db223df981e0e679819", "version-date": "2022-02-22", diff --git a/versions/o-/openblas.json b/versions/o-/openblas.json index 0cf8441a75e8b1..4a7a2e22f28ea3 100644 --- a/versions/o-/openblas.json +++ b/versions/o-/openblas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "00e0c4b90559281d9e7838a691ec0985f51f7b18", + "version": "0.3.19", + "port-version": 1 + }, { "git-tree": "631541b0dcf2ea300f96829885d9bc0282d38a65", "version": "0.3.19", From ef7358555510996223f3c1ba592df97bb11d69da Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 4 May 2022 17:22:38 +0200 Subject: [PATCH 018/131] more pc files --- ports/blas/portfile.cmake | 4 +++- ports/lapack/lapack.pc.in | 8 ++++++++ ports/lapack/portfile.cmake | 12 ++++++++++++ ports/openblas/vcpkg.json | 2 +- 4 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 ports/lapack/lapack.pc.in diff --git a/ports/blas/portfile.cmake b/ports/blas/portfile.cmake index 18300f6b7c3530..9a0a11f0f72f91 100644 --- a/ports/blas/portfile.cmake +++ b/ports/blas/portfile.cmake @@ -7,7 +7,7 @@ if(ver_str STREQUAL "default") # OpenBLAS if(VCPKG_TARGET_IS_OSX) set(BLA_VENDOR Apple) - set(requires "") # TODO: figure out the flags required? + set(requires "") set(libs "-framework Accelerate") set(cflags "-framework Accelerate") else() @@ -20,6 +20,8 @@ if(ver_str STREQUAL "default") if(NOT VCPKG_BUILD_TYPE) configure_file("${CMAKE_CURRENT_LIST_DIR}/blas.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/blas.pc" @ONLY) endif() + else() + set(BLA_VENDOR Generic) endif() # For possible overlays: diff --git a/ports/lapack/lapack.pc.in b/ports/lapack/lapack.pc.in new file mode 100644 index 00000000000000..49f7f103dc1420 --- /dev/null +++ b/ports/lapack/lapack.pc.in @@ -0,0 +1,8 @@ +prefix=${pcfiledir}/../.. + +Name: BLAS +Description: Implementation of BLAS +Version: +Requires: @requires@ +Libs: @libs@ +Cflags: @cflags@ diff --git a/ports/lapack/portfile.cmake b/ports/lapack/portfile.cmake index 113af12d929ccb..35e71b18b815af 100644 --- a/ports/lapack/portfile.cmake +++ b/ports/lapack/portfile.cmake @@ -16,10 +16,22 @@ if(ver_str STREQUAL "default") if(VCPKG_TARGET_IS_OSX) set(BLA_VENDOR Apple) configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/lapack/vcpkg-cmake-wrapper.cmake" @ONLY) + set(libs "-framework Accelerate") + set(cflags "-framework Accelerate") + configure_file("${CMAKE_CURRENT_LIST_DIR}/lapack.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/lapack.pc" COPYONLY) + if(NOT VCPKG_BUILD_TYPE) + configure_file("${CMAKE_CURRENT_LIST_DIR}/lapack.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/lapack.pc" COPYONLY) + endif() unset(installed_module) elseif((VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE MATCHES "arm") OR VCPKG_TARGET_IS_UWP) configure_file("${CURRENT_INSTALLED_DIR}/share/clapack/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/lapack/vcpkg-cmake-wrapper.cmake" COPYONLY) configure_file("${CURRENT_INSTALLED_DIR}/share/clapack/FindLAPACK.cmake" "${CURRENT_PACKAGES_DIR}/share/lapack/FindLAPACK.cmake" COPYONLY) + set(libs "-llapack -llibf2c") + configure_file("${CMAKE_CURRENT_LIST_DIR}/lapack.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/lapack.pc" COPYONLY) + if(NOT VCPKG_BUILD_TYPE) + set(libs "-llapackd -llibf2cd") + configure_file("${CMAKE_CURRENT_LIST_DIR}/lapack.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/lapack.pc" COPYONLY) + endif() else() configure_file("${CURRENT_INSTALLED_DIR}/share/lapack-reference/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/lapack/vcpkg-cmake-wrapper.cmake" COPYONLY) configure_file("${CURRENT_INSTALLED_DIR}/share/lapack-reference/FindLAPACK.cmake" "${CURRENT_PACKAGES_DIR}/share/lapack/FindLAPACK.cmake" COPYONLY) diff --git a/ports/openblas/vcpkg.json b/ports/openblas/vcpkg.json index d7be1f3383ab11..f4439fe3010084 100644 --- a/ports/openblas/vcpkg.json +++ b/ports/openblas/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openblas", "version": "0.3.19", - "port-version": 1, + "port-version": 2, "description": "OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.", "homepage": "https://github.com/xianyi/OpenBLAS", "dependencies": [ From d58573d755098956fb6f73910c3b3bc37f7a399f Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 4 May 2022 17:26:03 +0200 Subject: [PATCH 019/131] version stuff --- versions/b-/blas.json | 2 +- versions/baseline.json | 2 +- versions/l-/lapack.json | 2 +- versions/o-/openblas.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/versions/b-/blas.json b/versions/b-/blas.json index 3aeac030d9f12a..52fe96f34d1876 100644 --- a/versions/b-/blas.json +++ b/versions/b-/blas.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "43f1fce5e91c782e5a75cce19f6ba7cc9be6e9ec", + "git-tree": "01a62ba993a98a0d40cfe1ab63a0dead03fa5a7c", "version-string": "default", "port-version": 0 }, diff --git a/versions/baseline.json b/versions/baseline.json index c45139ba2ff736..ce7557ca3e1834 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5058,7 +5058,7 @@ }, "openblas": { "baseline": "0.3.19", - "port-version": 1 + "port-version": 2 }, "opencascade": { "baseline": "7.6.0", diff --git a/versions/l-/lapack.json b/versions/l-/lapack.json index c349379898c57c..c55cd201d8840a 100644 --- a/versions/l-/lapack.json +++ b/versions/l-/lapack.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "b5e4901fcfb82f012faf9106ef45df4f534c4fdc", + "git-tree": "5fe643fdee00afc8007da2dc2e3ebaa215087179", "version-string": "default", "port-version": 0 }, diff --git a/versions/o-/openblas.json b/versions/o-/openblas.json index 8b7301aa54fd11..5d482680a7e16a 100644 --- a/versions/o-/openblas.json +++ b/versions/o-/openblas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b51b631e388bf2897b79db48a5433250f5586363", + "version": "0.3.19", + "port-version": 2 + }, { "git-tree": "90e2cde7fda025b587d6c41e699c98c263cf41eb", "version": "0.3.19", From 244878ca6bbf993604ca9574565d4f4be93476f2 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 4 May 2022 17:32:24 +0200 Subject: [PATCH 020/131] adjust test to check for pc files. --- scripts/test_ports/blas-test/CMakeLists.txt | 2 ++ scripts/test_ports/blas-test/portfile.cmake | 3 +-- scripts/test_ports/blas-test/vcpkg.json | 5 +++++ scripts/test_ports/lapack-test/CMakeLists.txt | 2 ++ scripts/test_ports/lapack-test/portfile.cmake | 3 +-- scripts/test_ports/lapack-test/vcpkg.json | 5 +++++ 6 files changed, 16 insertions(+), 4 deletions(-) diff --git a/scripts/test_ports/blas-test/CMakeLists.txt b/scripts/test_ports/blas-test/CMakeLists.txt index 790f79e8baa70e..d05bda7b2b93b7 100644 --- a/scripts/test_ports/blas-test/CMakeLists.txt +++ b/scripts/test_ports/blas-test/CMakeLists.txt @@ -2,3 +2,5 @@ cmake_minimum_required(VERSION 3.17) project(Find_BLAS_external) find_package(BLAS REQUIRED) +find_package(PkgConfig REQUIRED) +pkg_check_modules(BLAS_PC REQUIRED IMPORTED_TARGET blas) diff --git a/scripts/test_ports/blas-test/portfile.cmake b/scripts/test_ports/blas-test/portfile.cmake index d45bd8906b8b79..fa2d43072ae1c0 100644 --- a/scripts/test_ports/blas-test/portfile.cmake +++ b/scripts/test_ports/blas-test/portfile.cmake @@ -2,5 +2,4 @@ SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) # Make sure BLAS can be found vcpkg_cmake_configure(SOURCE_PATH "${CURRENT_PORT_DIR}" - OPTIONS -DCMAKE_PREFIX_PATH="${CURRENT_PACKAGES_DIR}" - ) + OPTIONS -DVCPKG_HOST_TRIPLET=${HOST_TRIPLET}) diff --git a/scripts/test_ports/blas-test/vcpkg.json b/scripts/test_ports/blas-test/vcpkg.json index 01765640511687..ab9615c3e9ef07 100644 --- a/scripts/test_ports/blas-test/vcpkg.json +++ b/scripts/test_ports/blas-test/vcpkg.json @@ -6,6 +6,11 @@ "license": null, "dependencies": [ "blas", + { + "name": "pkgconf", + "host": true, + "platform": "windows" + }, { "name": "vcpkg-cmake", "host": true diff --git a/scripts/test_ports/lapack-test/CMakeLists.txt b/scripts/test_ports/lapack-test/CMakeLists.txt index ddd7883b1632eb..8956bba1601930 100644 --- a/scripts/test_ports/lapack-test/CMakeLists.txt +++ b/scripts/test_ports/lapack-test/CMakeLists.txt @@ -2,3 +2,5 @@ cmake_minimum_required(VERSION 3.17) project(Find_LAPACK_external) find_package(LAPACK REQUIRED) +find_package(PkgConfig REQUIRED) +pkg_check_modules(LAPACK_PC REQUIRED IMPORTED_TARGET lapack) diff --git a/scripts/test_ports/lapack-test/portfile.cmake b/scripts/test_ports/lapack-test/portfile.cmake index 37b09592d62865..f1f2b5cdd023b9 100644 --- a/scripts/test_ports/lapack-test/portfile.cmake +++ b/scripts/test_ports/lapack-test/portfile.cmake @@ -2,5 +2,4 @@ SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) # Make sure LAPACK can be found vcpkg_cmake_configure(SOURCE_PATH "${CURRENT_PORT_DIR}" - OPTIONS -DCMAKE_PREFIX_PATH="${CURRENT_PACKAGES_DIR}" - -DCMAKE_MODULE_PATH="${CURRENT_PACKAGES_DIR}/share/lapack") + OPTIONS -DVCPKG_HOST_TRIPLET=${HOST_TRIPLET}) diff --git a/scripts/test_ports/lapack-test/vcpkg.json b/scripts/test_ports/lapack-test/vcpkg.json index 60dcd751d682e4..00c2832d328cf3 100644 --- a/scripts/test_ports/lapack-test/vcpkg.json +++ b/scripts/test_ports/lapack-test/vcpkg.json @@ -6,6 +6,11 @@ "license": null, "dependencies": [ "lapack", + { + "name": "pkgconf", + "host": true, + "platform": "windows" + }, { "name": "vcpkg-cmake", "host": true From 55d4d0935c09e98e8a1fcc4bb7aa2a1b6000f248 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 4 May 2022 17:34:08 +0200 Subject: [PATCH 021/131] revert openblas version --- ports/openblas/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/openblas.json | 5 ----- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ports/openblas/vcpkg.json b/ports/openblas/vcpkg.json index f4439fe3010084..d7be1f3383ab11 100644 --- a/ports/openblas/vcpkg.json +++ b/ports/openblas/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openblas", "version": "0.3.19", - "port-version": 2, + "port-version": 1, "description": "OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.", "homepage": "https://github.com/xianyi/OpenBLAS", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index ce7557ca3e1834..c45139ba2ff736 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5058,7 +5058,7 @@ }, "openblas": { "baseline": "0.3.19", - "port-version": 2 + "port-version": 1 }, "opencascade": { "baseline": "7.6.0", diff --git a/versions/o-/openblas.json b/versions/o-/openblas.json index 5d482680a7e16a..8b7301aa54fd11 100644 --- a/versions/o-/openblas.json +++ b/versions/o-/openblas.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "b51b631e388bf2897b79db48a5433250f5586363", - "version": "0.3.19", - "port-version": 2 - }, { "git-tree": "90e2cde7fda025b587d6c41e699c98c263cf41eb", "version": "0.3.19", From b7c002bb4775919d40f941fe36e16a9f737c5e37 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 4 May 2022 18:08:44 +0200 Subject: [PATCH 022/131] fix copy pasta --- ports/lapack/portfile.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/lapack/portfile.cmake b/ports/lapack/portfile.cmake index 35e71b18b815af..9700d1daa7d36a 100644 --- a/ports/lapack/portfile.cmake +++ b/ports/lapack/portfile.cmake @@ -18,19 +18,19 @@ if(ver_str STREQUAL "default") configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/lapack/vcpkg-cmake-wrapper.cmake" @ONLY) set(libs "-framework Accelerate") set(cflags "-framework Accelerate") - configure_file("${CMAKE_CURRENT_LIST_DIR}/lapack.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/lapack.pc" COPYONLY) + configure_file("${CMAKE_CURRENT_LIST_DIR}/lapack.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/lapack.pc" @ONLY) if(NOT VCPKG_BUILD_TYPE) - configure_file("${CMAKE_CURRENT_LIST_DIR}/lapack.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/lapack.pc" COPYONLY) + configure_file("${CMAKE_CURRENT_LIST_DIR}/lapack.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/lapack.pc" @ONLY) endif() unset(installed_module) elseif((VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE MATCHES "arm") OR VCPKG_TARGET_IS_UWP) configure_file("${CURRENT_INSTALLED_DIR}/share/clapack/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/lapack/vcpkg-cmake-wrapper.cmake" COPYONLY) configure_file("${CURRENT_INSTALLED_DIR}/share/clapack/FindLAPACK.cmake" "${CURRENT_PACKAGES_DIR}/share/lapack/FindLAPACK.cmake" COPYONLY) set(libs "-llapack -llibf2c") - configure_file("${CMAKE_CURRENT_LIST_DIR}/lapack.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/lapack.pc" COPYONLY) + configure_file("${CMAKE_CURRENT_LIST_DIR}/lapack.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/lapack.pc" @ONLY) if(NOT VCPKG_BUILD_TYPE) set(libs "-llapackd -llibf2cd") - configure_file("${CMAKE_CURRENT_LIST_DIR}/lapack.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/lapack.pc" COPYONLY) + configure_file("${CMAKE_CURRENT_LIST_DIR}/lapack.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/lapack.pc" @ONLY) endif() else() configure_file("${CURRENT_INSTALLED_DIR}/share/lapack-reference/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/lapack/vcpkg-cmake-wrapper.cmake" COPYONLY) From d77a77e8ee3f67ba6dc189594c621e8dd799a1d9 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 4 May 2022 21:30:49 +0200 Subject: [PATCH 023/131] fix uwp regression --- ports/clapack/FindLAPACK.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ports/clapack/FindLAPACK.cmake b/ports/clapack/FindLAPACK.cmake index 25e363af5fe270..8516fc78d42052 100644 --- a/ports/clapack/FindLAPACK.cmake +++ b/ports/clapack/FindLAPACK.cmake @@ -37,8 +37,12 @@ if(NOT TARGET LAPACK::LAPACK) get_property(LAPACK_LINKER_FLAGS_RELEASE TARGET lapack PROPERTY IMPORTED_LINK_INTERFACE_LIBRARIES_RELEASE) get_property(LAPACK_LINKER_FLAGS_DEBUG TARGET lapack PROPERTY IMPORTED_LINK_INTERFACE_LIBRARIES_DEBUG) + list(TRANSFORM LAPACK_LINKER_FLAGS_DEBUG PREPEND "$<$:") + list(TRANSFORM LAPACK_LINKER_FLAGS_DEBUG APPEND ">") + list(TRANSFORM LAPACK_LINKER_FLAGS_RELEASE PREPEND "$<$>:") + list(TRANSFORM LAPACK_LINKER_FLAGS_RELEASE APPEND ">") - set(LAPACK_LIBRARIES "${LAPACK_LIBRARIES};$<$:${IMPORTED_LINK_INTERFACE_LIBRARIES_DEBUG}>;$<$>:${IMPORTED_LINK_INTERFACE_LIBRARIES_RELEASE}>") + set(LAPACK_LIBRARIES "${LAPACK_LIBRARIES};${LAPACK_LINKER_FLAGS_DEBUG};${LAPACK_LINKER_FLAGS_RELEASE}") set(LAPACK95_LIBRARIES "${LAPACK_LIBRARIES}") set(LAPACK95_FOUND "TRUE") set(LAPACK_LINKER_FLAGS "${LAPACK_LIBRARIES}") From 989601471012698b6a431605e424046dfb289c97 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 4 May 2022 21:40:56 +0200 Subject: [PATCH 024/131] version stuff --- versions/c-/clapack.json | 2 +- versions/l-/lapack.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/c-/clapack.json b/versions/c-/clapack.json index 397fbc55e8fa3e..33ebd276f8a7b4 100644 --- a/versions/c-/clapack.json +++ b/versions/c-/clapack.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "53ec27c8e5305579c6447950fb127e79cab4e214", + "git-tree": "c6ae90dbc78f251f9a486182d83dc7f15b5c20d8", "version": "3.2.1", "port-version": 21 }, diff --git a/versions/l-/lapack.json b/versions/l-/lapack.json index c55cd201d8840a..60004c2a96f06f 100644 --- a/versions/l-/lapack.json +++ b/versions/l-/lapack.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "5fe643fdee00afc8007da2dc2e3ebaa215087179", + "git-tree": "235ef93dec56035f02e8fdd88fbf34dfc4d2b095", "version-string": "default", "port-version": 0 }, From f0b472cb3d8d7e4c0226b2ad4fb16c46fb1e956d Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 6 Jun 2022 21:18:06 +0200 Subject: [PATCH 025/131] cleanup --- ports/blas/portfile.cmake | 17 ++++++----------- ports/blas/vcpkg.json | 7 ++++++- ports/clapack/portfile.cmake | 3 +-- ports/clapack/vcpkg.json | 2 +- ports/lapack-reference/portfile.cmake | 16 ++++++++++++++-- ports/lapack-reference/vcpkg.json | 3 ++- ports/lapack/lapack.pc.in | 5 +++-- ports/lapack/portfile.cmake | 11 ++++++++--- 8 files changed, 41 insertions(+), 23 deletions(-) diff --git a/ports/blas/portfile.cmake b/ports/blas/portfile.cmake index 9a0a11f0f72f91..c57c1ae9f5f389 100644 --- a/ports/blas/portfile.cmake +++ b/ports/blas/portfile.cmake @@ -10,25 +10,20 @@ if(ver_str STREQUAL "default") set(requires "") set(libs "-framework Accelerate") set(cflags "-framework Accelerate") + elseif(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(BLA_VENDOR Generic) + set(requires "blas-reference") else() set(BLA_VENDOR OpenBLAS) set(requires openblas) endif() - if(NOT (VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")) - configure_file("${CMAKE_CURRENT_LIST_DIR}/blas.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/blas.pc" @ONLY) - if(NOT VCPKG_BUILD_TYPE) - configure_file("${CMAKE_CURRENT_LIST_DIR}/blas.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/blas.pc" @ONLY) - endif() - else() - set(BLA_VENDOR Generic) + configure_file("${CMAKE_CURRENT_LIST_DIR}/blas.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/blas.pc" @ONLY) + if(NOT VCPKG_BUILD_TYPE) + configure_file("${CMAKE_CURRENT_LIST_DIR}/blas.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/blas.pc" @ONLY) endif() - # For possible overlays: - #NETLIB reference implementation (contained in lapack-reference) - #set(BLA_VENDOR Generic) - # Intel MKL #if(VCPKG_TARGET_ARCHITECTURE STREQUAL x64) # set(BLA_VENDOR Intel10_64lp) diff --git a/ports/blas/vcpkg.json b/ports/blas/vcpkg.json index 6dd5232201bd33..f2550e55286024 100644 --- a/ports/blas/vcpkg.json +++ b/ports/blas/vcpkg.json @@ -5,9 +5,14 @@ "description": "Metapackage for packages which provide BLAS", "license": null, "dependencies": [ + { + "$comment": "Will use internal generic BLAS of lapack-reference", + "name": "lapack-reference", + "platform": "!((static |arm) & windows)" + }, { "name": "openblas", - "platform": "!osx | (static & windows)" + "platform": "!osx | !((static |arm) & windows)" }, { "name": "vcpkg-cmake", diff --git a/ports/clapack/portfile.cmake b/ports/clapack/portfile.cmake index fd14d04a69bec4..3eb328d90dd2ba 100644 --- a/ports/clapack/portfile.cmake +++ b/ports/clapack/portfile.cmake @@ -47,7 +47,6 @@ endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DCMAKE_DEBUG_POSTFIX=d ${ARITH_PATH} ) @@ -60,7 +59,7 @@ vcpkg_cmake_config_fixup() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Install clapack wrappers. -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/wrapper") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/FindLAPACK.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") # Handle copyright file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/clapack/vcpkg.json b/ports/clapack/vcpkg.json index b3d28c2965c9e3..ec85ad4f1a8f16 100644 --- a/ports/clapack/vcpkg.json +++ b/ports/clapack/vcpkg.json @@ -1,7 +1,7 @@ { "name": "clapack", "version": "3.2.1", - "port-version": 21, + "port-version": 22, "description": "CLAPACK (f2c'ed version of LAPACK)", "homepage": "https://www.netlib.org/clapack", "dependencies": [ diff --git a/ports/lapack-reference/portfile.cmake b/ports/lapack-reference/portfile.cmake index 8541502c8f929f..94a1584ac13182 100644 --- a/ports/lapack-reference/portfile.cmake +++ b/ports/lapack-reference/portfile.cmake @@ -104,11 +104,23 @@ if("cblas" IN_LIST FEATURES) endif() vcpkg_fixup_pkgconfig() +file(RENAME "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/lapack.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/lapack-reference.pc") +if(NOT VCPKG_BUILD_TYPE) + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/lapack.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/lapack-reference.pc") +endif() + +if(NOT "noblas" IN_LIST FEATURES) + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/blas.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/blas-reference.pc") + if(NOT VCPKG_BUILD_TYPE) + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/blas.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/blas-reference.pc") + endif() +endif() + # Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) # remove debug includes -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") if(VCPKG_TARGET_IS_WINDOWS) if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/liblapack.lib") @@ -134,5 +146,5 @@ else() endif() set(BLA_VENDOR Generic) -configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/wrapper/vcpkg-cmake-wrapper.cmake" @ONLY) file(COPY "${CMAKE_CURRENT_LIST_DIR}/FindLAPACK.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/lapack-reference/vcpkg.json b/ports/lapack-reference/vcpkg.json index b2fe5d6998fa18..7d89d17f0ecfb8 100644 --- a/ports/lapack-reference/vcpkg.json +++ b/ports/lapack-reference/vcpkg.json @@ -1,6 +1,7 @@ { "name": "lapack-reference", "version": "3.10.1", + "port-version": 1, "description": "LAPACK - Linear Algebra PACKage", "homepage": "http://www.netlib.org/lapack/", "license": "BSD-3-Clause-Open-MPI", @@ -31,7 +32,7 @@ "features": [ "noblas" ], - "platform": "!windows | !static" + "platform": "!(windows & static)" } ] }, diff --git a/ports/lapack/lapack.pc.in b/ports/lapack/lapack.pc.in index 49f7f103dc1420..055123058520b5 100644 --- a/ports/lapack/lapack.pc.in +++ b/ports/lapack/lapack.pc.in @@ -1,7 +1,8 @@ prefix=${pcfiledir}/../.. +libdir=${prefix}/lib -Name: BLAS -Description: Implementation of BLAS +Name: LAPACK +Description: Implementation of LAPACK Version: Requires: @requires@ Libs: @libs@ diff --git a/ports/lapack/portfile.cmake b/ports/lapack/portfile.cmake index 9700d1daa7d36a..f8aed4895a2a49 100644 --- a/ports/lapack/portfile.cmake +++ b/ports/lapack/portfile.cmake @@ -24,16 +24,21 @@ if(ver_str STREQUAL "default") endif() unset(installed_module) elseif((VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE MATCHES "arm") OR VCPKG_TARGET_IS_UWP) - configure_file("${CURRENT_INSTALLED_DIR}/share/clapack/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/lapack/vcpkg-cmake-wrapper.cmake" COPYONLY) + configure_file("${CURRENT_INSTALLED_DIR}/share/clapack/wrapper/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/lapack/vcpkg-cmake-wrapper.cmake" COPYONLY) configure_file("${CURRENT_INSTALLED_DIR}/share/clapack/FindLAPACK.cmake" "${CURRENT_PACKAGES_DIR}/share/lapack/FindLAPACK.cmake" COPYONLY) set(libs "-llapack -llibf2c") configure_file("${CMAKE_CURRENT_LIST_DIR}/lapack.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/lapack.pc" @ONLY) if(NOT VCPKG_BUILD_TYPE) - set(libs "-llapackd -llibf2cd") + set(libs "-llapack -llibf2c") configure_file("${CMAKE_CURRENT_LIST_DIR}/lapack.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/lapack.pc" @ONLY) endif() else() - configure_file("${CURRENT_INSTALLED_DIR}/share/lapack-reference/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/lapack/vcpkg-cmake-wrapper.cmake" COPYONLY) + configure_file("${CURRENT_INSTALLED_DIR}/share/lapack-reference/wrapper/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/lapack/vcpkg-cmake-wrapper.cmake" COPYONLY) configure_file("${CURRENT_INSTALLED_DIR}/share/lapack-reference/FindLAPACK.cmake" "${CURRENT_PACKAGES_DIR}/share/lapack/FindLAPACK.cmake" COPYONLY) + set(requires "lapack-reference") + configure_file("${CMAKE_CURRENT_LIST_DIR}/lapack.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/lapack.pc" @ONLY) + if(NOT VCPKG_BUILD_TYPE) + configure_file("${CMAKE_CURRENT_LIST_DIR}/lapack.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/lapack.pc" @ONLY) + endif() endif() endif() \ No newline at end of file From bbf8ace6023499f88b317d5dd95c4d8d08ca06fe Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 6 Jun 2022 23:33:10 +0200 Subject: [PATCH 026/131] fix logic --- ports/blas/vcpkg.json | 4 ++-- ports/lapack-reference/vcpkg.json | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ports/blas/vcpkg.json b/ports/blas/vcpkg.json index f2550e55286024..7893b376e86289 100644 --- a/ports/blas/vcpkg.json +++ b/ports/blas/vcpkg.json @@ -8,11 +8,11 @@ { "$comment": "Will use internal generic BLAS of lapack-reference", "name": "lapack-reference", - "platform": "!((static |arm) & windows)" + "platform": "static & windows" }, { "name": "openblas", - "platform": "!osx | !((static |arm) & windows)" + "platform": "!osx | !(static & windows)" }, { "name": "vcpkg-cmake", diff --git a/ports/lapack-reference/vcpkg.json b/ports/lapack-reference/vcpkg.json index 7d89d17f0ecfb8..ebd7717a68bde5 100644 --- a/ports/lapack-reference/vcpkg.json +++ b/ports/lapack-reference/vcpkg.json @@ -43,7 +43,8 @@ "description": "Use external optimized BLAS", "dependencies": [ "blas" - ] + ], + "supports": "!(windows & static)" } } } From 1044e8d6bf8a8974d4deea4bb56e92c608ba32f8 Mon Sep 17 00:00:00 2001 From: Neumann-A <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 7 Jun 2022 10:59:22 +0200 Subject: [PATCH 027/131] fine tuning --- ports/clapack/vcpkg.json | 2 +- ports/lapack-reference/vcpkg.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/clapack/vcpkg.json b/ports/clapack/vcpkg.json index ec85ad4f1a8f16..b3d28c2965c9e3 100644 --- a/ports/clapack/vcpkg.json +++ b/ports/clapack/vcpkg.json @@ -1,7 +1,7 @@ { "name": "clapack", "version": "3.2.1", - "port-version": 22, + "port-version": 21, "description": "CLAPACK (f2c'ed version of LAPACK)", "homepage": "https://www.netlib.org/clapack", "dependencies": [ diff --git a/ports/lapack-reference/vcpkg.json b/ports/lapack-reference/vcpkg.json index ebd7717a68bde5..ee2f70cea1d28b 100644 --- a/ports/lapack-reference/vcpkg.json +++ b/ports/lapack-reference/vcpkg.json @@ -32,7 +32,7 @@ "features": [ "noblas" ], - "platform": "!(windows & static)" + "platform": "!windows | !static" } ] }, @@ -44,7 +44,7 @@ "dependencies": [ "blas" ], - "supports": "!(windows & static)" + "supports": "!windows | !static" } } } From b4e1bfc00c36abd031f54b83b73a4db88b6ece12 Mon Sep 17 00:00:00 2001 From: Neumann-A <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 7 Jun 2022 11:00:25 +0200 Subject: [PATCH 028/131] format manifest --- ports/lapack-reference/vcpkg.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/lapack-reference/vcpkg.json b/ports/lapack-reference/vcpkg.json index ee2f70cea1d28b..8791d35fb7c873 100644 --- a/ports/lapack-reference/vcpkg.json +++ b/ports/lapack-reference/vcpkg.json @@ -41,10 +41,10 @@ }, "noblas": { "description": "Use external optimized BLAS", + "supports": "!windows | !static", "dependencies": [ "blas" - ], - "supports": "!windows | !static" + ] } } } From 4b0a1634da3fd00142b11be1e04a56af6de7cc6c Mon Sep 17 00:00:00 2001 From: Neumann-A <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 7 Jun 2022 11:00:51 +0200 Subject: [PATCH 029/131] v db --- versions/b-/blas.json | 2 +- versions/baseline.json | 10 +++++----- versions/c-/clapack.json | 2 +- versions/l-/lapack-reference.json | 5 +++++ versions/l-/lapack.json | 2 +- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/versions/b-/blas.json b/versions/b-/blas.json index 52fe96f34d1876..5cdd9cd3c843b7 100644 --- a/versions/b-/blas.json +++ b/versions/b-/blas.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "01a62ba993a98a0d40cfe1ab63a0dead03fa5a7c", + "git-tree": "10f75f4ab6acdd47967edd9e5b3947f66be34844", "version-string": "default", "port-version": 0 }, diff --git a/versions/baseline.json b/versions/baseline.json index 7c82e12a51b7ae..9fa13d60c16280 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -493,8 +493,8 @@ "port-version": 0 }, "blas": { - "baseline": "1", - "port-version": 1 + "baseline": "default", + "port-version": 0 }, "blaze": { "baseline": "3.8", @@ -1398,7 +1398,7 @@ }, "clapack": { "baseline": "3.2.1", - "port-version": 20 + "port-version": 21 }, "clara": { "baseline": "1.1.5", @@ -3341,12 +3341,12 @@ "port-version": 0 }, "lapack": { - "baseline": "2022-02-22", + "baseline": "default", "port-version": 0 }, "lapack-reference": { "baseline": "3.10.1", - "port-version": 0 + "port-version": 1 }, "lastools": { "baseline": "2020-05-09", diff --git a/versions/c-/clapack.json b/versions/c-/clapack.json index 33ebd276f8a7b4..f3dfaef24a8238 100644 --- a/versions/c-/clapack.json +++ b/versions/c-/clapack.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "c6ae90dbc78f251f9a486182d83dc7f15b5c20d8", + "git-tree": "375ba528def026f850944a13a5c78cefa0779343", "version": "3.2.1", "port-version": 21 }, diff --git a/versions/l-/lapack-reference.json b/versions/l-/lapack-reference.json index c5f07c06b3d8d2..bd689c646284a1 100644 --- a/versions/l-/lapack-reference.json +++ b/versions/l-/lapack-reference.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e59867e723f78ff3a42ebed837986a8808d05814", + "version": "3.10.1", + "port-version": 1 + }, { "git-tree": "44ad48321efe7014cd1dc7ab7b46516309e6c395", "version": "3.10.1", diff --git a/versions/l-/lapack.json b/versions/l-/lapack.json index 60004c2a96f06f..73b21c8c545dc7 100644 --- a/versions/l-/lapack.json +++ b/versions/l-/lapack.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "235ef93dec56035f02e8fdd88fbf34dfc4d2b095", + "git-tree": "eb8b597c3ffbb60ca40f7f6eaa233e421aba1b49", "version-string": "default", "port-version": 0 }, From e2193ee35b803cd2c915d1f07765620a480d823b Mon Sep 17 00:00:00 2001 From: Neumann-A <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 13 Jul 2022 13:30:11 +0200 Subject: [PATCH 030/131] fix platform expression --- ports/blas/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/blas/vcpkg.json b/ports/blas/vcpkg.json index 7893b376e86289..c6cf13a4228e0a 100644 --- a/ports/blas/vcpkg.json +++ b/ports/blas/vcpkg.json @@ -12,7 +12,7 @@ }, { "name": "openblas", - "platform": "!osx | !(static & windows)" + "platform": "!(osx | (static & windows))" }, { "name": "vcpkg-cmake", From b40a3a96ded7e18e2eccca1e8018c87bc635a2a5 Mon Sep 17 00:00:00 2001 From: Neumann-A <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 13 Jul 2022 13:30:30 +0200 Subject: [PATCH 031/131] overwrite version --- versions/b-/blas.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/b-/blas.json b/versions/b-/blas.json index 5cdd9cd3c843b7..0f4d30fd126524 100644 --- a/versions/b-/blas.json +++ b/versions/b-/blas.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "10f75f4ab6acdd47967edd9e5b3947f66be34844", + "git-tree": "299642c62c68f8d056405aa6749424f47311a01d", "version-string": "default", "port-version": 0 }, From 09ddd5e73e7c9c8ceb2e5a1d18666313835d06cc Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 30 Sep 2022 10:32:07 +0200 Subject: [PATCH 032/131] fix mlpack by fixing armadillo config. --- ports/armadillo/portfile.cmake | 5 +++++ ports/armadillo/vcpkg.json | 1 + 2 files changed, 6 insertions(+) diff --git a/ports/armadillo/portfile.cmake b/ports/armadillo/portfile.cmake index e293d56edc73e1..e28915a0ae588a 100644 --- a/ports/armadillo/portfile.cmake +++ b/ports/armadillo/portfile.cmake @@ -29,6 +29,11 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_cmake_config_fixup(PACKAGE_NAME Armadillo CONFIG_PATH share/Armadillo/CMake) +vcpkg_replace_string( "${CURRENT_PACKAGES_DIR}/share/Armadillo/ArmadilloConfig.cmake" + [[include("${VCPKG_IMPORT_PREFIX}/share/Armadillo/ArmadilloLibraryDepends.cmake")]] + "include(CMakeFindDependencyMacro)\nfind_dependency(LAPACK)\ninclude(\"\${VCPKG_IMPORT_PREFIX}/share/Armadillo/ArmadilloLibraryDepends.cmake\")" + ) + vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/armadillo/vcpkg.json b/ports/armadillo/vcpkg.json index 4b641a135d0aa6..4cb672df2b521a 100644 --- a/ports/armadillo/vcpkg.json +++ b/ports/armadillo/vcpkg.json @@ -1,6 +1,7 @@ { "name": "armadillo", "version": "11.2.3", + "port-version": 1, "description": "Armadillo is a high quality linear algebra library (matrix maths) for the C++ language, aiming towards a good balance between speed and ease of use", "homepage": "http://arma.sourceforge.net", "license": "Apache-2.0", From 3cd56c9d8bb263aadcaebd568e305d9abdcb0e4c Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 30 Sep 2022 10:33:08 +0200 Subject: [PATCH 033/131] v db --- versions/a-/armadillo.json | 5 +++++ versions/baseline.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/a-/armadillo.json b/versions/a-/armadillo.json index 02163cc409f50e..e02e928dccaefb 100644 --- a/versions/a-/armadillo.json +++ b/versions/a-/armadillo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "83ca5551915ca0d5b190a67125ef0d4b1c978bdd", + "version": "11.2.3", + "port-version": 1 + }, { "git-tree": "b4bc853e4132b3e2f8c13fa5cfc21030daa6d10a", "version": "11.2.3", diff --git a/versions/baseline.json b/versions/baseline.json index 0fc1a5fab135b6..375d693fc40431 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -182,7 +182,7 @@ }, "armadillo": { "baseline": "11.2.3", - "port-version": 0 + "port-version": 1 }, "arrayfire": { "baseline": "3.8.0", From 4339948d7e0c50d33211406a2a3f17f8d6576577 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 30 Sep 2022 10:37:54 +0200 Subject: [PATCH 034/131] add licens to clapack --- ports/clapack/vcpkg.json | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/clapack/vcpkg.json b/ports/clapack/vcpkg.json index b3d28c2965c9e3..3d87ad9b50514a 100644 --- a/ports/clapack/vcpkg.json +++ b/ports/clapack/vcpkg.json @@ -4,6 +4,7 @@ "port-version": 21, "description": "CLAPACK (f2c'ed version of LAPACK)", "homepage": "https://www.netlib.org/clapack", + "license": null, "dependencies": [ "blas", { From 76c27e2050e6557ea836deed67e6180e2ba6f821 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 30 Sep 2022 10:38:14 +0200 Subject: [PATCH 035/131] v db --- versions/c-/clapack.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/c-/clapack.json b/versions/c-/clapack.json index f3dfaef24a8238..9c3378435acbaa 100644 --- a/versions/c-/clapack.json +++ b/versions/c-/clapack.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "375ba528def026f850944a13a5c78cefa0779343", + "git-tree": "8415ad9e22d9a94a2d74828e2ca54f90782b0b29", "version": "3.2.1", "port-version": 21 }, From aa79c87d357a960642b90805560edbae16c7860d Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 20 Jan 2023 22:49:11 +0100 Subject: [PATCH 036/131] bump port versions --- ports/armadillo/vcpkg.json | 3 ++- ports/lapack-reference/vcpkg.json | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ports/armadillo/vcpkg.json b/ports/armadillo/vcpkg.json index 4b51d4e21273fb..6e0a88f85bd22f 100644 --- a/ports/armadillo/vcpkg.json +++ b/ports/armadillo/vcpkg.json @@ -1,8 +1,9 @@ { "name": "armadillo", "version": "11.4.3", + "port-version": 1, "description": "Armadillo is a high quality linear algebra library (matrix maths) for the C++ language, aiming towards a good balance between speed and ease of use", - "homepage": "http://arma.sourceforge.net", + "homepage": "https://arma.sourceforge.net", "license": "Apache-2.0", "dependencies": [ "blas", diff --git a/ports/lapack-reference/vcpkg.json b/ports/lapack-reference/vcpkg.json index 6559941e96c1f6..249c1c135c0d7c 100644 --- a/ports/lapack-reference/vcpkg.json +++ b/ports/lapack-reference/vcpkg.json @@ -1,6 +1,7 @@ { "name": "lapack-reference", "version": "3.11.0", + "port-version": 1, "description": "LAPACK - Linear Algebra PACKage", "homepage": "http://www.netlib.org/lapack/", "license": "BSD-3-Clause-Open-MPI", From f3688f5b692f8fe77e0211b2bd47ea4ac9e20a9a Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 25 Jan 2023 21:48:15 +0100 Subject: [PATCH 037/131] fix release pc path --- ports/lapack-reference/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/lapack-reference/portfile.cmake b/ports/lapack-reference/portfile.cmake index af6f3e81fbc1ea..b15a4eb192666c 100644 --- a/ports/lapack-reference/portfile.cmake +++ b/ports/lapack-reference/portfile.cmake @@ -112,7 +112,7 @@ if(NOT VCPKG_BUILD_TYPE) endif() if(NOT "noblas" IN_LIST FEATURES) - file(RENAME "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/blas.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/blas-reference.pc") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/blas.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/blas-reference.pc") if(NOT VCPKG_BUILD_TYPE) file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/blas.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/blas-reference.pc") endif() From 7d7b0767c7a228a3f3e1a5c812d1869ed6b91a34 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 25 Jan 2023 22:52:08 +0100 Subject: [PATCH 038/131] fix urls --- ports/clapack/vcpkg.json | 2 +- ports/lapack-reference/vcpkg.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/clapack/vcpkg.json b/ports/clapack/vcpkg.json index 3d87ad9b50514a..251e652f8f31f6 100644 --- a/ports/clapack/vcpkg.json +++ b/ports/clapack/vcpkg.json @@ -3,7 +3,7 @@ "version": "3.2.1", "port-version": 21, "description": "CLAPACK (f2c'ed version of LAPACK)", - "homepage": "https://www.netlib.org/clapack", + "homepage": "https://netlib.org/lapack/", "license": null, "dependencies": [ "blas", diff --git a/ports/lapack-reference/vcpkg.json b/ports/lapack-reference/vcpkg.json index 249c1c135c0d7c..303da6e9287fa1 100644 --- a/ports/lapack-reference/vcpkg.json +++ b/ports/lapack-reference/vcpkg.json @@ -3,7 +3,7 @@ "version": "3.11.0", "port-version": 1, "description": "LAPACK - Linear Algebra PACKage", - "homepage": "http://www.netlib.org/lapack/", + "homepage": "https://netlib.org/lapack/", "license": "BSD-3-Clause-Open-MPI", "dependencies": [ { From d7485f8ce51a16d8b3f95b8963fbcb5a14b8d6aa Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 3 Feb 2023 16:12:15 +0100 Subject: [PATCH 039/131] v db --- versions/a-/armadillo.json | 5 +++++ versions/baseline.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/a-/armadillo.json b/versions/a-/armadillo.json index e9d0f315036e6c..1408cfffa7d659 100644 --- a/versions/a-/armadillo.json +++ b/versions/a-/armadillo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4d49ee83be9747ee99d3d86a3296a1de0001a544", + "version": "11.4.3", + "port-version": 1 + }, { "git-tree": "325a64512ffbc2d8bfb94ff44c5a86c55252dc58", "version": "11.4.3", diff --git a/versions/baseline.json b/versions/baseline.json index e7c0d8fa16087c..73283594afba19 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -194,7 +194,7 @@ }, "armadillo": { "baseline": "11.4.3", - "port-version": 0 + "port-version": 1 }, "arrayfire": { "baseline": "3.8.0", From 1b3df815955ee75f5a247bd13083959e49794272 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 3 Feb 2023 16:17:21 +0100 Subject: [PATCH 040/131] v db the rest --- versions/baseline.json | 10 +++++----- versions/c-/clapack.json | 2 +- versions/l-/lapack-reference.json | 5 +++++ 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 73283594afba19..33e3c267d9f32a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -549,8 +549,8 @@ "port-version": 0 }, "blas": { - "baseline": "1", - "port-version": 1 + "baseline": "default", + "port-version": 0 }, "blaze": { "baseline": "3.8.1", @@ -1474,7 +1474,7 @@ }, "clapack": { "baseline": "3.2.1", - "port-version": 20 + "port-version": 21 }, "clara": { "baseline": "1.1.5", @@ -3581,12 +3581,12 @@ "port-version": 0 }, "lapack": { - "baseline": "2022-02-22", + "baseline": "default", "port-version": 0 }, "lapack-reference": { "baseline": "3.11.0", - "port-version": 0 + "port-version": 1 }, "lastools": { "baseline": "2020-05-09", diff --git a/versions/c-/clapack.json b/versions/c-/clapack.json index 9c3378435acbaa..89c030e162f8d5 100644 --- a/versions/c-/clapack.json +++ b/versions/c-/clapack.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "8415ad9e22d9a94a2d74828e2ca54f90782b0b29", + "git-tree": "dfbdfa66e8fee92304e90cfca9b017d797f2c11f", "version": "3.2.1", "port-version": 21 }, diff --git a/versions/l-/lapack-reference.json b/versions/l-/lapack-reference.json index 65d1564445604f..a24b3d4043784a 100644 --- a/versions/l-/lapack-reference.json +++ b/versions/l-/lapack-reference.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ed9cd9571714fe6928b4b2dcfcfeaad73a8a1886", + "version": "3.11.0", + "port-version": 1 + }, { "git-tree": "17a29c388c22fa340ab6c87b4df6ba6bad201de4", "version": "3.11.0", From 7ae04098e49c6480ded6463de34bd1fdb7a49edf Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 3 Feb 2023 16:19:50 +0100 Subject: [PATCH 041/131] ci baseline --- scripts/ci.baseline.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 94088ea403a1f2..0816edb829486b 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -409,6 +409,9 @@ libigl:x64-uwp=fail libirecovery:x64-windows-static-md=fail # 120 min build time for libjxl arm-uwp-rel, reason unknown libjxl:arm-uwp=skip +# Port is currently broken since upstream removed the tag so no way for contributors to reproduce CI failures. +libleidenalg:x64-uwp=fail +libleidenalg:arm64-windows=fail liblemon:arm-uwp=fail liblemon:x64-uwp=fail liblo:arm-uwp=fail From 0ceb6caac995353a8656440e98812931057efe91 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sun, 26 Feb 2023 10:36:49 +0100 Subject: [PATCH 042/131] v db --- versions/a-/armadillo.json | 5 +++++ versions/baseline.json | 12 ++++++------ versions/l-/lapack-reference.json | 5 +++++ 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/versions/a-/armadillo.json b/versions/a-/armadillo.json index ea542bdc0b5c12..ef52c78cb579bf 100644 --- a/versions/a-/armadillo.json +++ b/versions/a-/armadillo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e927fd2cce2406f7eb84690396e63843eecc5d23", + "version": "11.4.4", + "port-version": 1 + }, { "git-tree": "f149e3877dead7fd5e1783feb83a64a794eddcba", "version": "11.4.4", diff --git a/versions/baseline.json b/versions/baseline.json index a83a6390709e65..fc714e584419fc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -202,7 +202,7 @@ }, "armadillo": { "baseline": "11.4.4", - "port-version": 0 + "port-version": 1 }, "arrayfire": { "baseline": "3.8.0", @@ -561,8 +561,8 @@ "port-version": 0 }, "blas": { - "baseline": "1", - "port-version": 1 + "baseline": "default", + "port-version": 0 }, "blaze": { "baseline": "3.8.1", @@ -1486,7 +1486,7 @@ }, "clapack": { "baseline": "3.2.1", - "port-version": 20 + "port-version": 21 }, "clara": { "baseline": "1.1.5", @@ -3625,12 +3625,12 @@ "port-version": 0 }, "lapack": { - "baseline": "2022-02-22", + "baseline": "default", "port-version": 0 }, "lapack-reference": { "baseline": "3.11.0", - "port-version": 1 + "port-version": 2 }, "lastools": { "baseline": "2.0.2+20230206", diff --git a/versions/l-/lapack-reference.json b/versions/l-/lapack-reference.json index 0b841e18297fe0..000fbb97767f17 100644 --- a/versions/l-/lapack-reference.json +++ b/versions/l-/lapack-reference.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cf73aaa06ef78e1c4ac0e20e12fe5e519497a427", + "version": "3.11.0", + "port-version": 2 + }, { "git-tree": "d71a74d50d88f3cf337d7cefccadcb192e7d12ab", "version": "3.11.0", From 5e5852d407f29bf4074b52629e52ec797ca70ed5 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 24 Mar 2023 08:54:48 +0100 Subject: [PATCH 043/131] v db --- versions/a-/armadillo.json | 5 +++++ versions/b-/blas.json | 5 +++++ versions/baseline.json | 12 ++++++------ versions/c-/clapack.json | 5 +++++ 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/versions/a-/armadillo.json b/versions/a-/armadillo.json index 1945df2d628be4..c6a68d7140e40f 100644 --- a/versions/a-/armadillo.json +++ b/versions/a-/armadillo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8f130571e733a852765c8af2a76b680c3dacb65c", + "version": "12.0.1", + "port-version": 1 + }, { "git-tree": "8e222a2972a96da2fbb07a76585574e9512b107f", "version": "12.0.1", diff --git a/versions/b-/blas.json b/versions/b-/blas.json index a1139c63bd993e..6808d5da3ad5f5 100644 --- a/versions/b-/blas.json +++ b/versions/b-/blas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "299642c62c68f8d056405aa6749424f47311a01d", + "version-string": "default", + "port-version": 0 + }, { "git-tree": "13cc4359c6888f16fdde35e618096b67a9177a6b", "version-string": "1", diff --git a/versions/baseline.json b/versions/baseline.json index bb7795279fdd87..b17ee8ac6d3932 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -206,7 +206,7 @@ }, "armadillo": { "baseline": "12.0.1", - "port-version": 0 + "port-version": 1 }, "arpack-ng": { "baseline": "3.9.0", @@ -577,8 +577,8 @@ "port-version": 0 }, "blas": { - "baseline": "1", - "port-version": 2 + "baseline": "default", + "port-version": 0 }, "blaze": { "baseline": "3.8.1", @@ -1506,7 +1506,7 @@ }, "clapack": { "baseline": "3.2.1", - "port-version": 21 + "port-version": 22 }, "clara": { "baseline": "1.1.5", @@ -3657,12 +3657,12 @@ "port-version": 0 }, "lapack": { - "baseline": "2022-02-22", + "baseline": "default", "port-version": 0 }, "lapack-reference": { "baseline": "3.11.0", - "port-version": 1 + "port-version": 2 }, "lastools": { "baseline": "2.0.2+20230206", diff --git a/versions/c-/clapack.json b/versions/c-/clapack.json index 3ae3ce28579fe6..e5162ae4e493de 100644 --- a/versions/c-/clapack.json +++ b/versions/c-/clapack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e3774d985e775888e2753eb6b443b4916893c9ee", + "version": "3.2.1", + "port-version": 22 + }, { "git-tree": "f6f25a8699a34ca09b840a5e71b22ab8f6d01fda", "version": "3.2.1", From f455709a418c4e10b8894db0810417aa0786da03 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sat, 25 Mar 2023 10:43:22 +0100 Subject: [PATCH 044/131] trace failures --- ports/openimageio/portfile.cmake | 1 + ports/openmvs/portfile.cmake | 1 + 2 files changed, 2 insertions(+) diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake index cebea9096be19b..36e5b66bb64e3b 100644 --- a/ports/openimageio/portfile.cmake +++ b/ports/openimageio/portfile.cmake @@ -46,6 +46,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + --trace-expand ${FEATURE_OPTIONS} -DBUILD_TESTING=OFF -DUSE_DCMTK=OFF diff --git a/ports/openmvs/portfile.cmake b/ports/openmvs/portfile.cmake index 5f7f39ce2f3bc0..9191b864122750 100644 --- a/ports/openmvs/portfile.cmake +++ b/ports/openmvs/portfile.cmake @@ -26,6 +26,7 @@ file(REMOVE "${SOURCE_PATH}/build/Modules/FindEIGEN.cmake") vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} OPTIONS ${FEATURE_OPTIONS} + --trace-expand -DOpenMVS_USE_FAST_FLOAT2INT=ON -DOpenMVS_USE_FAST_INVSQRT=OFF -DOpenMVS_USE_FAST_CBRT=ON From e838da170a837ab73a264b52b26ec73710256456 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sat, 25 Mar 2023 11:28:51 +0100 Subject: [PATCH 045/131] add cblas feature as a dependency in static builds --- ports/blas/vcpkg.json | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/blas/vcpkg.json b/ports/blas/vcpkg.json index c6cf13a4228e0a..ad6f71da7ded69 100644 --- a/ports/blas/vcpkg.json +++ b/ports/blas/vcpkg.json @@ -8,6 +8,7 @@ { "$comment": "Will use internal generic BLAS of lapack-reference", "name": "lapack-reference", + "features": ["cblas"], "platform": "static & windows" }, { From f1aef264c8682825cf56d93d9945584fffd5675a Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sat, 25 Mar 2023 15:01:04 +0100 Subject: [PATCH 046/131] Slip cblas into lapack for opencv. --- ports/lapack-reference/vcpkg-cmake-wrapper.cmake.in | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ports/lapack-reference/vcpkg-cmake-wrapper.cmake.in b/ports/lapack-reference/vcpkg-cmake-wrapper.cmake.in index 84685ed1f0ab2d..f1b8b15e8c47fd 100644 --- a/ports/lapack-reference/vcpkg-cmake-wrapper.cmake.in +++ b/ports/lapack-reference/vcpkg-cmake-wrapper.cmake.in @@ -16,4 +16,12 @@ _find_package(${ARGS}) unset(BLA_VENDOR) unset(BLA_STATIC) +if(@CBLAS@) + include(SelectLibraryConfigurations) + find_library(CBLAS_LIBRARY_RELEASE NAMES libcblas PATHS "${CURRENT_PACKAGES_DIR}/lib" NO_DEFAULT_PATH) + find_library(CBLAS_LIBRARY_DEBUG NAMES libcblas PATHS "${CURRENT_PACKAGES_DIR}/debug/lib" NO_DEFAULT_PATH) + select_library_configurations(CBLAS) + set(LAPACK_LIBRARIES ${CBLAS_LIBRARIES} ${LAPACK_LIBRARIES}) +endif() + set(CMAKE_MODULE_PATH "${LAPACK_PREV_MODULE_PATH}") From e947d22e6edfb9e3dd3e78580ae65c020422f8f9 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sat, 25 Mar 2023 19:34:31 +0100 Subject: [PATCH 047/131] format manifest --- ports/blas/vcpkg.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ports/blas/vcpkg.json b/ports/blas/vcpkg.json index ad6f71da7ded69..c0f3cd92068ec4 100644 --- a/ports/blas/vcpkg.json +++ b/ports/blas/vcpkg.json @@ -8,7 +8,9 @@ { "$comment": "Will use internal generic BLAS of lapack-reference", "name": "lapack-reference", - "features": ["cblas"], + "features": [ + "cblas" + ], "platform": "static & windows" }, { From e2e85f22a5b07d92cf03b4bc676dca8d221883e2 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sat, 25 Mar 2023 19:34:58 +0100 Subject: [PATCH 048/131] v db --- versions/b-/blas.json | 2 +- versions/l-/lapack-reference.json | 2 +- versions/o-/openimageio.json | 2 +- versions/o-/openmvs.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/versions/b-/blas.json b/versions/b-/blas.json index 6808d5da3ad5f5..a903b238966fed 100644 --- a/versions/b-/blas.json +++ b/versions/b-/blas.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "299642c62c68f8d056405aa6749424f47311a01d", + "git-tree": "a1d4db7c61c4047934bd1615bb29983ef331a339", "version-string": "default", "port-version": 0 }, diff --git a/versions/l-/lapack-reference.json b/versions/l-/lapack-reference.json index 000fbb97767f17..ce9327d749c5e2 100644 --- a/versions/l-/lapack-reference.json +++ b/versions/l-/lapack-reference.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "cf73aaa06ef78e1c4ac0e20e12fe5e519497a427", + "git-tree": "e4c72b1574095e786c436d5455c3ae0d5737d51f", "version": "3.11.0", "port-version": 2 }, diff --git a/versions/o-/openimageio.json b/versions/o-/openimageio.json index 809e78e2d3f9f1..33f949af5dcd99 100644 --- a/versions/o-/openimageio.json +++ b/versions/o-/openimageio.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "82fe27ff1713dd3f0fbaaa7399257fc4d56cf1b0", + "git-tree": "be97660bf8419d7eed6da0c1fcc14471db1b5487", "version": "2.4.9.0", "port-version": 0 }, diff --git a/versions/o-/openmvs.json b/versions/o-/openmvs.json index bf7e223795be4b..2323a88fd3225f 100644 --- a/versions/o-/openmvs.json +++ b/versions/o-/openmvs.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "fbeb86b69f146df9049966d4e58117f38e166257", + "git-tree": "09b24bf9e350060815c566c426a3025bbf9c4833", "version": "2.1.0", "port-version": 0 }, From affdd7efb674d2c0e89764652069e21b207a7d6c Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sat, 25 Mar 2023 20:51:56 +0100 Subject: [PATCH 049/131] revert debug changes --- ports/openimageio/portfile.cmake | 1 - ports/openmvs/portfile.cmake | 1 - versions/o-/openimageio.json | 2 +- versions/o-/openmvs.json | 2 +- 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake index 36e5b66bb64e3b..cebea9096be19b 100644 --- a/ports/openimageio/portfile.cmake +++ b/ports/openimageio/portfile.cmake @@ -46,7 +46,6 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - --trace-expand ${FEATURE_OPTIONS} -DBUILD_TESTING=OFF -DUSE_DCMTK=OFF diff --git a/ports/openmvs/portfile.cmake b/ports/openmvs/portfile.cmake index 9191b864122750..5f7f39ce2f3bc0 100644 --- a/ports/openmvs/portfile.cmake +++ b/ports/openmvs/portfile.cmake @@ -26,7 +26,6 @@ file(REMOVE "${SOURCE_PATH}/build/Modules/FindEIGEN.cmake") vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} OPTIONS ${FEATURE_OPTIONS} - --trace-expand -DOpenMVS_USE_FAST_FLOAT2INT=ON -DOpenMVS_USE_FAST_INVSQRT=OFF -DOpenMVS_USE_FAST_CBRT=ON diff --git a/versions/o-/openimageio.json b/versions/o-/openimageio.json index 33f949af5dcd99..809e78e2d3f9f1 100644 --- a/versions/o-/openimageio.json +++ b/versions/o-/openimageio.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "be97660bf8419d7eed6da0c1fcc14471db1b5487", + "git-tree": "82fe27ff1713dd3f0fbaaa7399257fc4d56cf1b0", "version": "2.4.9.0", "port-version": 0 }, diff --git a/versions/o-/openmvs.json b/versions/o-/openmvs.json index 2323a88fd3225f..bf7e223795be4b 100644 --- a/versions/o-/openmvs.json +++ b/versions/o-/openmvs.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "09b24bf9e350060815c566c426a3025bbf9c4833", + "git-tree": "fbeb86b69f146df9049966d4e58117f38e166257", "version": "2.1.0", "port-version": 0 }, From 164ec71fab966f9e4fa67061818bff3360e820c6 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 27 Mar 2023 21:57:27 +0200 Subject: [PATCH 050/131] v db --- versions/b-/blas.json | 5 +++++ versions/baseline.json | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/versions/b-/blas.json b/versions/b-/blas.json index 20a9eb299a3219..d7af3d05245e90 100644 --- a/versions/b-/blas.json +++ b/versions/b-/blas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a1d4db7c61c4047934bd1615bb29983ef331a339", + "version-string": "default", + "port-version": 0 + }, { "git-tree": "0fe7611c8bb3098083440074a6c59f35bfee4f99", "version-date": "2023-03-25", diff --git a/versions/baseline.json b/versions/baseline.json index 133bc8eebfa28b..bcb0e1d40e9915 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -206,7 +206,7 @@ }, "armadillo": { "baseline": "12.0.1", - "port-version": 0 + "port-version": 1 }, "arpack-ng": { "baseline": "3.9.0", @@ -577,7 +577,7 @@ "port-version": 0 }, "blas": { - "baseline": "2023-03-25", + "baseline": "default", "port-version": 0 }, "blaze": { @@ -1506,7 +1506,7 @@ }, "clapack": { "baseline": "3.2.1", - "port-version": 21 + "port-version": 22 }, "clara": { "baseline": "1.1.5", @@ -3657,12 +3657,12 @@ "port-version": 0 }, "lapack": { - "baseline": "2022-02-22", + "baseline": "default", "port-version": 0 }, "lapack-reference": { "baseline": "3.11.0", - "port-version": 1 + "port-version": 2 }, "lastools": { "baseline": "2.0.2+20230206", From 2637ba63bc28858ca5dc9af12cd60072bade3f92 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 14 Apr 2023 08:41:26 +0200 Subject: [PATCH 051/131] v db --- versions/b-/blas.json | 5 +++++ versions/baseline.json | 12 ++++++------ versions/l-/lapack.json | 5 +++++ 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/versions/b-/blas.json b/versions/b-/blas.json index 20a9eb299a3219..37d604646f7c83 100644 --- a/versions/b-/blas.json +++ b/versions/b-/blas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "69046cdf8417d8c60ed79dd8b317186c775adacc", + "version-date": "2023-04-14", + "port-version": 0 + }, { "git-tree": "0fe7611c8bb3098083440074a6c59f35bfee4f99", "version-date": "2023-03-25", diff --git a/versions/baseline.json b/versions/baseline.json index 085ccd763c6e83..1930e095610169 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -206,7 +206,7 @@ }, "armadillo": { "baseline": "12.0.1", - "port-version": 0 + "port-version": 1 }, "arpack-ng": { "baseline": "3.9.0", @@ -585,7 +585,7 @@ "port-version": 0 }, "blas": { - "baseline": "2023-03-25", + "baseline": "2023-04-14", "port-version": 0 }, "blaze": { @@ -1522,7 +1522,7 @@ }, "clapack": { "baseline": "3.2.1", - "port-version": 21 + "port-version": 22 }, "clara": { "baseline": "1.1.5", @@ -3689,12 +3689,12 @@ "port-version": 0 }, "lapack": { - "baseline": "2022-02-22", - "port-version": 1 + "baseline": "2023-04-14", + "port-version": 0 }, "lapack-reference": { "baseline": "3.11.0", - "port-version": 1 + "port-version": 2 }, "lastools": { "baseline": "2.0.2+20230206", diff --git a/versions/l-/lapack.json b/versions/l-/lapack.json index 28567e0b5a62c4..8e557979d4def4 100644 --- a/versions/l-/lapack.json +++ b/versions/l-/lapack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f5d9b466a828d07ad6e15f8cf05198df2bcecc2f", + "version-date": "2023-04-14", + "port-version": 0 + }, { "git-tree": "5897ee099a5aa43bcb50c0d5a19cda3a9ed6a50c", "version-date": "2022-02-22", From 5e89b43368df502b2bea828929d85ec5a46ffbcd Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sat, 10 Jun 2023 23:06:31 +0200 Subject: [PATCH 052/131] v db --- versions/baseline.json | 12 ++++++------ versions/l-/lapack.json | 5 +++++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 65191f5b8449a8..989ca896a73e6e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -210,7 +210,7 @@ }, "armadillo": { "baseline": "12.0.1", - "port-version": 0 + "port-version": 1 }, "arpack-ng": { "baseline": "3.9.0", @@ -589,7 +589,7 @@ "port-version": 1 }, "blas": { - "baseline": "2023-03-25", + "baseline": "2023-04-14", "port-version": 0 }, "blaze": { @@ -1538,7 +1538,7 @@ }, "clapack": { "baseline": "3.2.1", - "port-version": 21 + "port-version": 22 }, "clara": { "baseline": "1.1.5", @@ -3749,12 +3749,12 @@ "port-version": 0 }, "lapack": { - "baseline": "2022-02-22", - "port-version": 2 + "baseline": "2023-06-10", + "port-version": 0 }, "lapack-reference": { "baseline": "3.11.0", - "port-version": 1 + "port-version": 2 }, "lastools": { "baseline": "2.0.2+20230206", diff --git a/versions/l-/lapack.json b/versions/l-/lapack.json index fedbceca301bf1..1d7bb9dd0fadb2 100644 --- a/versions/l-/lapack.json +++ b/versions/l-/lapack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b085c8f7ca073a647936d65fddaf6cf97b421f11", + "version-date": "2023-06-10", + "port-version": 0 + }, { "git-tree": "7c892b58c70ebc7d83444c4e727272cad40e28c2", "version-date": "2022-02-22", From 912b5d05830007df78955eec79cd7ac7380ecc66 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 29 Dec 2023 18:20:51 +0100 Subject: [PATCH 053/131] v db --- versions/a-/armadillo.json | 5 +++++ versions/baseline.json | 12 ++++++------ versions/c-/clapack.json | 5 +++++ 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/versions/a-/armadillo.json b/versions/a-/armadillo.json index ea55c14c0101bc..fc556bb92d1fe7 100644 --- a/versions/a-/armadillo.json +++ b/versions/a-/armadillo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c2aff7478c5ce43b743299048915610189b0cece", + "version": "12.6.6", + "port-version": 1 + }, { "git-tree": "c47c5cebd38878763558370cea0db1d527f2fc0a", "version": "12.6.6", diff --git a/versions/baseline.json b/versions/baseline.json index d20ea4f53b468d..b67112b1066f92 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -226,7 +226,7 @@ }, "armadillo": { "baseline": "12.6.6", - "port-version": 0 + "port-version": 1 }, "arpack-ng": { "baseline": "3.9.0", @@ -641,7 +641,7 @@ "port-version": 0 }, "blas": { - "baseline": "2023-03-25", + "baseline": "2023-04-14", "port-version": 0 }, "blaze": { @@ -1602,7 +1602,7 @@ }, "clapack": { "baseline": "3.2.1", - "port-version": 22 + "port-version": 23 }, "clara": { "baseline": "1.1.5", @@ -3981,12 +3981,12 @@ "port-version": 0 }, "lapack": { - "baseline": "2022-02-22", - "port-version": 2 + "baseline": "2023-06-10", + "port-version": 0 }, "lapack-reference": { "baseline": "3.11.0", - "port-version": 1 + "port-version": 2 }, "lastools": { "baseline": "2.0.2+20230206", diff --git a/versions/c-/clapack.json b/versions/c-/clapack.json index 02e660a7d605b9..c05db7fab00a27 100644 --- a/versions/c-/clapack.json +++ b/versions/c-/clapack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "df462deddabc19611906128f81277979e7adb1c8", + "version": "3.2.1", + "port-version": 23 + }, { "git-tree": "0736bfcd19b6aaa7f1c75c10122433d4b4cc50a9", "version": "3.2.1", From cc03e3d20e86bebed49cd6289bd668cba7587371 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 10 Jan 2024 14:55:48 +0100 Subject: [PATCH 054/131] v db --- versions/baseline.json | 2 +- versions/l-/lapack-reference.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 2f6ced27d2ab7c..04761c1b8cac4b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3986,7 +3986,7 @@ }, "lapack-reference": { "baseline": "3.11.0", - "port-version": 2 + "port-version": 3 }, "lastools": { "baseline": "2.0.2+20230206", diff --git a/versions/l-/lapack-reference.json b/versions/l-/lapack-reference.json index 1cd14ec48e6144..272c1d66a49223 100644 --- a/versions/l-/lapack-reference.json +++ b/versions/l-/lapack-reference.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9e48ce092ea7b050275ca257d5d28298e2f78432", + "version": "3.11.0", + "port-version": 3 + }, { "git-tree": "34ccaaa835e90fc739829db6ea9b72c58151960e", "version": "3.11.0", From 66a0139440d9af97be9c2f35ac7da9979174145e Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sun, 3 Mar 2024 22:50:27 +0100 Subject: [PATCH 055/131] update vtkm --- ports/vtk-m/fix-build.patch | 38 +++++++++++++++++++++++++++++++++++++ ports/vtk-m/omp.patch | 14 +++++++------- ports/vtk-m/portfile.cmake | 34 +++++++++++++++++++++++---------- ports/vtk-m/vcpkg.json | 3 +-- 4 files changed, 70 insertions(+), 19 deletions(-) create mode 100644 ports/vtk-m/fix-build.patch diff --git a/ports/vtk-m/fix-build.patch b/ports/vtk-m/fix-build.patch new file mode 100644 index 00000000000000..ffe52ab2f29434 --- /dev/null +++ b/ports/vtk-m/fix-build.patch @@ -0,0 +1,38 @@ +diff --git a/vtkm/filter/flow/internal/Messenger.cxx b/vtkm/filter/flow/internal/Messenger.cxx +index 52c582f201..dff804cc8a 100644 +--- a/vtkm/filter/flow/internal/Messenger.cxx ++++ b/vtkm/filter/flow/internal/Messenger.cxx +@@ -277,7 +277,7 @@ void Messenger::SendDataSync(int dst, int tag, vtkmdiy::MemoryBuffer& buff) + if (it == this->SyncSendBuffers.end()) + { + std::vector> vec; +- vec.push_back(std::move(entry)); ++ vec.emplace_back(std::move(entry)); + this->SyncSendBuffers.insert(std::make_pair(tag, std::move(vec))); + } + else +diff --git a/vtkm/filter/flow/internal/Messenger.h b/vtkm/filter/flow/internal/Messenger.h +index 42d554ae51..b6a0acb40b 100644 +--- a/vtkm/filter/flow/internal/Messenger.h ++++ b/vtkm/filter/flow/internal/Messenger.h +@@ -44,6 +44,11 @@ public: + #endif + } + ++ Messenger(const Messenger&) =delete; ++ Messenger(Messenger&&) =default; ++ Messenger& operator=(Messenger&&) =default; ++ Messenger& operator=(const Messenger&) =delete; ++ + int GetRank() const { return this->Rank; } + int GetNumRanks() const { return this->NumRanks; } + +@@ -108,7 +113,7 @@ private: + + //Member data + // +- std::map>> SyncSendBuffers; ++ std::map>> SyncSendBuffers = {}; + std::map> MessageTagInfo; + MPI_Comm MPIComm; + std::size_t MsgID; diff --git a/ports/vtk-m/omp.patch b/ports/vtk-m/omp.patch index 062799b220a792..dacb6f01a0f7da 100644 --- a/ports/vtk-m/omp.patch +++ b/ports/vtk-m/omp.patch @@ -5,22 +5,22 @@ index e9ac039..c745604 100644 @@ -59,20 +59,14 @@ if(VTKm_ENABLE_OPENMP AND NOT TARGET vtkm::openmp) find_package(OpenMP 4.0 REQUIRED COMPONENTS CXX QUIET) - add_library(vtkm::openmp INTERFACE IMPORTED GLOBAL) -+ target_link_libraries(vtkm::openmp INTERFACE OpenMP::OpenMP_CXX) + add_library(vtkm_openmp INTERFACE) + set_target_properties(vtkm_openmp PROPERTIES EXPORT_NAME openmp) ++ target_link_libraries(vtkm_openmp INTERFACE OpenMP::OpenMP_CXX) if(OpenMP_CXX_FLAGS) -- set_property(TARGET vtkm::openmp +- set_property(TARGET vtkm_openmp - APPEND PROPERTY INTERFACE_COMPILE_OPTIONS $<$:${OpenMP_CXX_FLAGS}>) - if(VTKm_ENABLE_CUDA) string(REPLACE ";" "," openmp_cuda_flags "-Xcompiler=${OpenMP_CXX_FLAGS}") - set_property(TARGET vtkm::openmp + set_property(TARGET vtkm_openmp APPEND PROPERTY INTERFACE_COMPILE_OPTIONS $<$:${openmp_cuda_flags}>) endif() endif() - if(OpenMP_CXX_LIBRARIES) -- set_target_properties(vtkm::openmp PROPERTIES +- set_target_properties(vtkm_openmp PROPERTIES - INTERFACE_LINK_LIBRARIES "${OpenMP_CXX_LIBRARIES}") - endif() + install(TARGETS vtkm_openmp EXPORT ${VTKm_EXPORT_NAME}) endif() - - if(VTKm_ENABLE_CUDA) diff --git a/ports/vtk-m/portfile.cmake b/ports/vtk-m/portfile.cmake index 31f9c5c13ff4a9..e021e80422f20f 100644 --- a/ports/vtk-m/portfile.cmake +++ b/ports/vtk-m/portfile.cmake @@ -16,6 +16,7 @@ vcpkg_check_features (OUT_FEATURE_OPTIONS OPTIONS tbb VTKm_ENABLE_TBB mpi VTKm_ENABLE_MPI double VTKm_USE_DOUBLE_PRECISION + kokkos VTKm_ENABLE_KOKKOS # No port yet ) if("cuda" IN_LIST FEATURES AND NOT ENV{CUDACXX}) @@ -26,10 +27,22 @@ if("cuda" IN_LIST FEATURES AND NOT ENV{CUDACXX}) set(VCPKG_LIBRARY_LINKAGE "static") # CUDA forces static build. endif() -list(APPEND OPTIONS -DVTKm_ENABLE_RENDERING=ON) -list(APPEND OPTIONS -DVTKm_ENABLE_DEVELOPER_FLAGS=OFF) -list(APPEND OPTIONS -DVTKm_ENABLE_CPACK=OFF) -list(APPEND OPTIONS -DVTKm_USE_DEFAULT_TYPES_FOR_VTK=ON) +list(APPEND OPTIONS + -DVTKm_ENABLE_RENDERING=ON + -DVTKm_ENABLE_DEVELOPER_FLAGS=OFF + -DVTKm_ENABLE_CPACK=OFF + -DVTKm_ENABLE_EXAMPLES=OFF + -DVTKm_ENABLE_TUTORIALS=OFF + -DVTKm_ENABLE_DOCUMENTATION=OFF + -DVTKm_ENABLE_BENCHMARKS=OFF + -DVTKm_USE_DEFAULT_TYPES_FOR_VTK=ON + -DBUILD_TESTING=OFF + -DVTKm_ENABLE_TESTING=OFF + -DVTKm_USE_64BIT_IDS=ON + -DVTKm_ENABLE_HDF5_IO=OFF + -DVTKm_NO_INSTALL_README_LICENSE=ON + -DVTKm_ENABLE_GPU_MPI=OFF + ) # For port customizations on unix systems. # Please feel free to make these port features if it makes any sense #list(APPEND OPTIONS -DVTKm_ENABLE_GL_CONTEXT=ON) # or @@ -40,29 +53,30 @@ list(APPEND OPTIONS -DBUILD_TESTING=OFF) vcpkg_from_gitlab(GITLAB_URL "https://gitlab.kitware.com" OUT_SOURCE_PATH SOURCE_PATH REPO vtk/vtk-m - REF 902fdac6fafb6358ce88f8747d55e2c0715241f1 # v1.9.0 Upgrading will most likly brake the VTK build - SHA512 f83872495ed3dbcea372776c4439a7d224568d144ff602c188fae120026778b1bee681c9e9535cc693e870cbc08ca9896af2bc954935c289f6b9a24f2471a50b + REF a057f62e756efc43095e72c5813aaaf2dea36ebb # v2.1.0 Upgrading will most likly brake the VTK build + SHA512 fa08bd597e1918d10e7fed9f6b9667fd53f4a14589580e68691aad3cfb240f7de80fa0c5001712f100911c2262b5af3105b8f21da21b945a88e1204ea82b92a6 FILE_DISAMBIGUATOR 1 PATCHES omp.patch + fix-build.patch ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${OPTIONS} ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/vtkm-1.9" PACKAGE_NAME vtkm) +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/vtkm-2.1" PACKAGE_NAME vtkm) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/vtkm/VTKmConfig.cmake" - [[set_and_check(VTKm_CONFIG_DIR "${PACKAGE_PREFIX_DIR}/lib/cmake/vtkm-1.9")]] + [[set_and_check(VTKm_CONFIG_DIR "${PACKAGE_PREFIX_DIR}/lib/cmake/vtkm-2.1")]] [[set_and_check(VTKm_CONFIG_DIR "${PACKAGE_PREFIX_DIR}/share/vtkm")]]) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/vtkm/VTKmConfig.cmake" "${CURRENT_BUILDTREES_DIR}" "not/existing/buildtree") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") -file(RENAME "${CURRENT_PACKAGES_DIR}/share/vtkm-1.9/vtkm.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/vtkm.pc") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/vtkm-2.1/vtkm.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/vtkm.pc") if(NOT VCPKG_BUILD_TYPE) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/vtkm-1.9/vtkm.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/vtkm.pc") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/vtkm-2.1/vtkm.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/vtkm.pc") endif() vcpkg_fixup_pkgconfig() diff --git a/ports/vtk-m/vcpkg.json b/ports/vtk-m/vcpkg.json index b50aa164bc957d..02a0877bf532b7 100644 --- a/ports/vtk-m/vcpkg.json +++ b/ports/vtk-m/vcpkg.json @@ -1,7 +1,6 @@ { "name": "vtk-m", - "version": "1.9.0", - "port-version": 2, + "version": "2.1.0", "description": "VTK-m is a toolkit of scientific visualization algorithms for emerging processor architectures.", "homepage": "https://gitlab.kitware.com/vtk/vtk-m/", "license": null, From 5f0b0717c05f0edd4067895db3fbceed17af59b5 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 4 Mar 2024 10:53:44 +0100 Subject: [PATCH 056/131] update vtk --- ports/vtk/9690.diff | 27 -------- ports/vtk/fast-float.patch | 12 ++++ ports/vtk/libproj.patch | 5 +- ports/vtk/missing-include-fixes.patch | 40 ------------ ports/vtk/pegtl.patch | 89 ++++++++++---------------- ports/vtk/portfile.cmake | 46 ++++---------- ports/vtk/pythonwrapper.patch | 27 ++++++-- ports/vtk/vcpkg.json | 7 +- ports/vtk/vtkioss.patch | 42 ++++-------- ports/vtk/vtkm.patch | 92 ++++++++++++++------------- 10 files changed, 145 insertions(+), 242 deletions(-) delete mode 100644 ports/vtk/9690.diff create mode 100644 ports/vtk/fast-float.patch delete mode 100644 ports/vtk/missing-include-fixes.patch diff --git a/ports/vtk/9690.diff b/ports/vtk/9690.diff deleted file mode 100644 index fedf8b6c3e2fb4..00000000000000 --- a/ports/vtk/9690.diff +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfH5Driver.cxx b/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfH5Driver.cxx -index 1a412b56d028ecc7015976cd6effe8b0bb59e6fe..8f5e6e4c077b52eb956bfe8aacf7d1647860d405 100644 ---- a/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfH5Driver.cxx -+++ b/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfH5Driver.cxx -@@ -156,6 +156,9 @@ static herr_t H5FD_dsm_write(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, hadd - } - - static const H5FD_class_t H5FD_dsm_g = { -+#if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&((H5_VERS_MINOR>13)||((H5_VERS_MINOR==13)&&(H5_VERS_RELEASE>=2)))) -+ 0, /*version */ -+#endif - #if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=13)) - H5_VFD_RESERVED + 0xd3f2, /*value */ - #endif -@@ -190,6 +193,12 @@ static const H5FD_class_t H5FD_dsm_g = { - NULL, /*get_handle */ - H5FD_dsm_read, /*read */ - H5FD_dsm_write, /*write */ -+#if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&((H5_VERS_MINOR>13)||((H5_VERS_MINOR==13)&&(H5_VERS_RELEASE>=2)))) -+ NULL, /*read_vector */ -+ NULL, /*write_vector */ -+ NULL, /*read_selection */ -+ NULL, /*write_selection */ -+#endif - NULL, /*flush */ - #if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=8)) - NULL, /* truncate */ diff --git a/ports/vtk/fast-float.patch b/ports/vtk/fast-float.patch new file mode 100644 index 00000000000000..1d12c0d9b17d35 --- /dev/null +++ b/ports/vtk/fast-float.patch @@ -0,0 +1,12 @@ +diff --git a/ThirdParty/fast_float/CMakeLists.txt b/ThirdParty/fast_float/CMakeLists.txt +index e6e63cbfe6..919b12a509 100644 +--- a/ThirdParty/fast_float/CMakeLists.txt ++++ b/ThirdParty/fast_float/CMakeLists.txt +@@ -13,7 +13,6 @@ vtk_module_third_party( + STANDARD_INCLUDE_DIRS + HEADER_ONLY + EXTERNAL +- VERSION "3.9.0" + PACKAGE FastFloat + TARGETS FastFloat::fast_float + STANDARD_INCLUDE_DIRS diff --git a/ports/vtk/libproj.patch b/ports/vtk/libproj.patch index 28ecfe905bafba..80ab60b4892c65 100644 --- a/ports/vtk/libproj.patch +++ b/ports/vtk/libproj.patch @@ -2,8 +2,9 @@ diff --git a/ThirdParty/libproj/CMakeLists.txt b/ThirdParty/libproj/CMakeLists.t index f8888876..d57c4c18 100644 --- a/ThirdParty/libproj/CMakeLists.txt +++ b/ThirdParty/libproj/CMakeLists.txt -@@ -4,10 +4,12 @@ vtk_module_third_party( - VERSION "8.1.0" +@@ -4,11 +4,13 @@ vtk_module_third_party( + VERSION + "8.1.0" STANDARD_INCLUDE_DIRS EXTERNAL - PACKAGE LibPROJ diff --git a/ports/vtk/missing-include-fixes.patch b/ports/vtk/missing-include-fixes.patch deleted file mode 100644 index e6f49cab9ef2d3..00000000000000 --- a/ports/vtk/missing-include-fixes.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/IO/Image/vtkSEPReader.cxx b/IO/Image/vtkSEPReader.cxx -index 2b15bc249e..cec84d1712 100644 ---- a/IO/Image/vtkSEPReader.cxx -+++ b/IO/Image/vtkSEPReader.cxx -@@ -34,7 +34,6 @@ - #include - - #include --#include - - namespace details - { -diff --git a/IO/Image/vtkSEPReader.h b/IO/Image/vtkSEPReader.h -index 83d127a41e..bdb33a258b 100644 ---- a/IO/Image/vtkSEPReader.h -+++ b/IO/Image/vtkSEPReader.h -@@ -25,8 +25,9 @@ - #include "vtkImageAlgorithm.h" - #include "vtkNew.h" // for ivars - --#include // for std::array --#include // for std::string -+#include // for std::array -+#include // for std::uint8_t -+#include // for std::string - - namespace details - { -diff --git a/ThirdParty/libproj/vtklibproj/src/proj_json_streaming_writer.hpp b/ThirdParty/libproj/vtklibproj/src/proj_json_streaming_writer.hpp -index 6267684218..cf19b83af4 100644 ---- a/ThirdParty/libproj/vtklibproj/src/proj_json_streaming_writer.hpp -+++ b/ThirdParty/libproj/vtklibproj/src/proj_json_streaming_writer.hpp -@@ -31,6 +31,7 @@ - - /*! @cond Doxygen_Suppress */ - -+#include - #include - #include - diff --git a/ports/vtk/pegtl.patch b/ports/vtk/pegtl.patch index 3b66d39f6660a8..cf45e388d3407e 100644 --- a/ports/vtk/pegtl.patch +++ b/ports/vtk/pegtl.patch @@ -46,8 +46,9 @@ diff --git a/ThirdParty/pegtl/CMakeLists.txt b/ThirdParty/pegtl/CMakeLists.txt index 9bbd4c828..0cdb1f53d 100644 --- a/ThirdParty/pegtl/CMakeLists.txt +++ b/ThirdParty/pegtl/CMakeLists.txt -@@ -5,7 +5,6 @@ vtk_module_third_party( - VERSION "2.8.3" +@@ -5,8 +5,7 @@ vtk_module_third_party( + VERSION + "2.8.3" EXTERNAL PACKAGE PEGTL - VERSION 2.0.0 @@ -58,15 +59,10 @@ diff --git a/CMake/FindPEGTL.cmake b/CMake/FindPEGTL.cmake index 73eee02f7..22d8bc159 100644 --- a/CMake/FindPEGTL.cmake +++ b/CMake/FindPEGTL.cmake -@@ -19,31 +19,43 @@ - # Copyright (c) 2009 Benoit Jacob - # Redistribution and use is allowed according to the terms of the 2-clause BSD license. +@@ -19,31 +19,42 @@ + # + # PEGTL::PEGTL --find_path(PEGTL_INCLUDE_DIR -- NAMES pegtl/version.hpp -- PATH_SUFFIXES tao -- DOC "Path to PEGTL headers") --mark_as_advanced(PEGTL_INCLUDE_DIR) +message(STATUS "Searching for PEGTL") +find_package(PEGTL CONFIG REQUIRED) +if(TARGET taocpp::pegtl) @@ -77,54 +73,33 @@ index 73eee02f7..22d8bc159 100644 + target_link_libraries(PEGTL::PEGTL INTERFACE taocpp::pegtl) + endif() +else() -+ find_path(PEGTL_INCLUDE_DIR -+ NAMES pegtl/version.hpp -+ PATH_SUFFIXES tao -+ DOC "Path to PEGTL headers") -+ mark_as_advanced(PEGTL_INCLUDE_DIR) + find_path(PEGTL_INCLUDE_DIR + NAMES pegtl/version.hpp + PATH_SUFFIXES tao + DOC "Path to PEGTL headers") + mark_as_advanced(PEGTL_INCLUDE_DIR) --if (PEGTL_INCLUDE_DIR) -- file(STRINGS "${PEGTL_INCLUDE_DIR}/pegtl/version.hpp" _pegtl_version_header -- REGEX "TAO_PEGTL_VERSION") -- string(REGEX MATCH "define[ \t]+TAO_PEGTL_VERSION[ \t]+\"([0-9.]+)\"" _pegtl_version_match "${_pegtl_version_header}") -- set(PEGTL_VERSION "${CMAKE_MATCH_1}") -- unset(_pegtl_version_header) -- unset(_pegtl_version_match) --endif () -+ if (PEGTL_INCLUDE_DIR) -+ file(STRINGS "${PEGTL_INCLUDE_DIR}/pegtl/version.hpp" _pegtl_version_header -+ REGEX "TAO_PEGTL_VERSION") -+ string(REGEX MATCH "define[ \t]+TAO_PEGTL_VERSION[ \t]+\"([0-9.]+)\"" _pegtl_version_match "${_pegtl_version_header}") -+ set(PEGTL_VERSION "${CMAKE_MATCH_1}") -+ unset(_pegtl_version_header) -+ unset(_pegtl_version_match) -+ endif () + if (PEGTL_INCLUDE_DIR) + file(STRINGS "${PEGTL_INCLUDE_DIR}/pegtl/version.hpp" _pegtl_version_header + REGEX "TAO_PEGTL_VERSION") + string(REGEX MATCH "define[ \t]+TAO_PEGTL_VERSION[ \t]+\"([0-9.]+)\"" _pegtl_version_match "${_pegtl_version_header}") + set(PEGTL_VERSION "${CMAKE_MATCH_1}") + unset(_pegtl_version_header) + unset(_pegtl_version_match) + endif () --include(FindPackageHandleStandardArgs) --find_package_handle_standard_args(PEGTL -- REQUIRED_VARS PEGTL_INCLUDE_DIR -- VERSION_VAR PEGTL_VERSION) -+ include(FindPackageHandleStandardArgs) -+ find_package_handle_standard_args(PEGTL -+ REQUIRED_VARS PEGTL_INCLUDE_DIR -+ VERSION_VAR PEGTL_VERSION) + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(PEGTL + REQUIRED_VARS PEGTL_INCLUDE_DIR + VERSION_VAR PEGTL_VERSION) --if (PEGTL_FOUND) -- set(PEGTL_INCLUDE_DIRS "${PEGTL_INCLUDE_DIR}") -- if (NOT TARGET PEGTL::PEGTL) -- add_library(PEGTL::PEGTL INTERFACE IMPORTED) -- set_target_properties(PEGTL::PEGTL PROPERTIES -- INTERFACE_INCLUDE_DIRECTORIES "${PEGTL_INCLUDE_DIR}") -- endif () --endif () -+ if (PEGTL_FOUND) -+ set(PEGTL_INCLUDE_DIRS "${PEGTL_INCLUDE_DIR}") -+ if (NOT TARGET PEGTL::PEGTL) -+ add_library(PEGTL::PEGTL INTERFACE IMPORTED) -+ set_target_properties(PEGTL::PEGTL PROPERTIES -+ INTERFACE_INCLUDE_DIRECTORIES "${PEGTL_INCLUDE_DIR}") -+ endif () -+ message(STATUS "Searching for PEGTL - found") -+ endif () + if (PEGTL_FOUND) + set(PEGTL_INCLUDE_DIRS "${PEGTL_INCLUDE_DIR}") + if (NOT TARGET PEGTL::PEGTL) + add_library(PEGTL::PEGTL INTERFACE IMPORTED) + set_target_properties(PEGTL::PEGTL PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${PEGTL_INCLUDE_DIR}") + endif () + endif () +endif () -\ No newline at end of file + diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index f33e09d503b8c8..7cc305d50d1275 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -1,38 +1,17 @@ -set(VTK_SHORT_VERSION 9.2) +set(VTK_SHORT_VERSION 9.3) if(NOT VCPKG_TARGET_IS_WINDOWS) message(WARNING "You will need to install Xorg dependencies to build vtk:\napt-get install libxt-dev\n") endif() set(VCPKG_POLICY_SKIP_ABSOLUTE_PATHS_CHECK enabled) -vcpkg_download_distfile( - STRING_PATCH - URLS https://gitlab.kitware.com/vtk/vtk/-/commit/bfa3e4c7621ddf5826755536eb07284c86db6474.diff?full_index=1 - FILENAME vtk-string-bfa3e4.diff - SHA512 c5ccb1193e4e61cf78b63802f87ffb09349c5566ad8a4d51418133953f7acd6b4a206f8d41a426a9eb9be3cf1fd95242e6402973252d7979e5a9cb5e5e480d78 -) - -vcpkg_download_distfile( - MPI4PY_PATCH_1 - URLS https://gitlab.kitware.com/vtk/vtk/-/commit/c938d30634a284fad026f6ae25c30bc84cadc07e.diff?full_index=1 - FILENAME vtk-mpi4py-update-part1-c938d3.diff - SHA512 5704c1dd124075bd8f37b0734c5cebd48b470902c74bc23774fd4b69025dbc6bfddf48b7c4511520ed07f03bd666a444d6390569f02a0ab68b5d966ddde3a989 -) - -vcpkg_download_distfile( - MPI4PY_PATCH_2 - URLS https://gitlab.kitware.com/vtk/vtk/-/commit/53e6ce92ae4591552e7e00344d69803117d56bfe.diff?full_index=1 - FILENAME vtk-mpi4py-update-part2-53e6ce.diff - SHA512 794a25bff6168fda94d920a6837c3a690bd6d79284ec34dcd67666c55de78962cc7b73c0f074ce58ed78198bb149eab6bf59b2822f29cbfa792e2fe667c9327c -) - # ============================================================================= # Clone & patch vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Kitware/VTK - REF 66143ef041b980a51e41ee470d053e67209150f8 # v9.2.x used by ParaView 5.11.0 - SHA512 70662670622082bb8d8b16765bbdf645cfbe62151e93b9673c6f94b356df66ca003e5c78b45e99385f1630aed39c3a8eddecd1d9f5bc0cfb92f5e7e8c06e4dbb + REF 407d4b541111686c40fa53935e7d22c70d5a3f7c # v9.3.x used by ParaView 5.12.0 + SHA512 4170d8b6e89ad90020b16d38d6e91c144eb4f1ffd6d6b82a5f2827bf5b16dac98896fcf1a57822bdb56470f56df02adb05836ce98871b779e4733e2cd60a9a76 HEAD_REF master PATCHES FindLZMA.patch @@ -52,11 +31,7 @@ vcpkg_from_github( vtkioss.patch jsoncpp.patch iotr.patch - "${STRING_PATCH}" - "${MPI4PY_PATCH_1}" - "${MPI4PY_PATCH_2}" - 9690.diff - missing-include-fixes.patch + fast-float.patch ) # ============================================================================= @@ -110,6 +85,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS VTK_FEATURE_OPTIONS "paraview" VTK_MODULE_ENABLE_VTK_RenderingVolumeAMR "paraview" VTK_MODULE_ENABLE_VTK_IOXdmf2 "paraview" VTK_MODULE_ENABLE_VTK_IOH5part + "paraview" VTK_MODULE_ENABLE_VTK_IOH5Rage "paraview" VTK_MODULE_ENABLE_VTK_IOParallelLSDyna "paraview" VTK_MODULE_ENABLE_VTK_IOTRUCHAS "paraview" VTK_MODULE_ENABLE_VTK_IOVPIC @@ -117,6 +93,9 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS VTK_FEATURE_OPTIONS "paraview" VTK_MODULE_ENABLE_VTK_DomainsChemistry "paraview" VTK_MODULE_ENABLE_VTK_FiltersParallelDIY2 "paraview" VTK_MODULE_ENABLE_VTK_cli11 + "paraview" VTK_MODULE_ENABLE_VTK_FiltersOpenTURNS + "paraview" VTK_MODULE_ENABLE_VTK_IOOMF + "paraview" VTK_MODULE_ENABLE_VTK_IOPIO "mpi" VTK_GROUP_ENABLE_MPI "opengl" VTK_MODULE_ENABLE_VTK_ImagingOpenGL2 "opengl" VTK_MODULE_ENABLE_VTK_RenderingGL2PSOpenGL2 @@ -153,7 +132,6 @@ if("python" IN_LIST FEATURES) endif() list(APPEND ADDITIONAL_OPTIONS -DVTK_WRAP_PYTHON=ON - -DVTK_PYTHON_VERSION=3 -DPython3_FIND_REGISTRY=NEVER "-DPython3_EXECUTABLE:PATH=${CURRENT_HOST_INSTALLED_DIR}/tools/python3/python${python_ver}${VCPKG_EXECUTABLE_SUFFIX}" -DVTK_MODULE_ENABLE_VTK_Python=YES @@ -176,12 +154,14 @@ endif() if ("paraview" IN_LIST FEATURES AND "python" IN_LIST FEATURES) list(APPEND ADDITIONAL_OPTIONS -DVTK_MODULE_ENABLE_VTK_WebCore=YES + -DVTK_MODULE_ENABLE_VTK_RenderingMatplotlib=YES ) endif() if("paraview" IN_LIST FEATURES AND "mpi" IN_LIST FEATURES) list(APPEND ADDITIONAL_OPTIONS -DVTK_MODULE_ENABLE_VTK_FiltersParallelFlowPaths=YES + -DVTK_MODULE_ENABLE_VTK_RenderingParallelLIC=YES ) endif() @@ -243,6 +223,7 @@ vcpkg_cmake_configure( # Select modules / groups to install -DVTK_USE_EXTERNAL:BOOL=ON -DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps:BOOL=OFF # Not yet in VCPKG + -DVTK_MODULE_USE_EXTERNAL_VTK_token:BOOL=OFF # Not yet in VCPKG #-DVTK_MODULE_ENABLE_VTK_jsoncpp=YES ${ADDITIONAL_OPTIONS} -DVTK_DEBUG_MODULE_ALL=ON @@ -340,20 +321,21 @@ vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/vtk") ## Files Modules needed by ParaView if("paraview" IN_LIST FEATURES) + ## TODO: Check if this works without it now set(VTK_CMAKE_NEEDED vtkCompilerChecks vtkCompilerPlatformFlags vtkCompilerExtraFlags vtkInitializeBuildType vtkSupportMacros vtkVersion FindPythonModules vtkModuleDebugging vtkExternalData) foreach(module ${VTK_CMAKE_NEEDED}) file(INSTALL "${SOURCE_PATH}/CMake/${module}.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/vtk") endforeach() - ## Check List on UPDATE !! + ## Check List on UPDATE !! (TODO) file(INSTALL "${SOURCE_PATH}/CMake/vtkRequireLargeFilesSupport.cxx" DESTINATION "${CURRENT_PACKAGES_DIR}/share/vtk") file(INSTALL "${SOURCE_PATH}/Rendering/Volume/vtkBlockSortHelper.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}") # this should get installed by VTK file(INSTALL "${SOURCE_PATH}/Filters/ParallelDIY2/vtkDIYKdTreeUtilities.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}") + file(INSTALL "${SOURCE_PATH}/Rendering/ParallelLIC/vtkMPIPixelView.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}") file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Rendering/Parallel/vtkCompositeZPassFS.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}") file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Rendering/OpenGL2/vtkTextureObjectVS.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}") - endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") diff --git a/ports/vtk/pythonwrapper.patch b/ports/vtk/pythonwrapper.patch index 6cdd4162aa099c..215c4ac834ec41 100644 --- a/ports/vtk/pythonwrapper.patch +++ b/ports/vtk/pythonwrapper.patch @@ -2,13 +2,25 @@ diff --git a/CMake/vtkModuleWrapPython.cmake b/CMake/vtkModuleWrapPython.cmake index 5d2c2e1bf..e33a16d68 100644 --- a/CMake/vtkModuleWrapPython.cmake +++ b/CMake/vtkModuleWrapPython.cmake -@@ -152,11 +152,14 @@ function (_vtk_module_wrap_python_sources module sources classes) - set(_vtk_python_genex_compile_definitions - "$") - set(_vtk_python_genex_include_directories - "$") -+ set(_vtk_python_genex_interface_include_directories -+ "$") +@@ -152,23 +152,26 @@ function (_vtk_module_wrap_python_sources module sources classes) + set(_vtk_python_genex_compile_definitions "") + set(_vtk_python_genex_include_directories "") + if (_vtk_python_genex_allowed) + set(_vtk_python_genex_compile_definitions + "$") + set(_vtk_python_genex_include_directories + "$") ++ set(_vtk_python_genex_interface_include_directories ++ "$") + else () + if (NOT DEFINED ENV{CI}) + message(AUTHOR_WARNING + "Python wrapping is not using target-local compile definitions or " + "include directories. This may affect generation of the Python " + "wrapper sources for the ${module} module. Use CMake 3.19+ to " + "guarantee intended behavior.") + endif () + endif () file(GENERATE OUTPUT "${_vtk_python_args_file}" CONTENT "$<$:\n-D\'$\'>\n @@ -17,3 +29,4 @@ index 5d2c2e1bf..e33a16d68 100644 $<$:\n--types \'$\'>\n") set(_vtk_python_sources) + diff --git a/ports/vtk/vcpkg.json b/ports/vtk/vcpkg.json index 79cec81ca488dc..2863e9487c6202 100644 --- a/ports/vtk/vcpkg.json +++ b/ports/vtk/vcpkg.json @@ -1,7 +1,6 @@ { "name": "vtk", - "version-semver": "9.2.0-pv5.11.0", - "port-version": 10, + "version-semver": "9.3.0-pv5.12.0", "description": "Software system for 3D computer graphics, image processing, and visualization", "homepage": "https://github.com/Kitware/VTK", "license": "BSD-3-Clause", @@ -10,6 +9,7 @@ "eigen3", "expat", "exprtk", + "fast-float", "fmt", "freetype", "glew", @@ -181,7 +181,8 @@ "atlmfc" ], "platform": "windows" - } + }, + "openturns" ] }, "python": { diff --git a/ports/vtk/vtkioss.patch b/ports/vtk/vtkioss.patch index 521b2769494fa9..57bf0a7cc13a34 100644 --- a/ports/vtk/vtkioss.patch +++ b/ports/vtk/vtkioss.patch @@ -1,33 +1,3 @@ -diff --git a/IO/IOSS/vtkIOSSReader.cxx b/IO/IOSS/vtkIOSSReader.cxx -index 34218f0a6..226896a9e 100644 ---- a/IO/IOSS/vtkIOSSReader.cxx -+++ b/IO/IOSS/vtkIOSSReader.cxx -@@ -1343,20 +1343,20 @@ Ioss::Region* vtkIOSSReader::vtkInternals::GetRegion(const std::string& dbasenam - { - switch (properties.get(name).get_type()) - { -- case vtkioss_Ioss::Property::BasicType::POINTER: -+ case Ioss::Property::BasicType::POINTER: - vtkLog(TRACE, << name << " : " << properties.get(name).get_pointer()); - break; -- case vtkioss_Ioss::Property::BasicType::INTEGER: -+ case Ioss::Property::BasicType::INTEGER: - vtkLog(TRACE, << name << " : " << std::to_string(properties.get(name).get_int())); - break; -- case vtkioss_Ioss::Property::BasicType::INVALID: -+ case Ioss::Property::BasicType::INVALID: - vtkLog(TRACE, << name << " : " - << "invalid type"); - break; -- case vtkioss_Ioss::Property::BasicType::REAL: -+ case Ioss::Property::BasicType::REAL: - vtkLog(TRACE, << name << " : " << std::to_string(properties.get(name).get_real())); - break; -- case vtkioss_Ioss::Property::BasicType::STRING: -+ case Ioss::Property::BasicType::STRING: - vtkLog(TRACE, << name << " : " << properties.get(name).get_string()); - break; - default: diff --git a/ThirdParty/ioss/CMakeLists.txt b/ThirdParty/ioss/CMakeLists.txt index 3066c4bb5..44e1eb1bf 100644 --- a/ThirdParty/ioss/CMakeLists.txt @@ -41,3 +11,15 @@ index 3066c4bb5..44e1eb1bf 100644 USE_VARIABLES SEACASIoss_INCLUDE_DIRS STANDARD_INCLUDE_DIRS) +diff --git a/IO/IOSS/vtkIOSSReader.cxx b/IO/IOSS/vtkIOSSReader.cxx +index 04de56cb20..b905e84a3e 100644 +--- a/IO/IOSS/vtkIOSSReader.cxx ++++ b/IO/IOSS/vtkIOSSReader.cxx +@@ -61,6 +61,7 @@ + #include VTK_IOSS(Ioss_SideBlock.h) + #include VTK_IOSS(Ioss_SideSet.h) + #include VTK_IOSS(Ioss_StructuredBlock.h) ++#include VTK_IOSS(Iotr_Factory.h) + // clang-format on + + #include diff --git a/ports/vtk/vtkm.patch b/ports/vtk/vtkm.patch index 39d325b5f17f8c..e692abe8e0cd65 100644 --- a/ports/vtk/vtkm.patch +++ b/ports/vtk/vtkm.patch @@ -2,32 +2,26 @@ diff --git a/Accelerators/Vtkm/Core/CMakeLists.txt b/Accelerators/Vtkm/Core/CMak index 397dca9f6..bc9c62ac5 100644 --- a/Accelerators/Vtkm/Core/CMakeLists.txt +++ b/Accelerators/Vtkm/Core/CMakeLists.txt -@@ -16,8 +16,7 @@ - - set(VTKm_NO_DEPRECATED_VIRTUAL ON) - +@@ -1,4 +1,3 @@ -list(INSERT CMAKE_MODULE_PATH 0 - "${VTK_SOURCE_DIR}/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake") +find_package(VTKm CONFIG REQUIRED) set(private_headers - vtkmFilterPolicy.h -@@ -65,9 +64,6 @@ vtkm_add_target_information(${vtkm_accel_target} - EXTENDS_VTKM - MODIFY_CUDA_FLAGS - DEVICE_SOURCES ${sources}) +@@ -31,8 +31,5 @@ vtkm_add_target_information(${vtkm_accel_target} + NOWRAP_HEADERS ${nowrap_headers} + NOWRAP_CLASSES ${nowrap_classes} + PRIVATE_HEADERS ${private_headers}) -vtk_module_set_property(VTK::AcceleratorsVTKmCore - PROPERTY JOB_POOL_COMPILE - VALUE vtkm_pool) - if (TARGET vtkm::kokkos_hip) - list(TRANSFORM nowrap_classes APPEND ".cxx" OUTPUT_VARIABLE hip_impl) + _vtk_module_real_target(vtkm_accel_target VTK::AcceleratorsVTKmCore) diff --git a/Accelerators/Vtkm/DataModel/CMakeLists.txt b/Accelerators/Vtkm/DataModel/CMakeLists.txt index 9d5dfe100..7fea257b7 100644 --- a/Accelerators/Vtkm/DataModel/CMakeLists.txt +++ b/Accelerators/Vtkm/DataModel/CMakeLists.txt -@@ -16,8 +16,7 @@ - +@@ -1,7 +1,6 @@ set(VTKm_NO_DEPRECATED_VIRTUAL ON) -list(INSERT CMAKE_MODULE_PATH 0 @@ -36,23 +30,18 @@ index 9d5dfe100..7fea257b7 100644 set(sources vtkmlib/ArrayConvertersReal.cxx -@@ -72,10 +71,6 @@ vtkm_add_target_information(${vtkm_accel_target} - MODIFY_CUDA_FLAGS - DEVICE_SOURCES ${sources}) - +@@ -40,6 +39,3 @@ vtkm_add_target_information(${vtkm_accel_target} + NOWRAP_CLASSES ${nowrap_classes} + PRIVATE_HEADERS ${private_headers}) -vtk_module_set_property(VTK::AcceleratorsVTKmDataModel - PROPERTY JOB_POOL_COMPILE - VALUE vtkm_pool) -- - if (TARGET vtkm::cuda) - set(cuda_impl ${nowrap_classes} vtkmDataSet.cxx) - set_source_files_properties(${cuda_impl} PROPERTIES + _vtk_module_real_target(vtkm_accel_target VTK::AcceleratorsVTKmDataModel) diff --git a/Accelerators/Vtkm/Filters/CMakeLists.txt b/Accelerators/Vtkm/Filters/CMakeLists.txt index 0f51c436d..567b49197 100644 --- a/Accelerators/Vtkm/Filters/CMakeLists.txt +++ b/Accelerators/Vtkm/Filters/CMakeLists.txt -@@ -16,8 +16,7 @@ - +@@ -1,7 +1,6 @@ set(VTKm_NO_DEPRECATED_VIRTUAL ON) -list(INSERT CMAKE_MODULE_PATH 0 @@ -61,16 +50,14 @@ index 0f51c436d..567b49197 100644 set(classes vtkmAverageToCells -@@ -118,9 +117,6 @@ vtkm_add_target_information(${vtkm_accel_target} - MODIFY_CUDA_FLAGS - DEVICE_SOURCES ${sources}) - +@@ -91,7 +90,4 @@ vtkm_add_target_information(${vtkm_accel_target} + HEADERS ${headers} + CLASSES ${classes}) -vtk_module_set_property(VTK::AcceleratorsVTKmFilters - PROPERTY JOB_POOL_COMPILE - VALUE vtkm_pool) vtk_module_link(VTK::AcceleratorsVTKmFilters PRIVATE - vtkm_worklet diff --git a/CMake/vtk-config.cmake.in b/CMake/vtk-config.cmake.in index a8c40085a..764298f0e 100644 --- a/CMake/vtk-config.cmake.in @@ -90,29 +77,31 @@ diff --git a/ThirdParty/vtkm/CMakeLists.txt b/ThirdParty/vtkm/CMakeLists.txt index 8cfbf92b0..ad78cc8f5 100644 --- a/ThirdParty/vtkm/CMakeLists.txt +++ b/ThirdParty/vtkm/CMakeLists.txt -@@ -1,6 +1,41 @@ +@@ -1,15 +1,34 @@ -vtk_module_third_party_internal( -- LICENSE_FILES "vtkvtkm/vtk-m/LICENSE.txt" -- VERSION "1.7.1" -- SUBDIRECTORY vtkvtkm +- LICENSE_FILES +- "vtkvtkm/vtk-m/LICENSE.txt" +- SPDX_LICENSE_IDENTIFIER +- "BSD-3-Clause" +- SPDX_COPYRIGHT_TEXT +- "Copyright (c) 2014-2023 Kitware Inc., National Technology & Engineering Solutions of Sandia, LLC (NTESS)," +- "UT-Battelle, LLC., Los Alamos National Security, LLC." +- SPDX_DOWNLOAD_LOCATION +- "git+https://gitlab.kitware.com/vtk/vtk-m.git@2.0.0@v2.0.0" +- VERSION +- "2.0.0" +- SUBDIRECTORY vtkvtkm - STANDARD_INCLUDE_DIRS - INTERFACE) -+#vtk_module_third_party_internal( -+# LICENSE_FILES "vtkvtkm/vtk-m/LICENSE.txt" -+# VERSION "master" -+# SUBDIRECTORY vtkvtkm -+# STANDARD_INCLUDE_DIRS -+# INTERFACE) -+ +message(STATUS "VTK_MODULE_USE_EXTERNAL_VTK_vtkm: ${VTK_MODULE_USE_EXTERNAL_VTK_vtkm}") +if(TRUE) + message(STATUS "Searching for external VTKm") + find_package(VTKm CONFIG REQUIRED) -+ if(TARGET vtkm_compiler_flags) -+ get_target_property(VTKm_INCLUDE_DIRS vtkm_compiler_flags INTERFACE_INCLUDE_DIRECTORIES) ++ if(TARGET vtkm::compiler_flags) ++ get_target_property(VTKm_INCLUDE_DIRS vtkm::compiler_flags INTERFACE_INCLUDE_DIRECTORIES) + message(STATUS "INCLUDE: ${VTKm_INCLUDE_DIRS}") -+ get_target_property(VTKm_DIY_INCLUDE_DIRS vtkm_diy INTERFACE_INCLUDE_DIRECTORIES) -+ get_target_property(VTKm_OPTION_INCLUDE_DIRS vtkm_optionparser INTERFACE_INCLUDE_DIRECTORIES) ++ get_target_property(VTKm_DIY_INCLUDE_DIRS vtkm::vtkmdiy INTERFACE_INCLUDE_DIRECTORIES) ++ get_target_property(VTKm_OPTION_INCLUDE_DIRS vtkm::optionparser INTERFACE_INCLUDE_DIRECTORIES) + if(MSVC) + set(VTKm_DEFINITIONS /bigobj) + endif() @@ -134,7 +123,7 @@ index 8cfbf92b0..ad78cc8f5 100644 + INTERFACE + EXTERNAL + PACKAGE VTKm -+ TARGETS vtkm_cont vtkm_filter vtkm_diy vtkm_optionparser vtkm_taotuple ++ TARGETS vtkm::cont vtkm::filter vtkm::vtkmdiy vtkm::optionparser + #LIBRARIES vtkm_cont vtkm_filter vtkm_diy vtkm_optionparser vtkm_taotuple + INCLUDE_DIRS VTKm_INCLUDE_DIRS VTKm_DIY_INCLUDE_DIRS VTKm_OPTION_INCLUDE_DIRS +) @@ -151,3 +140,18 @@ index a8e4dad0f..c7bbbf0e8 100644 +LIBRARY_NAME + VTKm THIRD_PARTY +diff --git a/Accelerators/Vtkm/Filters/CMakeLists.txt b/Accelerators/Vtkm/Filters/CMakeLists.txt +index 7c1b10410c..610bf831fb 100644 +--- a/Accelerators/Vtkm/Filters/CMakeLists.txt ++++ b/Accelerators/Vtkm/Filters/CMakeLists.txt +@@ -91,8 +91,8 @@ vtk_module_add_module(VTK::AcceleratorsVTKmFilters + CLASSES ${classes}) + vtk_module_link(VTK::AcceleratorsVTKmFilters + PRIVATE +- vtkm_worklet +- vtkm_filter) ++ vtkm::worklet ++ vtkm::filter) + vtk_module_definitions(VTK::AcceleratorsVTKmFilters + PUBLIC "VTK_ENABLE_VTKM_OVERRIDES=$") + \ No newline at end of file From 93711b09ffc28e5f052a1ab3f87d3deab12dd5a0 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 4 Mar 2024 10:54:49 +0100 Subject: [PATCH 057/131] update paraview --- ports/paraview/53.diff | 506 ------ ports/paraview/external_vtk.patch | 148 -- ports/paraview/portfile.cmake | 62 +- ports/paraview/python_include.patch | 13 - ports/paraview/python_wrapper.patch | 19 - ports/paraview/qt6-all.patch | 2585 --------------------------- ports/paraview/vcpkg.json | 3 +- 7 files changed, 46 insertions(+), 3290 deletions(-) delete mode 100644 ports/paraview/53.diff delete mode 100644 ports/paraview/external_vtk.patch delete mode 100644 ports/paraview/python_include.patch delete mode 100644 ports/paraview/python_wrapper.patch delete mode 100644 ports/paraview/qt6-all.patch diff --git a/ports/paraview/53.diff b/ports/paraview/53.diff deleted file mode 100644 index 44f4c550fe32cc..00000000000000 --- a/ports/paraview/53.diff +++ /dev/null @@ -1,506 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b3c91500041421328fde0821ef6876c78eef55d6..b4157a3d53407b536b3694b12faa3ed7794fb4c5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,27 +1,20 @@ --if (NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) -- CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12) --endif () -+CMAKE_MINIMUM_REQUIRED(VERSION 3.2) - - PROJECT(QtTesting) - - IF(NOT DEFINED QtTesting_QT_VERSION) -- SET(QtTesting_QT_VERSION "4" CACHE STRING "Expected Qt version") -+ SET(QtTesting_QT_VERSION "5" CACHE STRING "Expected Qt version") - MARK_AS_ADVANCED(QtTesting_QT_VERSION) -- SET_PROPERTY(CACHE QtTesting_QT_VERSION PROPERTY STRINGS 4 5) -+ SET_PROPERTY(CACHE QtTesting_QT_VERSION PROPERTY STRINGS 5 6) - ENDIF() --IF(NOT (QtTesting_QT_VERSION VERSION_EQUAL "4" OR -- QtTesting_QT_VERSION VERSION_EQUAL "5")) -- message(FATAL_ERROR "Expected value for QtTesting_QT_VERSION is either '4' or '5'") -+IF(NOT (QtTesting_QT_VERSION VERSION_EQUAL "5" OR -+ QtTesting_QT_VERSION VERSION_EQUAL "6")) -+ message(FATAL_ERROR "Expected value for QtTesting_QT_VERSION is either '5' or '6'") - ENDIF() - - set(qt_imported_targets) --IF(QtTesting_QT_VERSION VERSION_GREATER "4") -- FIND_PACKAGE(Qt5 REQUIRED COMPONENTS Core Widgets) -- SET(qt_imported_targets Qt5::Core Qt5::Widgets) --ELSE() -- FIND_PACKAGE(Qt4 REQUIRED COMPONENTS QtGui) -- SET(qt_imported_targets Qt4::QtCore Qt4::QtGui) --ENDIF() -+FIND_PACKAGE(Qt${QtTesting_QT_VERSION} REQUIRED COMPONENTS Core Widgets) -+SET(qt_imported_targets Qt${QtTesting_QT_VERSION}::Core Qt${QtTesting_QT_VERSION}::Widgets) - - IF(NOT DEFINED QT_TESTING_WITH_PYTHON) - OPTION(QT_TESTING_WITH_PYTHON "Enable Qt Testing with Python" OFF) -diff --git a/Testing/CMake/qtTestingMacroGenerateMocs.cmake b/Testing/CMake/qtTestingMacroGenerateMocs.cmake -index 4b1f34a4fa5d7e7effb63ae49518e75c47e2598c..953e7402bc269cf3af41914945b194348cfc428a 100644 ---- a/Testing/CMake/qtTestingMacroGenerateMocs.cmake -+++ b/Testing/CMake/qtTestingMacroGenerateMocs.cmake -@@ -19,3 +19,13 @@ macro(QT5_GENERATE_MOCS) - OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${moc_file}) - endforeach() - endmacro() -+ -+ -+macro(QT6_GENERATE_MOCS) -+ foreach(file ${ARGN}) -+ set(moc_file moc_${file}) -+ QT_GENERATE_MOC(${file} ${moc_file}) -+ set_property(SOURCE ${file} APPEND PROPERTY -+ OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${moc_file}) -+ endforeach() -+endmacro() -diff --git a/Testing/Cpp/CMakeLists.txt b/Testing/Cpp/CMakeLists.txt -index fed244434f888af3ba2f4b50609f94d08eebd47b..31e629c990290bb5d4fce52005c1781aebdf3b5a 100644 ---- a/Testing/Cpp/CMakeLists.txt -+++ b/Testing/Cpp/CMakeLists.txt -@@ -1,6 +1,9 @@ - include(../CMake/qtTestingMacroGenerateMocs.cmake) - --IF(QtTesting_QT_VERSION VERSION_GREATER "4") -+IF(QtTesting_QT_VERSION VERSION_GREATER "5") -+ FIND_PACKAGE(Qt6 REQUIRED QUIET COMPONENTS Test) -+ SET(TEST_LIBRARIES Qt6::Test) -+ELSEIF(QtTesting_QT_VERSION VERSION_GREATER "4") - FIND_PACKAGE(Qt5 REQUIRED QUIET COMPONENTS Test) - SET(TEST_LIBRARIES Qt5::Test) - ELSE() -@@ -38,7 +41,10 @@ include_directories( - ${CMAKE_CURRENT_SOURCE_DIR} - ) - --if(QtTesting_QT_VERSION VERSION_GREATER "4") -+if(QtTesting_QT_VERSION VERSION_GREATER "5") -+ QT6_GENERATE_MOCS(${TEST_SOURCES}) -+ QT6_WRAP_CPP( TEST_MOC_SRCS ${TEST_MOC_HEADERS} ) -+elseif(QtTesting_QT_VERSION VERSION_GREATER "4") - QT5_GENERATE_MOCS(${TEST_SOURCES}) - QT5_WRAP_CPP( TEST_MOC_SRCS ${TEST_MOC_HEADERS} ) - else() -diff --git a/pq3DViewEventPlayer.cxx b/pq3DViewEventPlayer.cxx -index 5be26b88d394ee82543b039e2173f7624e960808..3ec526a9033328cc924f02dd4c0ba21f30b9a7de 100644 ---- a/pq3DViewEventPlayer.cxx -+++ b/pq3DViewEventPlayer.cxx -@@ -35,7 +35,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include - #include - #include --#include -+#include - #include - #include - -@@ -53,18 +53,19 @@ bool pq3DViewEventPlayer::playEvent( - { - if (Command == "mousePress" || Command == "mouseRelease" || Command == "mouseMove") - { -- QRegExp mouseRegExp("\\(([^,]*),([^,]*),([^,]),([^,]),([^,]*)\\)"); -- if (mouseRegExp.indexIn(Arguments) != -1) -+ QRegularExpression mouseRegExp("\\(([^,]*),([^,]*),([^,]),([^,]),([^,]*)\\)"); -+ QRegularExpressionMatch match = mouseRegExp.match(Arguments); -+ if (match.hasMatch()) - { -- QVariant v = mouseRegExp.cap(1); -+ QVariant v = match.captured(1); - int x = static_cast(v.toDouble() * widget->size().width()); -- v = mouseRegExp.cap(2); -+ v = match.captured(2); - int y = static_cast(v.toDouble() * widget->size().height()); -- v = mouseRegExp.cap(3); -+ v = match.captured(3); - Qt::MouseButton button = static_cast(v.toInt()); -- v = mouseRegExp.cap(4); -+ v = match.captured(4); - Qt::MouseButtons buttons = static_cast(v.toInt()); -- v = mouseRegExp.cap(5); -+ v = match.captured(5); - Qt::KeyboardModifiers keym = static_cast(v.toInt()); - QEvent::Type type = (Command == "mousePress") - ? QEvent::MouseButtonPress -diff --git a/pq3DViewEventTranslator.cxx b/pq3DViewEventTranslator.cxx -index e42b28ec22ef24f07b5adffb1fb7740df320adf5..17f7b2d9e17a36b926c585f85ce37c1ee21b6eff 100644 ---- a/pq3DViewEventTranslator.cxx -+++ b/pq3DViewEventTranslator.cxx -@@ -71,8 +71,13 @@ bool pq3DViewEventTranslator::translateEvent(QObject* Object, QEvent* Event, boo - if (mouseEvent) - { - QSize size = widget->size(); -+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) -+ double normalized_x = mouseEvent->position().x() / static_cast(size.width()); -+ double normalized_y = mouseEvent->position().y() / static_cast(size.height()); -+#else - double normalized_x = mouseEvent->x() / static_cast(size.width()); - double normalized_y = mouseEvent->y() / static_cast(size.height()); -+#endif - int button = mouseEvent->button(); - int buttons = mouseEvent->buttons(); - int modifiers = mouseEvent->modifiers(); -@@ -88,7 +93,10 @@ bool pq3DViewEventTranslator::translateEvent(QObject* Object, QEvent* Event, boo - QMouseEvent e(QEvent::MouseButtonPress, QPoint(), Qt::MouseButton(), Qt::MouseButtons(), - Qt::KeyboardModifiers()); - -+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) -+ // FIXME: QMouseEvent copy ctor is private in Qt6 - lastMoveEvent = e; -+#endif - return true; - break; - } -@@ -98,10 +106,18 @@ bool pq3DViewEventTranslator::translateEvent(QObject* Object, QEvent* Event, boo - QMouseEvent* mouseEvent = dynamic_cast(Event); - if (mouseEvent) - { -+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) -+ QMouseEvent e(QEvent::MouseMove, -+ QPoint(mouseEvent->position().x(), mouseEvent->position().y()), -+#else - QMouseEvent e(QEvent::MouseMove, QPoint(mouseEvent->x(), mouseEvent->y()), -+#endif - mouseEvent->button(), mouseEvent->buttons(), mouseEvent->modifiers()); - -+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) -+ // FIXME: QMouseEvent copy ctor is private in Qt6 - lastMoveEvent = e; -+#endif - } - return true; - break; -@@ -117,8 +133,13 @@ bool pq3DViewEventTranslator::translateEvent(QObject* Object, QEvent* Event, boo - // record last move event if it is valid - if (lastMoveEvent.type() == QEvent::MouseMove) - { -+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) -+ double normalized_x = lastMoveEvent.position().x() / static_cast(size.width()); -+ double normalized_y = lastMoveEvent.position().y() / static_cast(size.height()); -+#else - double normalized_x = lastMoveEvent.x() / static_cast(size.width()); - double normalized_y = lastMoveEvent.y() / static_cast(size.height()); -+#endif - int button = lastMoveEvent.button(); - int buttons = lastMoveEvent.buttons(); - int modifiers = lastMoveEvent.modifiers(); -@@ -131,8 +152,13 @@ bool pq3DViewEventTranslator::translateEvent(QObject* Object, QEvent* Event, boo - .arg(modifiers)); - } - -+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) -+ double normalized_x = mouseEvent->position().x() / static_cast(size.width()); -+ double normalized_y = mouseEvent->position().y() / static_cast(size.height()); -+#else - double normalized_x = mouseEvent->x() / static_cast(size.width()); - double normalized_y = mouseEvent->y() / static_cast(size.height()); -+#endif - int button = mouseEvent->button(); - int buttons = mouseEvent->buttons(); - int modifiers = mouseEvent->modifiers(); -diff --git a/pqAbstractButtonEventTranslator.cxx b/pqAbstractButtonEventTranslator.cxx -index ad785ec90b564cde7fc5146e8060da8daf0cb459..bdcdced3de5248324b1bcca791026202878000b9 100644 ---- a/pqAbstractButtonEventTranslator.cxx -+++ b/pqAbstractButtonEventTranslator.cxx -@@ -36,6 +36,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include - #include - #include -+#include - #include - #include - #include -diff --git a/pqAbstractItemViewEventPlayer.cxx b/pqAbstractItemViewEventPlayer.cxx -index 95860b099bae0c71b0b37aab980d06eb5d1caf1e..9ab04ae0e954a295b12b910e7e050bafd24555b2 100644 ---- a/pqAbstractItemViewEventPlayer.cxx -+++ b/pqAbstractItemViewEventPlayer.cxx -@@ -48,7 +48,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - /// Converts a string representation of a model index into the real thing - static QModelIndex OldGetIndex(QAbstractItemView& View, const QString& Name) - { -+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) -+ QStringList rows = Name.split('/', Qt::SkipEmptyParts); -+#else - QStringList rows = Name.split('/', QString::SkipEmptyParts); -+#endif - QString column; - - if (rows.size()) -@@ -88,7 +92,11 @@ static QModelIndex GetIndexByItemName(QAbstractItemView& View, const QString& Na - - static QModelIndex GetIndex(QAbstractItemView* View, const QString& Name) - { -+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) -+ QStringList idxs = Name.split('/', Qt::SkipEmptyParts); -+#else - QStringList idxs = Name.split('/', QString::SkipEmptyParts); -+#endif - - QModelIndex index; - for (int i = 0; i != idxs.size(); ++i) -@@ -200,7 +208,8 @@ bool pqAbstractItemViewEventPlayer::playEvent( - if (Command == "mouseWheel") - { - int delta = args[0].toInt(); -- QWheelEvent we(QPoint(x, y), delta, buttons, keym); -+ QWheelEvent we(QPointF(x, y), QPointF(x, y), QPoint(0, 0), QPoint(0, delta), buttons, keym, -+ Qt::NoScrollPhase, false); - QCoreApplication::sendEvent(Object, &we); - return true; - } -diff --git a/pqAbstractItemViewEventPlayerBase.cxx b/pqAbstractItemViewEventPlayerBase.cxx -index 8a523e668e4f8d37caae67787ab15cdd3ef7f9ff..fc52293a226a663f87e59246a60f94815e536900 100644 ---- a/pqAbstractItemViewEventPlayerBase.cxx -+++ b/pqAbstractItemViewEventPlayerBase.cxx -@@ -163,11 +163,12 @@ bool pqAbstractItemViewEventPlayerBase::playEvent( - return false; - } - -- QRegExp regExp1("^([\\d\\.]+),(\\d+)$"); -- if (command == "setCheckState" && regExp1.indexIn(arguments) != -1) -+ QRegularExpression regExp1("^([\\d\\.]+),(\\d+)$"); -+ QRegularExpressionMatch match = regExp1.match(arguments); -+ if (command == "setCheckState" && match.hasMatch()) - { -- QString strIndex = regExp1.cap(1); -- int check_state = regExp1.cap(2).toInt(); -+ QString strIndex = match.captured(1); -+ int check_state = match.captured(2).toInt(); - - QModelIndex index = - pqAbstractItemViewEventPlayerBase::GetIndex(strIndex, abstractItemView, error); -diff --git a/pqAbstractItemViewEventTranslator.cxx b/pqAbstractItemViewEventTranslator.cxx -index b769cca66eab194773d5338171152715181efaa3..07f7b42071582906fcbdbbc149a69773c92b31e6 100644 ---- a/pqAbstractItemViewEventTranslator.cxx -+++ b/pqAbstractItemViewEventTranslator.cxx -@@ -153,11 +153,19 @@ bool pqAbstractItemViewEventTranslator::translateEvent(QObject* Object, QEvent* - if (wheelEvent) - { - QString idxStr; -+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) -+ QModelIndex idx = object->indexAt(wheelEvent->position().toPoint()); -+#else - QModelIndex idx = object->indexAt(wheelEvent->pos()); -+#endif - idxStr = toIndexStr(idx); - QRect r = object->visualRect(idx); -+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) -+ relPt = wheelEvent->position().toPoint() - r.topLeft(); -+#else - relPt = wheelEvent->pos() - r.topLeft(); -- int numStep = wheelEvent->delta() > 0 ? 120 : -120; -+#endif -+ int numStep = wheelEvent->angleDelta().y() > 0 ? 120 : -120; - int buttons = wheelEvent->buttons(); - int modifiers = wheelEvent->modifiers(); - Q_EMIT recordEvent(Object, "mouseWheel", QString("%1,%2,%3,%4,%5") -diff --git a/pqBasicWidgetEventPlayer.cxx b/pqBasicWidgetEventPlayer.cxx -index 27663a340efb87b92fc4ce10ac393238e8925e95..11ac0d577d53b66e7f624354292a70fb26b553d3 100644 ---- a/pqBasicWidgetEventPlayer.cxx -+++ b/pqBasicWidgetEventPlayer.cxx -@@ -83,7 +83,8 @@ bool pqBasicWidgetEventPlayer::playEvent( - if (command == "mouseWheel") - { - int delta = args[0].toInt(); -- QWheelEvent we(QPoint(x, y), delta, buttons, keym); -+ QWheelEvent we(QPoint(x, y), QPoint(x, y), QPoint(0, 0), QPoint(0, delta), buttons, -+ keym, Qt::NoScrollPhase, false); - QCoreApplication::sendEvent(object, &we); - return true; - } -diff --git a/pqBasicWidgetEventTranslator.cxx b/pqBasicWidgetEventTranslator.cxx -index bdbc340cb9714aea681024d24055be113f6b1bd4..57026f6a65408252602765ad6de6771fef58afa8 100644 ---- a/pqBasicWidgetEventTranslator.cxx -+++ b/pqBasicWidgetEventTranslator.cxx -@@ -80,8 +80,13 @@ bool pqBasicWidgetEventTranslator::translateEvent( - .arg(mouseEvent->button()) - .arg(mouseEvent->buttons()) - .arg(mouseEvent->modifiers()) -+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) -+ .arg(mouseEvent->position().x()) -+ .arg(mouseEvent->position().y()); -+#else - .arg(mouseEvent->x()) - .arg(mouseEvent->y()); -+#endif - - if (event->type() != QEvent::MouseButtonRelease) - { -@@ -116,13 +121,18 @@ bool pqBasicWidgetEventTranslator::translateEvent( - { - int buttons = wheelEvent->buttons(); - int modifiers = wheelEvent->modifiers(); -- int numStep = wheelEvent->delta(); -+ int numStep = wheelEvent->angleDelta().y() > 0 ? 120 : -120; - Q_EMIT recordEvent(object, "mouseWheel", QString("%1,%2,%3,%4,%5") - .arg(numStep) - .arg(buttons) - .arg(modifiers) -- .arg(wheelEvent->x()) -- .arg(wheelEvent->y())); -+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) -+ .arg(wheelEvent->position().x()) -+ .arg(wheelEvent->position().y())); -+#else -+ .arg(wheelEvent->pos().x()) -+ .arg(wheelEvent->pos().y())); -+#endif - } - } - return true; -diff --git a/pqEventRecorder.cxx b/pqEventRecorder.cxx -index e20b15ef096a68f5126e387dbfb551a8a5a01c31..8737dfa9fefdbcbe5e9df6dda1621f043e345b69 100644 ---- a/pqEventRecorder.cxx -+++ b/pqEventRecorder.cxx -@@ -192,8 +192,10 @@ void pqEventRecorder::start() - // Set the device - this->Stream.setDevice(this->File); - -+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - // Set UTF8 Codec - this->Stream.setCodec("UTF-8"); -+#endif - - // Set the Stream to the Observer - this->ActiveObserver->setStream(&this->Stream); -diff --git a/pqEventTranslator.cxx b/pqEventTranslator.cxx -index beb7be450741abef46cee21f11f502ecf84f0552..9d9d691848847e47ad2596bea4134e1ccb14665d 100644 ---- a/pqEventTranslator.cxx -+++ b/pqEventTranslator.cxx -@@ -103,7 +103,7 @@ struct pqEventTranslator::pqImplementation - /// Stores the working set of widget translators - QList Translators; - /// Stores the set of objects that should be ignored when translating events -- QMap IgnoredObjects; -+ QMap IgnoredObjects; - - // list of widgets for which mouse propagation will happen - // we'll only translate the first and ignore the rest -@@ -272,7 +272,7 @@ pqEventComment* pqEventTranslator::eventComment() const - } - - // ---------------------------------------------------------------------------- --void pqEventTranslator::ignoreObject(QObject* object, QRegExp commandFilter) -+void pqEventTranslator::ignoreObject(QObject* object, QRegularExpression commandFilter) - { - this->Implementation->IgnoredObjects.insert(object, commandFilter); - } -@@ -353,11 +353,21 @@ bool pqEventTranslator::eventFilter(QObject* object, QEvent* event) - { - // Check it is not the overlay, and it contains the mouse cursor - if (topWidget != this->Implementation->CheckOverlay && -+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) -+ topWidget->geometry().contains( -+ static_cast(event)->globalPosition().toPoint(), true)) -+#else - topWidget->geometry().contains(static_cast(event)->globalPos(), true)) -+#endif - { - // Recover the child widget onder the cursor, if any - QWidget* childWidget = topWidget->childAt( -+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) -+ topWidget->mapFromGlobal( -+ static_cast(event)->globalPosition().toPoint())); -+#else - topWidget->mapFromGlobal(static_cast(event)->globalPos())); -+#endif - - // If child exist, check it is not the overlayed widget and indeed a new widget - if (childWidget == NULL || -@@ -583,7 +593,7 @@ void pqEventTranslator::onRecordEvent( - { - if (this->Implementation->IgnoredObjects.contains(Object)) - { -- QRegExp commandFilter = this->Implementation->IgnoredObjects.value(Object); -+ QRegularExpression commandFilter = this->Implementation->IgnoredObjects.value(Object); - if (Command.contains(commandFilter)) - { - return; -diff --git a/pqEventTranslator.h b/pqEventTranslator.h -index d756bec96f42db4db8e28517a0d610cbef0e1ef4..4b0549f6d794cfeb43ecd6ea2644a5067e25c34d 100644 ---- a/pqEventTranslator.h -+++ b/pqEventTranslator.h -@@ -36,7 +36,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include "QtTestingExport.h" - #include - #include --#include -+#include - - class pqEventComment; - class pqTestUtility; -@@ -92,8 +92,8 @@ public: - /// translating events which command is equivalent to the regexp - /// (useful to prevent recording UI events from being - /// captured as part of the recording) -- void ignoreObject( -- QObject* object, QRegExp commandFilter = QRegExp("*", Qt::CaseInsensitive, QRegExp::Wildcard)); -+ void ignoreObject(QObject* object, QRegularExpression commandFilter = QRegularExpression( -+ "*", QRegularExpression::CaseInsensitiveOption)); - - /// start listening to the GUI and translating events - void start(); -diff --git a/pqObjectNaming.h b/pqObjectNaming.h -index d31b28d4a4f8275232331af860699796c77c2114..5cef1618d431d26f38cf10d2649e2dc5202f737f 100644 ---- a/pqObjectNaming.h -+++ b/pqObjectNaming.h -@@ -38,7 +38,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include "QtTestingExport.h" - - class QObject; -+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - class QStringList; -+#endif - - /// Provides functionality to ensuring that Qt objects can be uniquely identified for recording and - /// playback of regression tests -diff --git a/pqPlayBackEventsDialog.cxx b/pqPlayBackEventsDialog.cxx -index d8b3e9547d146fb68dd6c61942b825ae67cd67ec..ff0ebb926c3f49b29f1bce06fa36c4e65a889b0c 100644 ---- a/pqPlayBackEventsDialog.cxx -+++ b/pqPlayBackEventsDialog.cxx -@@ -350,7 +350,9 @@ void pqPlayBackEventsDialog::onStarted(const QString& filename) - file.open(QIODevice::ReadOnly); - this->Implementation->Ui.logBrowser->append(QString("Start file : %1").arg(infoFile.fileName())); - QTextStream stream(&file); -+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - stream.setCodec("UTF-8"); -+#endif - this->Implementation->Ui.currentFileLabel->setText(infoFile.fileName()); - while (!stream.atEnd()) - { -diff --git a/pqTreeViewEventPlayer.cxx b/pqTreeViewEventPlayer.cxx -index 02199925d018adc0df3a85548a7813aee7f21c84..d541a9cc684be11b0d30f1fdf321d872e8f9a78b 100644 ---- a/pqTreeViewEventPlayer.cxx -+++ b/pqTreeViewEventPlayer.cxx -@@ -63,8 +63,9 @@ bool pqTreeViewEventPlayer::playEvent( - return false; - } - -- QRegExp regExp0("^([\\d\\.]+),(\\d+),(\\d+)$"); -- if (command == "setTreeItemCheckState" && regExp0.indexIn(arguments) != -1) -+ QRegularExpression regExp0("^([\\d\\.]+),(\\d+),(\\d+)$"); -+ QRegularExpressionMatch match = regExp0.match(arguments); -+ if (command == "setTreeItemCheckState" && match.hasMatch()) - { - // legacy command recorded from tree widgets. - QTreeWidget* treeWidget = qobject_cast(object); -@@ -72,11 +73,14 @@ bool pqTreeViewEventPlayer::playEvent( - { - return false; - } -- QString str_index = regExp0.cap(1); -- int column = regExp0.cap(2).toInt(); -- int check_state = regExp0.cap(3).toInt(); -- -+ QString str_index = match.captured(1); -+ int column = match.captured(2).toInt(); -+ int check_state = match.captured(3).toInt(); -+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) -+ QStringList indices = str_index.split(".", Qt::SkipEmptyParts); -+#else - QStringList indices = str_index.split(".", QString::SkipEmptyParts); -+#endif - QTreeWidgetItem* cur_item = NULL; - Q_FOREACH (QString cur_index, indices) - { diff --git a/ports/paraview/external_vtk.patch b/ports/paraview/external_vtk.patch deleted file mode 100644 index 20fa08f77fc0e0..00000000000000 --- a/ports/paraview/external_vtk.patch +++ /dev/null @@ -1,148 +0,0 @@ -diff --git a/CMake/ParaViewOptions.cmake b/CMake/ParaViewOptions.cmake -index 70c771151..14df81490 100644 ---- a/CMake/ParaViewOptions.cmake -+++ b/CMake/ParaViewOptions.cmake -@@ -99,7 +99,7 @@ endif() - #======================================================================== - - # XXX(VTK): External VTK is not yet actually supported. --if (FALSE) -+if (TRUE) - option(PARAVIEW_USE_EXTERNAL_VTK "Use an external VTK." OFF) - mark_as_advanced(PARAVIEW_USE_EXTERNAL_VTK) - else () -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6ee167322..628745584 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -73,7 +73,13 @@ if (NOT CMAKE_INSTALL_LICENSEDIR) - endif () - - set(paraview_cmake_dir "${CMAKE_CURRENT_SOURCE_DIR}/CMake") --set(vtk_cmake_dir "${CMAKE_CURRENT_SOURCE_DIR}/VTK/CMake") -+if (PARAVIEW_USE_EXTERNAL_VTK) -+ find_package(VTK CONFIG REQUIRED) -+ get_filename_component(vtk_cmake_dir "${VTK_CONFIG}" DIRECTORY ) -+else() -+ set(vtk_cmake_dir "${CMAKE_CURRENT_SOURCE_DIR}/VTK/CMake") -+endif() -+ - if (NOT IS_DIRECTORY "${vtk_cmake_dir}") - message(FATAL_ERROR - "Failed to find the VTK CMake directory. Did you forget to initialize the " -@@ -242,9 +246,7 @@ if (PARAVIEW_USE_FORTRAN) - enable_language(Fortran OPTIONAL) - endif () - --if (PARAVIEW_USE_EXTERNAL_VTK) -- find_package(VTK REQUIRED) --else () -+if (NOT PARAVIEW_USE_EXTERNAL_VTK) - list(APPEND CMAKE_MODULE_PATH - "${CMAKE_CURRENT_SOURCE_DIR}/VTK/CMake") - include(vtkCMakeBackports) -@@ -423,9 +425,67 @@ endif () - - if (PARAVIEW_USE_EXTERNAL_VTK) - if (paraview_required_modules OR paraview_unrecognized_modules) -- message(FATAL_ERROR -- "The following modules were requested or required, but not found: " -- "${paraview_required_modules};${paraview_unrecognized_modules}.") -+ foreach(mod ${paraview_required_modules}) -+ if(NOT TARGET ${mod}) -+ list(APPEND modules_notarget ${mod}) -+ endif() -+ if(${mod} MATCHES "VTK::") # For better debugging -+ list(APPEND vtk_modules ${mod}) -+ endif() -+ endforeach() -+ foreach(mod ${paraview_unrecognized_modules}) -+ if(NOT TARGET ${mod}) -+ list(FIND paraview_rejected_modules ${mod} _found_mod) -+ if(_found_mod GREATER_EQUAL 0) -+ list(APPEND _to_remove ${mod}) -+ endif() -+ else() -+ list(APPEND _to_remove ${mod}) -+ #list(APPEND vtk_modules ${mod}) #probably do not need to add unrecognized_modules to the wrapper -+ endif() -+ endforeach() -+ list(REMOVE_ITEM paraview_unrecognized_modules ${_to_remove}) -+ message(STATUS "UNRECOGNIZED:${paraview_unrecognized_modules}") -+ message(STATUS "REJECTED MODULES: ${paraview_rejected_modules}") -+ message(STATUS "UNRECOGNIZED WITHOUT REJECTED AND KNOWN TARGETS: ${paraview_unrecognized_modules}") -+ message(STATUS "ALL PROVIDED MODULES: ${paraview_modules}") -+ set(_unnecessary_moduls ${paraview_modules}) -+ list(REMOVE_ITEM _unnecessary_moduls ${paraview_required_modules}) -+ if(modules_notarget) -+ message(FATAL_ERROR -+ "The following modules were requested or required, but not found: " -+ "${modules_notarget}") -+ endif() -+ list(REMOVE_DUPLICATES vtk_modules) -+ macro(search_dependent_targets) -+ set(vtk_mod_dep_list) -+ foreach(vtk_targ ${ARGN}) -+ get_target_property(vtk_mod_dep ${vtk_targ} "INTERFACE_vtk_module_depends") -+ if(vtk_mod_dep) -+ list(APPEND vtk_mod_dep_list ${vtk_mod_dep}) -+ endif() -+ get_target_property(vtk_mod_pdep ${vtk_targ} "INTERFACE_vtk_module_private_depends") -+ if(vtk_mod_pdep) -+ list(APPEND vtk_mod_dep_list ${vtk_mod_pdep}) -+ endif() -+ get_target_property(vtk_mod_odep ${vtk_targ} "INTERFACE_vtk_module_opional_depends") -+ if(vtk_mod_odep) -+ list(APPEND vtk_mod_dep_list ${vtk_mod_odep}) -+ endif() -+ if(vtk_mod_dep_list) -+ message(STATUS "Target ${vtk_targ} depends on ${vtk_mod_dep_list}") -+ list(REMOVE_ITEM vtk_mod_dep_list ${vtk_modules}) -+ if(vtk_mod_dep_list) -+ message(STATUS "Newly discovered modules: ${vtk_mod_dep_list}") -+ list(APPEND vtk_modules ${vtk_mod_dep_list}) -+ search_dependent_targets(${vtk_mod_dep_list}) -+ else() -+ message(STATUS "No new modules discovered!") -+ endif() -+ endif() -+ endforeach() -+ endmacro() -+ search_dependent_targets(${vtk_modules}) - endif () - - if (PARAVIEW_USE_PYTHON) -@@ -508,7 +574,7 @@ else () - endif() - - # Set up these variables now so that modules may acess them -- if (NOT PARAVIEW_USE_EXTERNAL_VTK AND PARAVIEW_INSTALL_DEVELOPMENT_FILES) -+ if (PARAVIEW_INSTALL_DEVELOPMENT_FILES) - set(vtk_cmake_dir - "${CMAKE_CURRENT_SOURCE_DIR}/VTK/CMake") - set(vtk_cmake_destination -@@ -642,6 +708,9 @@ set(_paraview_add_tests_default_data_directory - set(_paraview_add_tests_default_test_data_target - "ParaViewData") - -+list(REMOVE_DUPLICATES vtk_modules) # Missed this somewhere -+list(REMOVE_DUPLICATES paraview_modules) # probably not needed -+ - vtk_module_build( - MODULES ${paraview_modules} - KITS ${paraview_kits} -@@ -703,9 +772,11 @@ if (PARAVIEW_ENABLE_CATALYST) - endif () - - include(vtkModuleJson) --vtk_module_json( -- MODULES ${vtk_modules} -- OUTPUT "vtk-modules.json") -+if(NOT PARAVIEW_USE_EXTERNAL_VTK) -+ vtk_module_json( -+ MODULES ${vtk_modules} -+ OUTPUT "vtk-modules.json") -+endif() - vtk_module_json( - MODULES ${paraview_modules} - OUTPUT "paraview-modules.json") diff --git a/ports/paraview/portfile.cmake b/ports/paraview/portfile.cmake index 189311d7fe29ab..9b8bc2ab714035 100644 --- a/ports/paraview/portfile.cmake +++ b/ports/paraview/portfile.cmake @@ -1,4 +1,4 @@ -set(VERSION_MAJOR_MINOR 5.11) +set(VERSION_MAJOR_MINOR 5.12) set(plat_feat "") if(VCPKG_TARGET_IS_LINUX) @@ -18,18 +18,44 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES ${plat_feat} ) +vcpkg_download_distfile( + external_vtk_patch + URLS https://gitlab.kitware.com/paraview/paraview/-/merge_requests/6375.diff?full_index=1 + FILENAME paraview_external_vtk_pr.diff + SHA512 c7760599239334817e9cad33ab7019c2dd0ce6740891e10ec15e1d63605ad73095fd7d48aed5ca8d002d25db356a7a5cf2a37188f0b43a7a9fa4c339e8f42adb +) + +set(ext_vtk_patch_copy "${CURRENT_BUILDTREES_DIR}/paraview_external_vtk_pr.diff") +file(COPY "${external_vtk_patch}" DESTINATION "${CURRENT_BUILDTREES_DIR}" ) + +# Remove stuff which cannot be patched since it does not exist +vcpkg_replace_string("${ext_vtk_patch_copy}" +[[ +diff --git a/.gitlab/ci/sccache.sh b/.gitlab/ci/sccache.sh +index f1897d6f719c3b61b6d4fa317966c007dab2fc23..e88d7c89198696832e5645bfb0e758fd5d92e6af 100755 +--- a/.gitlab/ci/sccache.sh ++++ b/.gitlab/ci/sccache.sh +@@ -37,6 +37,6 @@ $shatool --check sccache.sha256sum + mv "$filename" sccache + chmod +x sccache + +-mkdir shortcuts ++mkdir -p shortcuts + cp ./sccache shortcuts/gcc + cp ./sccache shortcuts/g++ +]] +"" +) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Kitware/ParaView - REF 91aaf338c62f77fccd7d197dea05e7a68035ab25 # v5.11.0 - SHA512 ddd72b127462a37dba220808925ab1991b3072ddd3f39ba7f26d260bd5abbaa6bd38a0c0181141f461df60dd718ec85df8c0faffff8e53a6cd1737b784565f4b + REF b701926ba2bd753eff36aec56e36ad4d5ac3168b # v5.12.0 + SHA512 9fbebfa11b60c81deec0df7508a0433a1bced620367477e15314e232d50ba6a6196074d3d701434652cb9a2e0c946159f44e8e16682aa6326a89ebd6caa1f5d9 HEAD_REF master PATCHES - external_vtk.patch - python_include.patch - python_wrapper.patch + ${ext_vtk_patch_copy} add-tools-option.patch - qt6-all.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") @@ -44,8 +70,8 @@ vcpkg_from_gitlab( OUT_SOURCE_PATH VISITIT_SOURCE_PATH GITLAB_URL https://gitlab.kitware.com/ REPO paraview/visitbridge - REF df098f4148a96d62c388861c1d476039e02224ae - SHA512 002c2c934ef7e64c89b1567f406db1ebb90532817062e7016c248ba8ae85a88f1a35bc3963a9577ec08ba742a0e7fb91022c29aaaa0bddf0a1d585074341733e + REF 92ad478e3d6b18b111ef45ab76d6dad5d3530381 + SHA512 c4893929b99419a365e90450f9c6d8a72f30f88aadbfe5c7d23ec4a46e9cf301e0b9c31cd602d1ab717ffb6744ae45abe41cb0e9c1f02b83e4468c702e8d023d PATCHES ${VisItPatches} ) @@ -56,9 +82,8 @@ vcpkg_from_gitlab( OUT_SOURCE_PATH QTTESTING_SOURCE_PATH GITLAB_URL https://gitlab.kitware.com/ REPO paraview/qttesting - REF 08d96e9277bc4c26804fd77ce1b4fa5c791605ae # https://gitlab.kitware.com/paraview/qttesting/-/merge_requests/53 for Qt6 - SHA512 cb4acdfe1206bd8bae4f70185c8ca1ce555cf983a1d1e97293dac544ab13b039638bfe0d1e448f9589db92b6ed23b9b940157e72d9ec9e3994ea9858ab1722ec - PATCHES 53.diff + REF 9d4346485cfce79ad448f7e5656b2525b255b2ca # https://gitlab.kitware.com/paraview/qttesting/-/merge_requests/53 for Qt6 + SHA512 7561cd66e1a12053b7a81ab7a80ad2163922995317a503761521151668a905602fb1bb23c963e18d2739d17aa4187ccf1b4bd1010b0494aab6d4fc004e0e9760 ) vcpkg_from_gitlab( @@ -88,9 +113,13 @@ if("python" IN_LIST FEATURES) #VTK_PYTHON_SITE_PACKAGES_SUFFIX should be set to the install dir of the site-packages endif() +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PARAVIEW_BUILD_SHARED_LIBS) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS ${FEATURE_OPTIONS} + OPTIONS + ${FEATURE_OPTIONS} + -DPARAVIEW_BUILD_SHARED_LIBS=${PARAVIEW_BUILD_SHARED_LIBS} -DPARAVIEW_PLUGIN_DISABLE_XML_DOCUMENTATION:BOOL=ON -DPARAVIEW_BUILD_WITH_EXTERNAL:BOOL=ON -DPARAVIEW_USE_EXTERNAL_VTK:BOOL=ON @@ -168,9 +197,8 @@ foreach(tool ${TOOLS}) endforeach() vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) -# # Handle copyright -file(INSTALL "${SOURCE_PATH}/Copyright.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME Copyright.txt) # Which one is the correct one? -file(INSTALL "${SOURCE_PATH}/License_v1.2.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +# Handle copyright +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/Copyright.txt") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") macro(move_bin_to_lib name) @@ -199,7 +227,7 @@ endif() file(GLOB cmake_files "${CURRENT_PACKAGES_DIR}/share/${PORT}/*.cmake") foreach(file IN LISTS cmake_files) - vcpkg_replace_string("${file}" "pv5.11d.exe" "pv5.11.exe") + vcpkg_replace_string("${file}" "pv${VERSION_MAJOR_MINOR}d.exe" "pv${VERSION_MAJOR_MINOR}.exe") endforeach() # The plugins also work without these files diff --git a/ports/paraview/python_include.patch b/ports/paraview/python_include.patch deleted file mode 100644 index 42ada661bbc56b..00000000000000 --- a/ports/paraview/python_include.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMake/ParaViewOptions.cmake b/CMake/ParaViewOptions.cmake -index 0ecb928e9..5b5459a37 100644 ---- a/CMake/ParaViewOptions.cmake -+++ b/CMake/ParaViewOptions.cmake -@@ -136,7 +136,7 @@ option(PARAVIEW_ENABLE_RAYTRACING "Build ParaView with OSPray and/or OptiX ray-t - - set(paraview_web_default ON) - if (PARAVIEW_USE_PYTHON AND WIN32) -- include("${CMAKE_CURRENT_SOURCE_DIR}/VTK/CMake/FindPythonModules.cmake") -+ include(FindPythonModules) - find_python_module(win32api have_pywin32) - set(paraview_web_default "${have_pywin32}") - endif () diff --git a/ports/paraview/python_wrapper.patch b/ports/paraview/python_wrapper.patch deleted file mode 100644 index 33a70f069acc51..00000000000000 --- a/ports/paraview/python_wrapper.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/CMake/vtkModuleWrapClientServer.cmake b/CMake/vtkModuleWrapClientServer.cmake -index 3804a24e2..91fdd593a 100644 ---- a/CMake/vtkModuleWrapClientServer.cmake -+++ b/CMake/vtkModuleWrapClientServer.cmake -@@ -37,10 +37,13 @@ function (_vtk_module_wrap_client_server_sources module sources classes) - "$") - set(_vtk_client_server_genex_include_directories - "$") -+ set(_vtk_client_server_genex_interface_include_directories -+ "$") - file(GENERATE - OUTPUT "${_vtk_client_server_args_file}" - CONTENT "$<$:\n-D\'$\'>\n --$<$:\n-I\'$\'>\n") -+ $<$:\n-I\'$\'>\n -+ $<$:\n-I\'$\'>\n") - - _vtk_module_get_module_property("${module}" - PROPERTY "hierarchy" diff --git a/ports/paraview/qt6-all.patch b/ports/paraview/qt6-all.patch deleted file mode 100644 index 601ca04a04317d..00000000000000 --- a/ports/paraview/qt6-all.patch +++ /dev/null @@ -1,2585 +0,0 @@ -diff --git a/CMake/ParaViewClient.cmake b/CMake/ParaViewClient.cmake -index be11fe5ae..074823325 100644 ---- a/CMake/ParaViewClient.cmake -+++ b/CMake/ParaViewClient.cmake -@@ -285,7 +285,7 @@ IDI_ICON1 ICON \"${_paraview_client_APPLICATION_ICON}\"\n") - endif () - - include("${_ParaViewClient_cmake_dir}/paraview-find-package-helpers.cmake" OPTIONAL) -- find_package(Qt5 REQUIRED QUIET COMPONENTS Core Widgets) -+ find_package(Qt${VTK_QT_VERSION} REQUIRED QUIET COMPONENTS Core Widgets) - - # CMake 3.13 started using Qt5's version variables to detect what version - # of Qt's tools to run for autorcc. However, they are looked up using the -@@ -294,8 +294,8 @@ IDI_ICON1 ICON \"${_paraview_client_APPLICATION_ICON}\"\n") - - # Fix for 3.13.0–3.13.3. Does not work if `paraview_client_add` is called - # from another function. -- set(Qt5Core_VERSION_MAJOR "${Qt5Core_VERSION_MAJOR}" PARENT_SCOPE) -- set(Qt5Core_VERSION_MINOR "${Qt5Core_VERSION_MINOR}" PARENT_SCOPE) -+ set(Qt${VTK_QT_VERSION}Core_VERSION_MAJOR "${Qt${VTK_QT_VERSION}Core_VERSION_MAJOR}" PARENT_SCOPE) -+ set(Qt${VTK_QT_VERSION}Core_VERSION_MINOR "${Qt${VTK_QT_VERSION}Core_VERSION_MINOR}" PARENT_SCOPE) - # Fix for 3.13.4+. - set_property(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" - PROPERTY -@@ -375,12 +375,12 @@ IDI_ICON1 ICON \"${_paraview_client_APPLICATION_ICON}\"\n") - target_link_libraries("${_paraview_client_NAME}" - PRIVATE - ParaView::pqApplicationComponents -- Qt5::Widgets -+ Qt${VTK_QT_VERSION}::Widgets - VTK::vtksys) - if (PARAVIEW_USE_QTWEBENGINE) -- find_package(Qt5 REQUIRED QUIET COMPONENTS WebEngineWidgets) -+ find_package(Qt${VTK_QT_VERSION} REQUIRED QUIET COMPONENTS WebEngineWidgets) - target_link_libraries("${_paraview_client_NAME}" -- PRIVATE Qt5::WebEngineWidgets) -+ PRIVATE Qt${VTK_QT_VERSION}::WebEngineWidgets) - endif () - - set(_paraview_client_export) -@@ -517,7 +517,7 @@ function (paraview_client_documentation) - endif () - - include("${_ParaViewClient_cmake_dir}/paraview-find-package-helpers.cmake" OPTIONAL) -- find_program(qt_xmlpatterns_executable -+ find_program(qt_xmlpatterns_executable # this only exists in qt5 and the portfile deactivates xml docs - NAMES xmlpatterns-qt5 xmlpatterns - HINTS "${Qt5_DIR}/../../../bin" - "${Qt5_DIR}/../../../libexec/qt5/bin" -@@ -802,7 +802,7 @@ function (paraview_client_generate_help) - endif () - - include("${_ParaViewClient_cmake_dir}/paraview-find-package-helpers.cmake" OPTIONAL) -- find_package(Qt5 QUIET REQUIRED COMPONENTS Help) -+ find_package(Qt${VTK_QT_VERSION} QUIET REQUIRED COMPONENTS Help) - - set(_paraview_client_help_copy_sources) - set(_paraview_client_help_copied_sources) -@@ -843,7 +843,7 @@ function (paraview_client_generate_help) - -P "${_ParaViewClient_script_file}" - VERBATIM - COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} -- $ -+ $ - "${_paraview_client_help_qhp}" - -s - -o "${_paraview_client_help_output}" -diff --git a/CMake/ParaViewPlugin.cmake b/CMake/ParaViewPlugin.cmake -index f349f2cbf..13708a004 100644 ---- a/CMake/ParaViewPlugin.cmake -+++ b/CMake/ParaViewPlugin.cmake -@@ -1331,16 +1331,16 @@ function (paraview_add_plugin name) - list(APPEND _paraview_add_plugin_qt_extra_components - Widgets) - list(APPEND _paraview_add_plugin_required_libraries -- Qt5::Widgets) -+ Qt${VTK_QT_VERSION}::Widgets) - list(APPEND _paraview_add_plugin_ui_sources - ${_paraview_add_plugin_UI_FILES}) - endif () - - if (_paraview_add_plugin_with_ui OR _paraview_add_plugin_with_resources) - include("${_ParaViewPlugin_cmake_dir}/paraview-find-package-helpers.cmake" OPTIONAL) -- find_package(Qt5 QUIET REQUIRED COMPONENTS Core ${_paraview_add_plugin_qt_extra_components}) -+ find_package(Qt${VTK_QT_VERSION} QUIET REQUIRED COMPONENTS Core ${_paraview_add_plugin_qt_extra_components}) - list(APPEND _paraview_add_plugin_required_libraries -- Qt5::Core) -+ Qt${VTK_QT_VERSION}::Core) - if (_paraview_add_plugin_with_ui) - list(APPEND _paraview_add_plugin_required_libraries - ParaView::pqCore) -@@ -1354,15 +1354,15 @@ function (paraview_add_plugin name) - - # Fix for 3.13.0–3.13.3. Does not work if `paraview_add_plugin` is called - # from another function. -- set(Qt5Core_VERSION_MAJOR "${Qt5Core_VERSION_MAJOR}" PARENT_SCOPE) -- set(Qt5Core_VERSION_MINOR "${Qt5Core_VERSION_MINOR}" PARENT_SCOPE) -+ set(Qt${VTK_QT_VERSION}Core_VERSION_MAJOR "${Qt${VTK_QT_VERSION}Core_VERSION_MAJOR}" PARENT_SCOPE) -+ set(Qt${VTK_QT_VERSION}Core_VERSION_MINOR "${Qt${VTK_QT_VERSION}Core_VERSION_MINOR}" PARENT_SCOPE) - # Fix for 3.13.4+. - set_property(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" - PROPERTY -- Qt5Core_VERSION_MAJOR "${Qt5Core_VERSION_MAJOR}") -+ Qt${VTK_QT_VERSION}Core_VERSION_MAJOR "${Qt${VTK_QT_VERSION}Core_VERSION_MAJOR}") - set_property(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" - PROPERTY -- Qt5Core_VERSION_MINOR "${Qt5Core_VERSION_MAJOR}") -+ Qt5Core_VERSION_MINOR "${Qt${VTK_QT_VERSION}Core_VERSION_MAJOR}") - endif () - - set(_paraview_add_plugin_with_python 0) -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 37bd1965c..ef7e7d1eb 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -626,7 +626,7 @@ else () - - set(VTK_BUILD_QT_DESIGNER_PLUGIN OFF) - set(VTK_INSTALL_PYTHON_EXES OFF) -- set(VTK_QT_VERSION 5) -+ set(VTK_QT_VERSION 6) - - cmake_dependent_option(VTK_NO_PYTHON_THREADS "Disable Python Threads support" ON - "PARAVIEW_USE_PYTHON" OFF) -diff --git a/Clients/ParaView/CMakeLists.txt b/Clients/ParaView/CMakeLists.txt -index f51fe395b..bc132c095 100644 ---- a/Clients/ParaView/CMakeLists.txt -+++ b/Clients/ParaView/CMakeLists.txt -@@ -33,7 +33,7 @@ set(sources - ParaViewMainWindow.h - ParaViewMainWindow.ui) - --find_package(Qt5 REQUIRED QUIET COMPONENTS Core Widgets) -+find_package(Qt${VTK_QT_VERSION} REQUIRED QUIET COMPONENTS Core Widgets) - - if (APPLE) - # Enable high resolution when using Qt5 -@@ -76,13 +76,13 @@ paraview_client_add( - PLUGINS_TARGETS ParaView::paraview_plugins - APPLICATION_XMLS ${xmls}) - --find_package(Qt5 REQUIRED QUIET COMPONENTS Widgets) -+find_package(Qt${VTK_QT_VERSION} REQUIRED QUIET COMPONENTS Widgets) - - target_link_libraries(paraview - PRIVATE - ParaView::RemotingSettings -- Qt5::Core -- Qt5::Widgets) -+ Qt${VTK_QT_VERSION}::Core -+ Qt${VTK_QT_VERSION}::Widgets) - - target_compile_definitions(paraview - PRIVATE -diff --git a/Clients/ParaView/Documentation/CMakeLists.txt b/Clients/ParaView/Documentation/CMakeLists.txt -index c8d550f49..c4551367d 100644 ---- a/Clients/ParaView/Documentation/CMakeLists.txt -+++ b/Clients/ParaView/Documentation/CMakeLists.txt -@@ -43,7 +43,7 @@ paraview_client_generate_help( - - set(CMAKE_AUTORCC 1) - --find_package(Qt5 REQUIRED QUIET COMPONENTS Core) -+find_package(Qt${VTK_QT_VERSION} REQUIRED QUIET COMPONENTS Core) - - add_library(vtkParaViewDocumentation STATIC - ParaViewDocumentationInitializer.cxx -@@ -54,7 +54,7 @@ target_include_directories(vtkParaViewDocumentation - "$") - target_link_libraries(vtkParaViewDocumentation - PRIVATE -- Qt5::Core) -+ Qt${VTK_QT_VERSION}::Core) - - install( - FILES "${paraview_qch}" -diff --git a/Examples/CustomApplications/Demo0/CMakeLists.txt b/Examples/CustomApplications/Demo0/CMakeLists.txt -index 9c276bcc6..5a2682577 100644 ---- a/Examples/CustomApplications/Demo0/CMakeLists.txt -+++ b/Examples/CustomApplications/Demo0/CMakeLists.txt -@@ -16,10 +16,10 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}" - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}") - set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}") - --find_package(Qt5 REQUIRED COMPONENTS Widgets) -+find_package(Qt${VTK_QT_VERSION} REQUIRED COMPONENTS Widgets) - - add_executable(DemoApp0 DemoApp0.cxx) - target_link_libraries(DemoApp0 - PRIVATE - ParaView::pqCore -- Qt5::Widgets) -+ Qt${VTK_QT_VERSION}::Widgets) -diff --git a/Examples/CustomApplications/Demo1/CMakeLists.txt b/Examples/CustomApplications/Demo1/CMakeLists.txt -index 4efa3df36..6579a769d 100644 ---- a/Examples/CustomApplications/Demo1/CMakeLists.txt -+++ b/Examples/CustomApplications/Demo1/CMakeLists.txt -@@ -16,7 +16,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}" - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}") - set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}") - --find_package(Qt5 REQUIRED COMPONENTS Widgets) -+find_package(Qt${VTK_QT_VERSION} REQUIRED COMPONENTS Widgets) - - set(CMAKE_AUTOMOC 1) - set(CMAKE_AUTOUIC 1) -@@ -30,4 +30,4 @@ add_executable(DemoApp1 DemoApp1.cxx ${sources}) - target_link_libraries(DemoApp1 - PRIVATE - ParaView::pqApplicationComponents -- Qt5::Widgets) -+ Qt${VTK_QT_VERSION}::Widgets) -diff --git a/Examples/CustomApplications/Demo2/CMakeLists.txt b/Examples/CustomApplications/Demo2/CMakeLists.txt -index ccb4d43b5..3d4ca862a 100644 ---- a/Examples/CustomApplications/Demo2/CMakeLists.txt -+++ b/Examples/CustomApplications/Demo2/CMakeLists.txt -@@ -16,7 +16,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}" - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}") - set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}") - --find_package(Qt5 REQUIRED COMPONENTS Widgets) -+find_package(Qt${VTK_QT_VERSION} REQUIRED COMPONENTS Widgets) - - set(CMAKE_AUTOMOC 1) - set(CMAKE_AUTOUIC 1) -@@ -30,6 +30,6 @@ add_executable(DemoApp2 DemoApp2.cxx ${sources}) - target_link_libraries(DemoApp2 - PRIVATE - ParaView::pqApplicationComponents -- Qt5::Widgets) -+ Qt${VTK_QT_VERSION}::Widgets) - - configure_file(ParaViewFilters.xml ${CMAKE_BINARY_DIR} COPYONLY) -diff --git a/Examples/Plugins/DockWidget/Plugin/CMakeLists.txt b/Examples/Plugins/DockWidget/Plugin/CMakeLists.txt -index d4c87afe1..96b5540ba 100644 ---- a/Examples/Plugins/DockWidget/Plugin/CMakeLists.txt -+++ b/Examples/Plugins/DockWidget/Plugin/CMakeLists.txt -@@ -1,4 +1,4 @@ --find_package(Qt5 REQUIRED COMPONENTS Widgets) -+find_package(Qt${VTK_QT_VERSION} REQUIRED COMPONENTS Widgets) - - set(interfaces) - set(sources -@@ -29,4 +29,4 @@ paraview_add_plugin(ExampleDockPanel - - target_link_libraries(ExampleDockPanel - PRIVATE -- Qt5::Widgets) -+ Qt${VTK_QT_VERSION}::Widgets) -diff --git a/Examples/Plugins/RepresentationBehavior/CMakeLists.txt b/Examples/Plugins/RepresentationBehavior/CMakeLists.txt -index b4d65f22a..0dfee987e 100644 ---- a/Examples/Plugins/RepresentationBehavior/CMakeLists.txt -+++ b/Examples/Plugins/RepresentationBehavior/CMakeLists.txt -@@ -17,7 +17,7 @@ if(NOT DEFINED CMAKE_MACOSX_RPATH) - set(CMAKE_MACOSX_RPATH 0) - endif() - --QT5_WRAP_CPP(MOC_SRCS -+QT${VTK_QT_VERSION}_WRAP_CPP(MOC_SRCS - pqRepresentationBehaviorStarter.h - pqSurfaceRepresentationBehavior.h) - -diff --git a/Plugins/CAVEInteraction/CMakeLists.txt b/Plugins/CAVEInteraction/CMakeLists.txt -index de862c006..ac214e9c4 100644 ---- a/Plugins/CAVEInteraction/CMakeLists.txt -+++ b/Plugins/CAVEInteraction/CMakeLists.txt -@@ -1,4 +1,4 @@ --find_package(Qt5 QUIET REQUIRED COMPONENTS Network) -+find_package(Qt${VTK_QT_VERSION} QUIET REQUIRED COMPONENTS Network) - - list(INSERT CMAKE_MODULE_PATH 0 - "${CMAKE_CURRENT_SOURCE_DIR}/cmake") -@@ -8,7 +8,7 @@ mark_as_advanced(PARAVIEW_PLUGIN_CAVEInteraction_USE_VRPN) - option(PARAVIEW_PLUGIN_CAVEInteraction_USE_VRUI "Build CAVEInteraction plugin with VRUI support" OFF) - mark_as_advanced(PARAVIEW_PLUGIN_CAVEInteraction_USE_VRUI) - --find_package(Qt5 REQUIRED COMPONENTS Network) -+find_package(Qt${VTK_QT_VERSION} REQUIRED COMPONENTS Network) - - # TODO: Should something be done with the files in samples/? - -@@ -132,7 +132,7 @@ target_link_libraries(CAVEInteraction - VTK::CommonMath - VTK::CommonTransforms - VTK::RenderingCore -- Qt5::Network) -+ Qt${VTK_QT_VERSION}::Network) - target_compile_definitions(CAVEInteraction PRIVATE QT_NO_KEYWORDS) - - if (PARAVIEW_PLUGIN_CAVEInteraction_USE_VRPN) -diff --git a/Plugins/LagrangianParticleTracker/pqIntegrationModelSeedHelperWidget.cxx b/Plugins/LagrangianParticleTracker/pqIntegrationModelSeedHelperWidget.cxx -index 1b5134345..3660a5867 100644 ---- a/Plugins/LagrangianParticleTracker/pqIntegrationModelSeedHelperWidget.cxx -+++ b/Plugins/LagrangianParticleTracker/pqIntegrationModelSeedHelperWidget.cxx -@@ -119,7 +119,7 @@ void pqIntegrationModelSeedHelperWidget::resetSeedWidget(bool force) - - // Create main layout - QGridLayout* gridLayout = new QGridLayout(this); -- gridLayout->setMargin(pqPropertiesPanel::suggestedMargin()); -+ gridLayout->setContentsMargins(pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin()); - gridLayout->setHorizontalSpacing(pqPropertiesPanel::suggestedHorizontalSpacing()); - gridLayout->setVerticalSpacing(pqPropertiesPanel::suggestedVerticalSpacing()); - gridLayout->setColumnStretch(0, 0); -@@ -143,7 +143,7 @@ void pqIntegrationModelSeedHelperWidget::resetSeedWidget(bool force) - - // Add a layout in each - QGridLayout* gbLayout = new QGridLayout(gb); -- gbLayout->setMargin(pqPropertiesPanel::suggestedMargin()); -+ gbLayout->setContentsMargins(pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin()); - gbLayout->setHorizontalSpacing(pqPropertiesPanel::suggestedHorizontalSpacing()); - gbLayout->setVerticalSpacing(pqPropertiesPanel::suggestedVerticalSpacing()); - gb->setLayout(gbLayout); -diff --git a/Plugins/PythonQtPlugin/CMakeLists.txt b/Plugins/PythonQtPlugin/CMakeLists.txt -index 928b48e14..c6e0d4c71 100644 ---- a/Plugins/PythonQtPlugin/CMakeLists.txt -+++ b/Plugins/PythonQtPlugin/CMakeLists.txt -@@ -1,4 +1,4 @@ --find_package(Qt5 QUIET REQUIRED COMPONENTS Widgets) -+find_package(Qt${VTK_QT_VERSION} QUIET REQUIRED COMPONENTS Widgets) - - list(INSERT CMAKE_MODULE_PATH 0 - "${CMAKE_CURRENT_SOURCE_DIR}/cmake") -diff --git a/Plugins/XRInterface/Plugin/CMakeLists.txt b/Plugins/XRInterface/Plugin/CMakeLists.txt -index b116e880c..4f1964d31 100644 ---- a/Plugins/XRInterface/Plugin/CMakeLists.txt -+++ b/Plugins/XRInterface/Plugin/CMakeLists.txt -@@ -1,4 +1,4 @@ --find_package(Qt5 REQUIRED COMPONENTS Widgets Network) -+find_package(Qt${VTK_QT_VERSION} REQUIRED COMPONENTS Widgets Network) - - set(required_modules "") - set(openxr_support FALSE) -diff --git a/Plugins/XRInterface/Plugin/Representations/CMakeLists.txt b/Plugins/XRInterface/Plugin/Representations/CMakeLists.txt -index bd45f6142..f8336705b 100644 ---- a/Plugins/XRInterface/Plugin/Representations/CMakeLists.txt -+++ b/Plugins/XRInterface/Plugin/Representations/CMakeLists.txt -@@ -6,13 +6,13 @@ set(sources) - set(xrInterfaceXMLs XRInterfaceRepresentations.xml) - - if (TARGET VTK::RenderingFFMPEGOpenGL2) -- find_package(Qt5 REQUIRED QUIET COMPONENTS Multimedia) -+ find_package(Qt${VTK_QT_VERSION} REQUIRED QUIET COMPONENTS Multimedia) - list(APPEND classes vtkSkyboxMovieRepresentation) - list(APPEND xrInterfaceXMLs XRInterfaceSkyboxMovieRepresentation.xml) - endif() - - if (PARAVIEW_USE_QTWEBENGINE) -- find_package(Qt5 REQUIRED QUIET COMPONENTS WebEngineWidgets Multimedia) -+ find_package(Qt${VTK_QT_VERSION} REQUIRED QUIET COMPONENTS WebEngineWidgets Multimedia) - list(APPEND sources vtkXRInterfaceWebView.ui) - list(APPEND classes - vtkXRInterfaceWebView -diff --git a/Qt/ApplicationComponents/CMakeLists.txt b/Qt/ApplicationComponents/CMakeLists.txt -index 6aa659fc6..3968b2951 100644 ---- a/Qt/ApplicationComponents/CMakeLists.txt -+++ b/Qt/ApplicationComponents/CMakeLists.txt -@@ -320,7 +320,7 @@ if (PARAVIEW_USE_QTHELP) - endif () - - vtk_module_find_package( -- PACKAGE Qt5 -+ PACKAGE Qt${VTK_QT_VERSION} - COMPONENTS ${qt_components}) - - source_group("Resources" FILES -@@ -339,12 +339,12 @@ vtk_module_add_module(ParaView::pqApplicationComponents - ${resource_files}) - vtk_module_link(ParaView::pqApplicationComponents - PRIVATE -- Qt5::Widgets -- Qt5::Svg -- Qt5::Network) -+ Qt${VTK_QT_VERSION}::Widgets -+ Qt${VTK_QT_VERSION}::Svg -+ Qt${VTK_QT_VERSION}::Network) - vtk_module_definitions(ParaView::pqApplicationComponents PRIVATE QT_NO_KEYWORDS) - if (PARAVIEW_USE_QTHELP) - vtk_module_link(ParaView::pqApplicationComponents - PRIVATE -- Qt5::Help) -+ Qt${VTK_QT_VERSION}::Help) - endif () -diff --git a/Qt/ApplicationComponents/pqBackgroundEditorWidget.cxx b/Qt/ApplicationComponents/pqBackgroundEditorWidget.cxx -index 1175a05ec..a2c1ced09 100644 ---- a/Qt/ApplicationComponents/pqBackgroundEditorWidget.cxx -+++ b/Qt/ApplicationComponents/pqBackgroundEditorWidget.cxx -@@ -83,12 +83,12 @@ public: - : PreviousType(SINGLE_COLOR_TYPE) - { - this->setupUi(self); -- this->mainLayout->setMargin(pqPropertiesPanel::suggestedMargin()); -+ this->mainLayout->setContentsMargins(pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin()); - this->mainLayout->setSpacing(pqPropertiesPanel::suggestedVerticalSpacing()); -- this->page1Layout->setMargin(pqPropertiesPanel::suggestedMargin()); -+ this->page1Layout->setContentsMargins(pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin()); - this->page1Layout->setHorizontalSpacing(pqPropertiesPanel::suggestedHorizontalSpacing()); - this->page1Layout->setVerticalSpacing(pqPropertiesPanel::suggestedVerticalSpacing()); -- this->page3Layout->setMargin(pqPropertiesPanel::suggestedMargin()); -+ this->page3Layout->setContentsMargins(pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin()); - this->page3Layout->setSpacing(pqPropertiesPanel::suggestedVerticalSpacing()); - } - }; -diff --git a/Qt/ApplicationComponents/pqCameraManipulatorWidget.cxx b/Qt/ApplicationComponents/pqCameraManipulatorWidget.cxx -index 7652f666a..26234257d 100644 ---- a/Qt/ApplicationComponents/pqCameraManipulatorWidget.cxx -+++ b/Qt/ApplicationComponents/pqCameraManipulatorWidget.cxx -@@ -120,7 +120,7 @@ pqCameraManipulatorWidget::pqCameraManipulatorWidget( - ui.setupUi(this); - ui.gridLayout->setVerticalSpacing(pqPropertiesPanel::suggestedVerticalSpacing()); - ui.gridLayout->setHorizontalSpacing(pqPropertiesPanel::suggestedHorizontalSpacing()); -- ui.gridLayout->setMargin(0); -+ ui.gridLayout->setContentsMargins(0,0,0,0); - - QPointer* boxes = this->Internals->Boxes; - boxes[0] = ui.comboBox_1; -diff --git a/Qt/ApplicationComponents/pqCheckableProperty.cxx b/Qt/ApplicationComponents/pqCheckableProperty.cxx -index 800897b28..496bf09d6 100644 ---- a/Qt/ApplicationComponents/pqCheckableProperty.cxx -+++ b/Qt/ApplicationComponents/pqCheckableProperty.cxx -@@ -75,7 +75,7 @@ pqCheckableProperty::pqCheckableProperty( - this->setChangeAvailableAsChangeFinished(true); - - auto* layoutLocal = new QHBoxLayout; -- layoutLocal->setMargin(pqPropertiesPanel::suggestedMargin()); -+ layoutLocal->setContentsMargins(pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin()); - layoutLocal->setSpacing(pqPropertiesPanel::suggestedHorizontalSpacing()); - this->setLayout(layoutLocal); - -diff --git a/Qt/ApplicationComponents/pqColorAnnotationsWidget.cxx b/Qt/ApplicationComponents/pqColorAnnotationsWidget.cxx -index df78e888a..8e99a70f7 100644 ---- a/Qt/ApplicationComponents/pqColorAnnotationsWidget.cxx -+++ b/Qt/ApplicationComponents/pqColorAnnotationsWidget.cxx -@@ -218,10 +218,10 @@ public: - { - this->SetCurrentPresetName(""); - this->Ui.setupUi(self); -- this->Ui.gridLayout->setMargin(pqPropertiesPanel::suggestedMargin()); -+ this->Ui.gridLayout->setContentsMargins(pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin()); - this->Ui.gridLayout->setVerticalSpacing(pqPropertiesPanel::suggestedVerticalSpacing()); - this->Ui.gridLayout->setHorizontalSpacing(pqPropertiesPanel::suggestedHorizontalSpacing()); -- this->Ui.verticalLayout->setMargin(pqPropertiesPanel::suggestedMargin()); -+ this->Ui.verticalLayout->setContentsMargins(pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin()); - this->Ui.verticalLayout->setSpacing(pqPropertiesPanel::suggestedVerticalSpacing()); - - this->Model = new pqAnnotationsModel(self); -diff --git a/Qt/ApplicationComponents/pqColorEditorPropertyWidget.cxx b/Qt/ApplicationComponents/pqColorEditorPropertyWidget.cxx -index 8229bd33c..1ba99001c 100644 ---- a/Qt/ApplicationComponents/pqColorEditorPropertyWidget.cxx -+++ b/Qt/ApplicationComponents/pqColorEditorPropertyWidget.cxx -@@ -62,7 +62,7 @@ pqColorEditorPropertyWidget::pqColorEditorPropertyWidget(vtkSMProxy* smProxy, QW - - Ui::ColorEditorPropertyWidget& Ui = this->Internals->Ui; - Ui.setupUi(this); -- Ui.gridLayout->setMargin(pqPropertiesPanel::suggestedMargin()); -+ Ui.gridLayout->setContentsMargins(pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin()); - Ui.gridLayout->setHorizontalSpacing(pqPropertiesPanel::suggestedHorizontalSpacing()); - Ui.gridLayout->setVerticalSpacing(pqPropertiesPanel::suggestedVerticalSpacing()); - -diff --git a/Qt/ApplicationComponents/pqColorMapEditor.cxx b/Qt/ApplicationComponents/pqColorMapEditor.cxx -index f3026bec2..8b518d781 100644 ---- a/Qt/ApplicationComponents/pqColorMapEditor.cxx -+++ b/Qt/ApplicationComponents/pqColorMapEditor.cxx -@@ -79,7 +79,7 @@ public: - this->Ui.setupUi(self); - - QVBoxLayout* vbox = new QVBoxLayout(this->Ui.PropertiesFrame); -- vbox->setMargin(0); -+ vbox->setContentsMargins(0,0,0,0); - vbox->setSpacing(0); - } - -diff --git a/Qt/ApplicationComponents/pqColorOpacityEditorWidget.cxx b/Qt/ApplicationComponents/pqColorOpacityEditorWidget.cxx -index a14d8bd01..b082339dd 100644 ---- a/Qt/ApplicationComponents/pqColorOpacityEditorWidget.cxx -+++ b/Qt/ApplicationComponents/pqColorOpacityEditorWidget.cxx -@@ -232,7 +232,7 @@ public: - , SignalsBlocker(new pqSignalsBlocker(self)) - { - this->Ui.setupUi(self); -- this->Ui.mainLayout->setMargin(pqPropertiesPanel::suggestedMargin()); -+ this->Ui.mainLayout->setContentsMargins(pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin()); - - this->Decorator = new pqColorOpacityEditorWidgetDecorator(nullptr, self); - -diff --git a/Qt/ApplicationComponents/pqColorPaletteSelectorWidget.cxx b/Qt/ApplicationComponents/pqColorPaletteSelectorWidget.cxx -index abab44ca3..36d0a2adb 100644 ---- a/Qt/ApplicationComponents/pqColorPaletteSelectorWidget.cxx -+++ b/Qt/ApplicationComponents/pqColorPaletteSelectorWidget.cxx -@@ -55,7 +55,7 @@ pqColorPaletteSelectorWidget::pqColorPaletteSelectorWidget( - - QVBoxLayout* vbox = new QVBoxLayout(this); - vbox->setSpacing(0); -- vbox->setMargin(0); -+ vbox->setContentsMargins(0,0,0,0); - - vtkSMSessionProxyManager* pxm = smproxy->GetSessionProxyManager(); - vtkSMProxyDefinitionManager* pdmgr = pxm->GetProxyDefinitionManager(); -@@ -91,7 +91,7 @@ pqColorPaletteSelectorWidget::pqColorPaletteSelectorWidget( - if (std::find(mainPalettes.cbegin(), mainPalettes.cend(), iter->GetProxyName()) == - mainPalettes.cend()) - { -- cbbox->addItem(prototype->GetXMLLabel(), prototype->GetXMLName()); -+ cbbox->addItem(prototype->GetXMLLabel(), QString(prototype->GetXMLName())); - } - } - -diff --git a/Qt/ApplicationComponents/pqColorSelectorPropertyWidget.cxx b/Qt/ApplicationComponents/pqColorSelectorPropertyWidget.cxx -index 14b743090..448fe3c87 100644 ---- a/Qt/ApplicationComponents/pqColorSelectorPropertyWidget.cxx -+++ b/Qt/ApplicationComponents/pqColorSelectorPropertyWidget.cxx -@@ -50,7 +50,7 @@ pqColorSelectorPropertyWidget::pqColorSelectorPropertyWidget( - - QVBoxLayout* vbox = new QVBoxLayout(this); - vbox->setSpacing(0); -- vbox->setMargin(0); -+ vbox->setContentsMargins(0,0,0,0); - - if (useDocumentationForLabels) - { -diff --git a/Qt/ApplicationComponents/pqCommandButtonPropertyWidget.cxx b/Qt/ApplicationComponents/pqCommandButtonPropertyWidget.cxx -index 12d36484b..eba09f8ab 100644 ---- a/Qt/ApplicationComponents/pqCommandButtonPropertyWidget.cxx -+++ b/Qt/ApplicationComponents/pqCommandButtonPropertyWidget.cxx -@@ -48,7 +48,7 @@ pqCommandButtonPropertyWidget::pqCommandButtonPropertyWidget( - { - QVBoxLayout* l = new QVBoxLayout; - l->setSpacing(0); -- l->setMargin(0); -+ l->setContentsMargins(0,0,0,0); - - QPushButton* button = new QPushButton(proxyProperty->GetXMLLabel()); - connect(button, SIGNAL(clicked()), this, SLOT(buttonClicked())); -diff --git a/Qt/ApplicationComponents/pqCommandLineOptionsBehavior.cxx b/Qt/ApplicationComponents/pqCommandLineOptionsBehavior.cxx -index 8801d1477..461da4bcf 100644 ---- a/Qt/ApplicationComponents/pqCommandLineOptionsBehavior.cxx -+++ b/Qt/ApplicationComponents/pqCommandLineOptionsBehavior.cxx -@@ -67,7 +67,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include - #include - #include --#include -+#include - #include - #include - -@@ -152,7 +152,7 @@ void pqCommandLineOptionsBehavior::processServerConnection() - if (serverURL.indexOf('|') != -1) - { - // We should connect multiple times -- const QStringList urls = serverURL.split(QRegExp("\\|"), PV_QT_SKIP_EMPTY_PARTS); -+ const QStringList urls = serverURL.split(QRegularExpression("\\|"), PV_QT_SKIP_EMPTY_PARTS); - for (const QString& url : urls) - { - if (!pqServerConnectReaction::connectToServer(pqServerResource(url), false)) -diff --git a/Qt/ApplicationComponents/pqCustomizeShortcutsDialog.cxx b/Qt/ApplicationComponents/pqCustomizeShortcutsDialog.cxx -index 74dfea1ec..f6cfa8f59 100644 ---- a/Qt/ApplicationComponents/pqCustomizeShortcutsDialog.cxx -+++ b/Qt/ApplicationComponents/pqCustomizeShortcutsDialog.cxx -@@ -41,6 +41,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include - #include - #include -+#include - - namespace - { -@@ -432,9 +433,9 @@ pqCustomizeShortcutsDialog::pqCustomizeShortcutsDialog(QWidget* parentObject) - connect(this->Internals->Ui.recordButton, &QAbstractButton::clicked, this, - [this]() { this->Internals->Ui.keySequenceEdit->setFocus(); }); - connect(this->Internals->Ui.searchBox, &pqSearchBox::textChanged, this, [this]() { -- QRegExp regex(this->Internals->Ui.searchBox->text(), Qt::CaseInsensitive); -+ QRegularExpression regex(this->Internals->Ui.searchBox->text(), QRegularExpression::CaseInsensitiveOption); - -- this->Internals->FilterModel->setFilterRegExp(regex); -+ this->Internals->FilterModel->setFilterRegularExpression(regex); - this->Internals->Ui.treeView->expandAll(); - }); - this->setWindowTitle("Customize Shortcuts"); -diff --git a/Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx b/Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx -index 9f7d66617..307ad5a68 100644 ---- a/Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx -+++ b/Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx -@@ -64,7 +64,7 @@ pqDoubleRangeSliderPropertyWidget::pqDoubleRangeSliderPropertyWidget( - Ui::DoubleRangeSliderPropertyWidget& ui = this->Internals->Ui; - ui.setupUi(this); - -- ui.gridLayout->setMargin(pqPropertiesPanel::suggestedMargin()); -+ ui.gridLayout->setContentsMargins(pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin()); - ui.gridLayout->setVerticalSpacing(pqPropertiesPanel::suggestedVerticalSpacing()); - ui.gridLayout->setHorizontalSpacing(pqPropertiesPanel::suggestedHorizontalSpacing()); - -diff --git a/Qt/ApplicationComponents/pqEqualizerPropertyWidget.cxx b/Qt/ApplicationComponents/pqEqualizerPropertyWidget.cxx -index 584f79db1..50ce1160a 100644 ---- a/Qt/ApplicationComponents/pqEqualizerPropertyWidget.cxx -+++ b/Qt/ApplicationComponents/pqEqualizerPropertyWidget.cxx -@@ -66,7 +66,7 @@ pqEqualizerPropertyWidget::pqEqualizerPropertyWidget( - - // Setup GUI - QGridLayout* layout = new QGridLayout(this); -- layout->setMargin(pqPropertiesPanel::suggestedMargin()); -+ layout->setContentsMargins(pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin()); - layout->setVerticalSpacing(pqPropertiesPanel::suggestedVerticalSpacing()); - layout->setHorizontalSpacing(pqPropertiesPanel::suggestedHorizontalSpacing()); - -diff --git a/Qt/ApplicationComponents/pqFileNamePropertyWidget.cxx b/Qt/ApplicationComponents/pqFileNamePropertyWidget.cxx -index 9acba56a2..5b4b344cb 100644 ---- a/Qt/ApplicationComponents/pqFileNamePropertyWidget.cxx -+++ b/Qt/ApplicationComponents/pqFileNamePropertyWidget.cxx -@@ -73,7 +73,7 @@ pqFileNamePropertyWidget::pqFileNamePropertyWidget( - } - - QHBoxLayout* layoutLocal = new QHBoxLayout; -- layoutLocal->setMargin(0); -+ layoutLocal->setContentsMargins(0,0,0,0); - layoutLocal->setSpacing(pqPropertiesPanel::suggestedHorizontalSpacing()); - - QLineEdit* lineEdit = new pqLineEdit(this); -diff --git a/Qt/ApplicationComponents/pqFindDataWidget.cxx b/Qt/ApplicationComponents/pqFindDataWidget.cxx -index 1f4ec82d1..3f310489e 100644 ---- a/Qt/ApplicationComponents/pqFindDataWidget.cxx -+++ b/Qt/ApplicationComponents/pqFindDataWidget.cxx -@@ -272,7 +272,7 @@ pqFindDataWidget::pqFindDataWidget(QWidget* parentObject) - { - auto& internals = (*this->Internals); - internals.Ui.setupUi(this); -- internals.Ui.verticalLayout->setMargin(pqPropertiesPanel::suggestedMargin()); -+ internals.Ui.verticalLayout->setContentsMargins(pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin()); - internals.Ui.verticalLayout->setSpacing(pqPropertiesPanel::suggestedVerticalSpacing()); - - // change the findData button palette so it is green when it is enabled. -diff --git a/Qt/ApplicationComponents/pqFontPropertyWidget.cxx b/Qt/ApplicationComponents/pqFontPropertyWidget.cxx -index 156e39160..5481e1d2d 100644 ---- a/Qt/ApplicationComponents/pqFontPropertyWidget.cxx -+++ b/Qt/ApplicationComponents/pqFontPropertyWidget.cxx -@@ -50,7 +50,7 @@ public: - pqInternals(pqFontPropertyWidget* self) - { - this->Ui.setupUi(self); -- this->Ui.mainLayout->setMargin(pqPropertiesPanel::suggestedMargin()); -+ this->Ui.mainLayout->setContentsMargins(pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin()); - this->Ui.mainLayout->setSpacing(pqPropertiesPanel::suggestedHorizontalSpacing()); - } - -diff --git a/Qt/ApplicationComponents/pqListPropertyWidget.cxx b/Qt/ApplicationComponents/pqListPropertyWidget.cxx -index df1f8d616..c42d70e55 100644 ---- a/Qt/ApplicationComponents/pqListPropertyWidget.cxx -+++ b/Qt/ApplicationComponents/pqListPropertyWidget.cxx -@@ -94,7 +94,7 @@ pqListPropertyWidget::pqListPropertyWidget( - this->TableWidget->setHorizontalHeaderLabels(headerLabels); - - QHBoxLayout* hbox = new QHBoxLayout(this); -- hbox->setMargin(0); -+ hbox->setContentsMargins(0,0,0,0); - hbox->setSpacing(0); - hbox->addWidget(this->TableWidget); - -diff --git a/Qt/ApplicationComponents/pqLoadDataReaction.cxx b/Qt/ApplicationComponents/pqLoadDataReaction.cxx -index b9d348c62..b056c0888 100644 ---- a/Qt/ApplicationComponents/pqLoadDataReaction.cxx -+++ b/Qt/ApplicationComponents/pqLoadDataReaction.cxx -@@ -55,6 +55,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include - #include - #include -+#include - - #include - -diff --git a/Qt/ApplicationComponents/pqLoadDataReaction.h b/Qt/ApplicationComponents/pqLoadDataReaction.h -index 5a3f81fcc..0ac81f1ee 100644 ---- a/Qt/ApplicationComponents/pqLoadDataReaction.h -+++ b/Qt/ApplicationComponents/pqLoadDataReaction.h -@@ -35,8 +35,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include "pqReaction.h" - - #include -+#include - --class QStringList; - class pqPipelineSource; - class pqServer; - class vtkSMReaderFactory; -diff --git a/Qt/ApplicationComponents/pqMoleculePropertyWidget.cxx b/Qt/ApplicationComponents/pqMoleculePropertyWidget.cxx -index 1f788de5f..c8a85d436 100644 ---- a/Qt/ApplicationComponents/pqMoleculePropertyWidget.cxx -+++ b/Qt/ApplicationComponents/pqMoleculePropertyWidget.cxx -@@ -57,7 +57,7 @@ public: - , showAdvancedProperties(false) - { - this->Ui.setupUi(self); -- this->Ui.wdgLayout->setMargin(pqPropertiesPanel::suggestedMargin()); -+ this->Ui.wdgLayout->setContentsMargins(pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin()); - this->Ui.wdgLayout->setSpacing(pqPropertiesPanel::suggestedHorizontalSpacing()); - } - }; -diff --git a/Qt/ApplicationComponents/pqParaViewBehaviors.cxx b/Qt/ApplicationComponents/pqParaViewBehaviors.cxx -index 70ca91c4c..51d56e098 100644 ---- a/Qt/ApplicationComponents/pqParaViewBehaviors.cxx -+++ b/Qt/ApplicationComponents/pqParaViewBehaviors.cxx -@@ -312,7 +312,7 @@ pqParaViewBehaviors::pqParaViewBehaviors(QMainWindow* mainWindow, QObject* paren - QShortcut* ctrlSpace = new QShortcut(Qt::CTRL + Qt::Key_Space, mainWindow); - QObject::connect( - ctrlSpace, SIGNAL(activated()), pqApplicationCore::instance(), SLOT(quickLaunch())); -- QShortcut* ctrlShiftSpace = new QShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_Space, mainWindow); -+ QShortcut* ctrlShiftSpace = new QShortcut(QKeySequence(Qt::CTRL,Qt::SHIFT,Qt::Key_Space), mainWindow); - QObject::connect( - ctrlShiftSpace, SIGNAL(activated()), pqApplicationCore::instance(), SLOT(quickLaunch())); - QShortcut* altSpace = new QShortcut(Qt::ALT + Qt::Key_Space, mainWindow); -diff --git a/Qt/ApplicationComponents/pqPauseLiveSourcePropertyWidget.cxx b/Qt/ApplicationComponents/pqPauseLiveSourcePropertyWidget.cxx -index 7b47c2331..b9a527dd9 100644 ---- a/Qt/ApplicationComponents/pqPauseLiveSourcePropertyWidget.cxx -+++ b/Qt/ApplicationComponents/pqPauseLiveSourcePropertyWidget.cxx -@@ -43,7 +43,7 @@ pqPauseLiveSourcePropertyWidget::pqPauseLiveSourcePropertyWidget( - { - auto l = new QVBoxLayout(this); - l->setSpacing(0); -- l->setMargin(0); -+ l->setContentsMargins(0,0,0,0); - - auto button = new QPushButton(smproperty->GetXMLLabel()); - button->setCheckable(true); -diff --git a/Qt/ApplicationComponents/pqPluginActionGroupBehavior.cxx b/Qt/ApplicationComponents/pqPluginActionGroupBehavior.cxx -index 42d0df52e..1ae9d9edd 100644 ---- a/Qt/ApplicationComponents/pqPluginActionGroupBehavior.cxx -+++ b/Qt/ApplicationComponents/pqPluginActionGroupBehavior.cxx -@@ -40,6 +40,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include - #include - #include -+#include - - namespace - { -diff --git a/Qt/ApplicationComponents/pqSelectionQueryPropertyWidget.cxx b/Qt/ApplicationComponents/pqSelectionQueryPropertyWidget.cxx -index f65f05bc1..0fa92649c 100644 ---- a/Qt/ApplicationComponents/pqSelectionQueryPropertyWidget.cxx -+++ b/Qt/ApplicationComponents/pqSelectionQueryPropertyWidget.cxx -@@ -220,7 +220,7 @@ private: - case COMMA_SEPARATED_VALUES: - { - auto vbox = new QVBoxLayout(this); -- vbox->setMargin(0); -+ vbox->setContentsMargins(0,0,0,0); - vbox->setSpacing(pqPropertiesPanel::suggestedVerticalSpacing()); - auto edit = new pqLineEdit(this); - this->LineEdits.push_back(edit); -@@ -234,7 +234,7 @@ private: - case RANGE_PAIR: - { - auto hbox = new QHBoxLayout(this); -- hbox->setMargin(0); -+ hbox->setContentsMargins(0,0,0,0); - hbox->setSpacing(pqPropertiesPanel::suggestedHorizontalSpacing()); - - auto editMin = new pqLineEdit(this); -@@ -259,7 +259,7 @@ private: - case LOCATION_WITH_TOLERANCE: - { - auto grid = new QGridLayout(this); -- grid->setMargin(0); -+ grid->setContentsMargins(0,0,0,0); - grid->setVerticalSpacing(pqPropertiesPanel::suggestedVerticalSpacing()); - grid->setHorizontalSpacing(pqPropertiesPanel::suggestedHorizontalSpacing()); - auto editX = new pqDoubleLineEdit(this); -@@ -332,7 +332,7 @@ public: - this->Operator->setSizeAdjustPolicy(QComboBox::AdjustToContents); - - auto hbox = new QHBoxLayout(this); -- hbox->setMargin(0); -+ hbox->setContentsMargins(0,0,0,0); - hbox->setSpacing(pqPropertiesPanel::suggestedHorizontalSpacing()); - hbox->addWidget(this->Term, 0, Qt::AlignTop); - hbox->addWidget(this->Operator, 0, Qt::AlignTop); -@@ -620,7 +620,7 @@ class pqSelectionQueryPropertyWidget::pqInternals - void insertQuery(int index, const QString& expr = QString()) - { - auto hbox = new QHBoxLayout(); -- hbox->setMargin(0); -+ hbox->setContentsMargins(0,0,0,0); - hbox->setSpacing(pqPropertiesPanel::suggestedHorizontalSpacing()); - - auto wdg = new QueryWidgetType(this->Parent); -@@ -704,7 +704,7 @@ public: - : Parent(self) - { - auto vbox = new QVBoxLayout(self); -- vbox->setMargin(0); -+ vbox->setContentsMargins(0,0,0,0); - vbox->setSpacing(pqPropertiesPanel::suggestedVerticalSpacing()); - } - -diff --git a/Qt/ApplicationComponents/pqSelectionQueryPropertyWidget.h b/Qt/ApplicationComponents/pqSelectionQueryPropertyWidget.h -index 266c0dced..e992ef390 100644 ---- a/Qt/ApplicationComponents/pqSelectionQueryPropertyWidget.h -+++ b/Qt/ApplicationComponents/pqSelectionQueryPropertyWidget.h -@@ -36,8 +36,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include "pqPropertyWidget.h" - - #include // for QScopedPointer. -+#include - --class QStringList; - - /** - * @class pqSelectionQueryPropertyWidget -diff --git a/Qt/ApplicationComponents/pqSeriesEditorPropertyWidget.cxx b/Qt/ApplicationComponents/pqSeriesEditorPropertyWidget.cxx -index 01b7b5267..be270a60e 100644 ---- a/Qt/ApplicationComponents/pqSeriesEditorPropertyWidget.cxx -+++ b/Qt/ApplicationComponents/pqSeriesEditorPropertyWidget.cxx -@@ -128,7 +128,7 @@ public: - vtkSMPropertyHelper(lutProxy, "IndexedLookup").Set(1); - - this->Ui.setupUi(self); -- this->Ui.wdgLayout->setMargin(pqPropertiesPanel::suggestedMargin()); -+ this->Ui.wdgLayout->setContentsMargins(pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin()); - this->Ui.wdgLayout->setHorizontalSpacing(pqPropertiesPanel::suggestedHorizontalSpacing()); - this->Ui.wdgLayout->setVerticalSpacing(pqPropertiesPanel::suggestedVerticalSpacing()); - -diff --git a/Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx b/Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx -index fe9a17ffb..359e88c71 100644 ---- a/Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx -+++ b/Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx -@@ -76,6 +76,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include - #include - #include -+#include - - #include - #include -diff --git a/Qt/ApplicationComponents/pqTextLocationWidget.cxx b/Qt/ApplicationComponents/pqTextLocationWidget.cxx -index eab16a74f..732b18174 100644 ---- a/Qt/ApplicationComponents/pqTextLocationWidget.cxx -+++ b/Qt/ApplicationComponents/pqTextLocationWidget.cxx -@@ -50,7 +50,7 @@ public: - pqInternals(pqTextLocationWidget* self) - { - this->Ui.setupUi(self); -- this->Ui.gridLayout->setMargin(pqPropertiesPanel::suggestedMargin()); -+ this->Ui.gridLayout->setContentsMargins(pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin()); - this->Ui.gridLayout->setSpacing(pqPropertiesPanel::suggestedHorizontalSpacing()); - - // Add location enum values to the buttons -diff --git a/Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx b/Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx -index bee6a033e..47314b3ab 100644 ---- a/Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx -+++ b/Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx -@@ -43,6 +43,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include - #include - #include -+#include - - class pqViewResolutionPropertyWidget::pqInternals - { -diff --git a/Qt/ApplicationComponents/pqViewTypePropertyWidget.cxx b/Qt/ApplicationComponents/pqViewTypePropertyWidget.cxx -index bd4efc988..e14fb95ca 100644 ---- a/Qt/ApplicationComponents/pqViewTypePropertyWidget.cxx -+++ b/Qt/ApplicationComponents/pqViewTypePropertyWidget.cxx -@@ -49,7 +49,7 @@ pqViewTypePropertyWidget::pqViewTypePropertyWidget( - this->ComboBox = new QComboBox(this); - this->ComboBox->setObjectName("ComboBox"); - QVBoxLayout* vbox = new QVBoxLayout(this); -- vbox->setMargin(0); -+ vbox->setContentsMargins(0,0,0,0); - vbox->addWidget(this->ComboBox); - - this->ComboBox->addItem("None", QVariant("None")); -diff --git a/Qt/Components/CMakeLists.txt b/Qt/Components/CMakeLists.txt -index 1c4b9950a..4ccf4f75c 100644 ---- a/Qt/Components/CMakeLists.txt -+++ b/Qt/Components/CMakeLists.txt -@@ -254,7 +254,7 @@ set(resource_files - Resources/pqComponents.qrc) - - vtk_module_find_package( -- PACKAGE Qt5 -+ PACKAGE Qt${VTK_QT_VERSION} - COMPONENTS Network Widgets) - - source_group("Resources" FILES -@@ -273,6 +273,6 @@ vtk_module_add_module(ParaView::pqComponents - ${resource_files}) - vtk_module_link(ParaView::pqComponents - PRIVATE -- Qt5::Network -- Qt5::Widgets) -+ Qt${VTK_QT_VERSION}::Network -+ Qt${VTK_QT_VERSION}::Widgets) - vtk_module_definitions(ParaView::pqComponents PRIVATE QT_NO_KEYWORDS) -diff --git a/Qt/Components/Resources/UI/pqAboutDialog.ui b/Qt/Components/Resources/UI/pqAboutDialog.ui -index 387cfe4a7..cbea4be71 100644 ---- a/Qt/Components/Resources/UI/pqAboutDialog.ui -+++ b/Qt/Components/Resources/UI/pqAboutDialog.ui -@@ -1,7 +1,14 @@ - - -+ -+ -+ pqAboutDialog -+ QDialog -+
pqAboutDialog.h
-+ -+ - pqAboutDialog -- -+ - - - 0 - diff --git a/Qt/Components/Resources/UI/pqAboutDialog.ui b/Qt/Components/Resources/UI/pqAboutDialog.ui -diff --git a/Qt/Components/Testing/Cxx/CMakeLists.txt b/Qt/Components/Testing/Cxx/CMakeLists.txt -index 73430cd93..720041a1c 100644 ---- a/Qt/Components/Testing/Cxx/CMakeLists.txt -+++ b/Qt/Components/Testing/Cxx/CMakeLists.txt -@@ -1,14 +1,14 @@ --find_package(Qt5 REQUIRED COMPONENTS Core Widgets) -+find_package(Qt${VTK_QT_VERSION} REQUIRED COMPONENTS Core Widgets) - set(CMAKE_AUTOMOC 1) - vtk_module_test_executable(pqPipelineApp FilteredPipelineBrowserApp.cxx FilteredPipelineBrowserApp.h) --target_link_libraries(pqPipelineApp PRIVATE Qt5::Core Qt5::Widgets) -+target_link_libraries(pqPipelineApp PRIVATE Qt${VTK_QT_VERSION}::Core Qt${VTK_QT_VERSION}::Widgets) - #ADD_TEST(pqPipelineApp "${EXECUTABLE_OUTPUT_PATH}/pqPipelineApp" -dr "--test-directory=${PARAVIEW_TEST_DIR}") - - set(tests_sources - TabbedMultiViewWidgetFilteringApp.cxx) - create_test_sourcelist(tests pqComponentsTest.cxx ${tests_sources}) - vtk_module_test_executable(pqComponentsTest ${tests}) --target_link_libraries(pqComponentsTest PRIVATE Qt5::Core Qt5::Widgets) -+target_link_libraries(pqComponentsTest PRIVATE Qt${VTK_QT_VERSION}::Core Qt${VTK_QT_VERSION}::Widgets) - - foreach(test_file IN LISTS tests_sources) - get_filename_component(test "${test_file}" NAME_WE) -diff --git a/Qt/Components/pqAnimationViewWidget.cxx b/Qt/Components/pqAnimationViewWidget.cxx -index 1efa71732..d8f29afde 100644 ---- a/Qt/Components/pqAnimationViewWidget.cxx -+++ b/Qt/Components/pqAnimationViewWidget.cxx -@@ -274,12 +274,12 @@ pqAnimationViewWidget::pqAnimationViewWidget(QWidget* _parent) - { - this->Internal = new pqAnimationViewWidget::pqInternal(); - QVBoxLayout* vboxlayout = new QVBoxLayout(this); -- vboxlayout->setMargin(2); -+ vboxlayout->setContentsMargins(2,2,2,2); - vboxlayout->setSpacing(2); - - QHBoxLayout* hboxlayout = new QHBoxLayout; - vboxlayout->addLayout(hboxlayout); -- hboxlayout->setMargin(0); -+ hboxlayout->setContentsMargins(0,0,0,0); - hboxlayout->setSpacing(2); - - hboxlayout->addWidget(new QLabel("Mode:", this)); -@@ -343,7 +343,7 @@ pqAnimationViewWidget::pqAnimationViewWidget(QWidget* _parent) - this->Internal->AnimationWidget->animationModel()->setTimePrecision( - vtkPVGeneralSettings::GetInstance()->GetAnimationTimePrecision()); - this->Internal->AnimationWidget->animationModel()->setTimeNotation( -- vtkPVGeneralSettings::GetInstance()->GetAnimationTimeNotation()); -+ QChar(vtkPVGeneralSettings::GetInstance()->GetAnimationTimeNotation())); - - pqCoreUtilities::connect(vtkPVGeneralSettings::GetInstance(), vtkCommand::ModifiedEvent, this, - SLOT(generalSettingsChanged())); -@@ -359,7 +359,7 @@ pqAnimationViewWidget::pqAnimationViewWidget(QWidget* _parent) - this->Internal->CreateSource->setSizeAdjustPolicy(QComboBox::AdjustToContents); - this->Internal->CreateProperty->setSizeAdjustPolicy(QComboBox::AdjustToContents); - QHBoxLayout* l = new QHBoxLayout(w); -- l->setMargin(0); -+ l->setContentsMargins(0,0,0,0); - l->addSpacing(6); - l->addWidget(this->Internal->CreateSource); - l->addWidget(this->Internal->CreateProperty); -@@ -1134,7 +1134,7 @@ void pqAnimationViewWidget::generalSettingsChanged() - this->Internal->AnimationWidget->animationModel()->setTimePrecision( - vtkPVGeneralSettings::GetInstance()->GetAnimationTimePrecision()); - this->Internal->AnimationWidget->animationModel()->setTimeNotation( -- vtkPVGeneralSettings::GetInstance()->GetAnimationTimeNotation()); -+ QChar(vtkPVGeneralSettings::GetInstance()->GetAnimationTimeNotation())); - } - - //----------------------------------------------------------------------------- -diff --git a/Qt/Components/pqArrayListWidget.cxx b/Qt/Components/pqArrayListWidget.cxx -index 33a6e7202..e4aab913f 100644 ---- a/Qt/Components/pqArrayListWidget.cxx -+++ b/Qt/Components/pqArrayListWidget.cxx -@@ -122,7 +122,7 @@ pqArrayListWidget::pqArrayListWidget(QWidget* parent) - auto lay = new QVBoxLayout(this); - this->TableView = new pqExpandableTableView(this); - lay->addWidget(this->TableView); -- lay->setMargin(0); -+ lay->setContentsMargins(0,0,0,0); - lay->setSpacing(2); - - pqHeaderView* myheader = new pqHeaderView(Qt::Horizontal, this->TableView); -diff --git a/Qt/Components/pqArraySelectorPropertyWidget.cxx b/Qt/Components/pqArraySelectorPropertyWidget.cxx -index 94251e7ff..3da5f55c0 100644 ---- a/Qt/Components/pqArraySelectorPropertyWidget.cxx -+++ b/Qt/Components/pqArraySelectorPropertyWidget.cxx -@@ -239,7 +239,7 @@ pqArraySelectorPropertyWidget::pqArraySelectorPropertyWidget( - - auto l = new QVBoxLayout(this); - l->setSpacing(0); -- l->setMargin(0); -+ l->setContentsMargins(0,0,0,0); - - auto combobox = new QComboBox(this); - combobox->setObjectName("ComboBox"); -diff --git a/Qt/Components/pqArrayStatusPropertyWidget.cxx b/Qt/Components/pqArrayStatusPropertyWidget.cxx -index 4958265a0..d5904de1d 100644 ---- a/Qt/Components/pqArrayStatusPropertyWidget.cxx -+++ b/Qt/Components/pqArrayStatusPropertyWidget.cxx -@@ -136,7 +136,7 @@ pqArrayStatusPropertyWidget::pqArrayStatusPropertyWidget( - - QHBoxLayout* hbox = new QHBoxLayout(this); - hbox->addWidget(selectorWidget); -- hbox->setMargin(0); -+ hbox->setContentsMargins(0,0,0,0); - hbox->setSpacing(4); - - for (unsigned int cc = 0; cc < smgroup->GetNumberOfProperties(); cc++) -@@ -210,7 +210,7 @@ pqArrayStatusPropertyWidget::pqArrayStatusPropertyWidget( - - QHBoxLayout* hbox = new QHBoxLayout(this); - hbox->addWidget(selectorWidget); -- hbox->setMargin(0); -+ hbox->setContentsMargins(0,0,0,0); - hbox->setSpacing(4); - - const char* property_name = smproxy->GetPropertyName(smproperty); -diff --git a/Qt/Components/pqCameraKeyFrameWidget.cxx b/Qt/Components/pqCameraKeyFrameWidget.cxx -index d5a635a10..d3e043045 100644 ---- a/Qt/Components/pqCameraKeyFrameWidget.cxx -+++ b/Qt/Components/pqCameraKeyFrameWidget.cxx -@@ -197,7 +197,7 @@ pqCameraKeyFrameWidget::pqCameraKeyFrameWidget(QWidget* parentObject) - this->Internal->PSplineWidget->filterWidgets(); - - (new QVBoxLayout(this->Internal->positionContainer))->addWidget(this->Internal->PSplineWidget); -- this->Internal->positionContainer->layout()->setMargin(0); -+ this->Internal->positionContainer->layout()->setContentsMargins(0,0,0,0); - - this->Internal->FSplineProxy.TakeReference(pxm->NewProxy("parametric_functions", "Spline")); - this->Internal->PSplineProxy->SetLocation(vtkPVSession::CLIENT); -@@ -210,7 +210,7 @@ pqCameraKeyFrameWidget::pqCameraKeyFrameWidget(QWidget* parentObject) - this->Internal->FSplineWidget->filterWidgets(); - - (new QVBoxLayout(this->Internal->focusContainer))->addWidget(this->Internal->FSplineWidget); -- this->Internal->focusContainer->layout()->setMargin(0); -+ this->Internal->focusContainer->layout()->setContentsMargins(0,0,0,0); - } - - //----------------------------------------------------------------------------- -diff --git a/Qt/Components/pqComboBoxDomain.cxx b/Qt/Components/pqComboBoxDomain.cxx -index bde1fc79d..d6091d01d 100644 ---- a/Qt/Components/pqComboBoxDomain.cxx -+++ b/Qt/Components/pqComboBoxDomain.cxx -@@ -264,15 +264,15 @@ void pqComboBoxDomain::internalDomainChanged() - QList proxies = pqSMAdaptor::getProxyPropertyDomain(this->Internal->Property); - Q_FOREACH (vtkSMProxy* pxy, proxies) - { -- texts.append(pxy->GetXMLLabel()); -- data.append(pxy->GetXMLLabel()); -+ texts.append(QString(pxy->GetXMLLabel())); -+ data.append(QString(pxy->GetXMLLabel())); - infos.append(QString()); - icons.append(QIcon()); - } - pqSMProxy cur_value = pqSMAdaptor::getProxyProperty(this->Internal->Property); - if (cur_value) - { -- cur_property_value = cur_value->GetXMLLabel(); -+ cur_property_value = QString(cur_value->GetXMLLabel()); - } - } - -@@ -350,7 +350,7 @@ void pqComboBoxDomain::internalDomainChanged() - pqSMProxy cur_value = pqSMAdaptor::getProxyProperty(this->Internal->Property); - if (cur_value) - { -- cur_property_value = cur_value->GetXMLLabel(); -+ cur_property_value = QString(cur_value->GetXMLLabel()); - } - } - break; -diff --git a/Qt/Components/pqCommandPropertyWidget.cxx b/Qt/Components/pqCommandPropertyWidget.cxx -index adbee9842..38a558450 100644 ---- a/Qt/Components/pqCommandPropertyWidget.cxx -+++ b/Qt/Components/pqCommandPropertyWidget.cxx -@@ -54,7 +54,7 @@ pqCommandPropertyWidget::pqCommandPropertyWidget( - QObject::connect(button, SIGNAL(clicked()), this, SLOT(buttonClicked())); - - QHBoxLayout* layoutLocal = new QHBoxLayout(this); -- layoutLocal->setMargin(0); -+ layoutLocal->setContentsMargins(0,0,0,0); - layoutLocal->addWidget(button); - layoutLocal->addStretch(); - this->setShowLabel(false); -diff --git a/Qt/Components/pqComparativeCueWidget.cxx b/Qt/Components/pqComparativeCueWidget.cxx -index c0842e0e5..bfbb616db 100644 ---- a/Qt/Components/pqComparativeCueWidget.cxx -+++ b/Qt/Components/pqComparativeCueWidget.cxx -@@ -32,7 +32,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include "pqComparativeCueWidget.h" - #include "ui_pqComparativeParameterRangeDialog.h" - --#include -+#include -+#include - - #include "pqQtDeprecated.h" - #include "pqUndoStack.h" -@@ -249,10 +250,10 @@ void pqComparativeCueWidget::editRange() - ui.multivalueHint->setVisible(csv); - ui.mode->setVisible(ranges[0].rowCount() > 1 && ranges[0].columnCount() > 1); - -- QRegExp floatNum = QRegExp("[-+]?[0-9]*\\.?[0-9]+([eE][-+]?[0-9]+)?"); -- QRegExp csvFloatNum = QRegExp(QString("%1(,%1)*").arg(floatNum.pattern())); -- ui.minValue->setValidator(new QRegExpValidator(csv ? csvFloatNum : floatNum, ui.minValue)); -- ui.maxValue->setValidator(new QRegExpValidator(csv ? csvFloatNum : floatNum, ui.maxValue)); -+ QRegularExpression floatNum = QRegularExpression("[-+]?[0-9]*\\.?[0-9]+([eE][-+]?[0-9]+)?"); -+ QRegularExpression csvFloatNum = QRegularExpression(QString("%1(,%1)*").arg(floatNum.pattern())); -+ ui.minValue->setValidator(new QRegularExpressionValidator(csv ? csvFloatNum : floatNum, ui.minValue)); -+ ui.maxValue->setValidator(new QRegularExpressionValidator(csv ? csvFloatNum : floatNum, ui.maxValue)); - - if (dialog.exec() != QDialog::Accepted) - { -diff --git a/Qt/Components/pqCustomFilterManager.h b/Qt/Components/pqCustomFilterManager.h -index 0d5f2b722..6d2900aad 100644 ---- a/Qt/Components/pqCustomFilterManager.h -+++ b/Qt/Components/pqCustomFilterManager.h -@@ -40,11 +40,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - #include "pqComponentsModule.h" - #include -+#include - - class pqCustomFilterManagerForm; - class pqCustomFilterManagerModel; - class QItemSelection; --class QStringList; - - /** - * \class pqCustomFilterManager -diff --git a/Qt/Components/pqDataInformationWidget.cxx b/Qt/Components/pqDataInformationWidget.cxx -index 0a0d3db55..971f25b27 100644 ---- a/Qt/Components/pqDataInformationWidget.cxx -+++ b/Qt/Components/pqDataInformationWidget.cxx -@@ -117,7 +117,7 @@ pqDataInformationWidget::pqDataInformationWidget(QWidget* _parent /*=0*/) - QVBoxLayout* _layout = new QVBoxLayout(this); - if (_layout) - { -- _layout->setMargin(0); -+ _layout->setContentsMargins(0,0,0,0); - _layout->addWidget(this->View); - } - -diff --git a/Qt/Components/pqDisplayColorWidget.cxx b/Qt/Components/pqDisplayColorWidget.cxx -index 3e0e50bc7..b36119de1 100644 ---- a/Qt/Components/pqDisplayColorWidget.cxx -+++ b/Qt/Components/pqDisplayColorWidget.cxx -@@ -253,7 +253,7 @@ pqDisplayColorWidget::pqDisplayColorWidget(QWidget* parentObject) - this->SolidColorIcon = new QIcon(":/pqWidgets/Icons/pqSolidColor.svg"); - - QHBoxLayout* hbox = new QHBoxLayout(this); -- hbox->setMargin(0); -+ hbox->setContentsMargins(0,0,0,0); - hbox->setSpacing(pqPropertiesPanel::suggestedHorizontalSpacing()); - - this->Variables = new QComboBox(this); -diff --git a/Qt/Components/pqDisplayPanelPropertyWidget.cxx b/Qt/Components/pqDisplayPanelPropertyWidget.cxx -index 55336fa31..8baf05a87 100644 ---- a/Qt/Components/pqDisplayPanelPropertyWidget.cxx -+++ b/Qt/Components/pqDisplayPanelPropertyWidget.cxx -@@ -41,7 +41,7 @@ pqDisplayPanelPropertyWidget::pqDisplayPanelPropertyWidget( - this->DisplayPanel = panel; - - QVBoxLayout* layoutLocal = new QVBoxLayout; -- layoutLocal->setMargin(0); -+ layoutLocal->setContentsMargins(0,0,0,0); - layoutLocal->addWidget(panel); - setLayout(layoutLocal); - } -diff --git a/Qt/Components/pqDisplayRepresentationWidget.cxx b/Qt/Components/pqDisplayRepresentationWidget.cxx -index 2992dc873..037e34f11 100644 ---- a/Qt/Components/pqDisplayRepresentationWidget.cxx -+++ b/Qt/Components/pqDisplayRepresentationWidget.cxx -@@ -252,7 +252,7 @@ pqDisplayRepresentationPropertyWidget::pqDisplayRepresentationPropertyWidget( - : pqPropertyWidget(smProxy, parentObject) - { - QVBoxLayout* layoutLocal = new QVBoxLayout; -- layoutLocal->setMargin(0); -+ layoutLocal->setContentsMargins(0,0,0,0); - this->Widget = new pqDisplayRepresentationWidget(this); - layoutLocal->addWidget(this->Widget); - setLayout(layoutLocal); -diff --git a/Qt/Components/pqDoubleVectorPropertyWidget.cxx b/Qt/Components/pqDoubleVectorPropertyWidget.cxx -index 050c218c0..2e001af3f 100644 ---- a/Qt/Components/pqDoubleVectorPropertyWidget.cxx -+++ b/Qt/Components/pqDoubleVectorPropertyWidget.cxx -@@ -102,7 +102,7 @@ pqDoubleVectorPropertyWidget::pqDoubleVectorPropertyWidget( - } - - QHBoxLayout* layoutLocal = new QHBoxLayout; -- layoutLocal->setMargin(0); -+ layoutLocal->setContentsMargins(0,0,0,0); - layoutLocal->setSpacing(pqPropertiesPanel::suggestedHorizontalSpacing()); - - this->setLayout(layoutLocal); -diff --git a/Qt/Components/pqExpressionsWidget.cxx b/Qt/Components/pqExpressionsWidget.cxx -index d45369ca7..1b7119797 100644 ---- a/Qt/Components/pqExpressionsWidget.cxx -+++ b/Qt/Components/pqExpressionsWidget.cxx -@@ -49,7 +49,7 @@ pqExpressionsWidget::pqExpressionsWidget(QWidget* parent, const QString& groupNa - , OneLiner(nullptr) - { - QGridLayout* grid = new QGridLayout(this); -- grid->setMargin(0); -+ grid->setContentsMargins(0,0,0,0); - grid->setSpacing(0); - - if (!groupName.isEmpty()) -@@ -60,6 +60,10 @@ pqExpressionsWidget::pqExpressionsWidget(QWidget* parent, const QString& groupNa - this->setLayout(grid); - } - -+void pqExpressionsWidget::clear() { -+ lineEdit()->clear(); -+} -+ - void pqExpressionsWidget::setupButtons(const QString& groupName) - { - auto grid = dynamic_cast(this->layout()); -diff --git a/Qt/Components/pqExpressionsWidget.h b/Qt/Components/pqExpressionsWidget.h -index 94d502a20..b3bf78f5b 100644 ---- a/Qt/Components/pqExpressionsWidget.h -+++ b/Qt/Components/pqExpressionsWidget.h -@@ -60,7 +60,7 @@ public: - * Set buttons up for "groupName" expressions group. - */ - void setupButtons(const QString& groupName); -- -+ void clear(); - private: - Q_DISABLE_COPY(pqExpressionsWidget) - -diff --git a/Qt/Components/pqFavoritesDialog.cxx b/Qt/Components/pqFavoritesDialog.cxx -index d59aa5965..8bd7fa6ef 100644 ---- a/Qt/Components/pqFavoritesDialog.cxx -+++ b/Qt/Components/pqFavoritesDialog.cxx -@@ -41,6 +41,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include - #include - #include -+#include -+#include - - // pqCore - #include "pqApplicationCore.h" -diff --git a/Qt/Components/pqFileChooserWidget.cxx b/Qt/Components/pqFileChooserWidget.cxx -index 434418559..d8e05c2cb 100644 ---- a/Qt/Components/pqFileChooserWidget.cxx -+++ b/Qt/Components/pqFileChooserWidget.cxx -@@ -51,7 +51,7 @@ pqFileChooserWidget::pqFileChooserWidget(QWidget* p) - this->AcceptAnyFile = false; - - QHBoxLayout* l = new QHBoxLayout(this); -- l->setMargin(0); -+ l->setContentsMargins(0,0,0,0); - l->setSpacing(2); - this->LineEdit = new QLineEdit(this); - this->LineEdit->setObjectName("FileLineEdit"); -diff --git a/Qt/Components/pqFindDataCurrentSelectionFrame.cxx b/Qt/Components/pqFindDataCurrentSelectionFrame.cxx -index 3c81e4f92..8a7a96353 100644 ---- a/Qt/Components/pqFindDataCurrentSelectionFrame.cxx -+++ b/Qt/Components/pqFindDataCurrentSelectionFrame.cxx -@@ -152,7 +152,7 @@ public: - pqApplicationCore::instance()->manager("SELECTION_MANAGER")); - - this->Ui.setupUi(self); -- this->Ui.gridLayout->setMargin(pqPropertiesPanel::suggestedMargin()); -+ this->Ui.gridLayout->setContentsMargins(pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin()); - this->Ui.gridLayout->setVerticalSpacing(pqPropertiesPanel::suggestedVerticalSpacing()); - this->Ui.gridLayout->setHorizontalSpacing(pqPropertiesPanel::suggestedHorizontalSpacing()); - -diff --git a/Qt/Components/pqFindDataSelectionDisplayFrame.cxx b/Qt/Components/pqFindDataSelectionDisplayFrame.cxx -index 79b60a34e..7a250d094 100644 ---- a/Qt/Components/pqFindDataSelectionDisplayFrame.cxx -+++ b/Qt/Components/pqFindDataSelectionDisplayFrame.cxx -@@ -79,7 +79,7 @@ public: - this->PointLabelsMenu.setObjectName("PointLabelsMenu"); - - this->Ui.setupUi(self); -- this->Ui.mainLayout->setMargin(pqPropertiesPanel::suggestedMargin()); -+ this->Ui.mainLayout->setContentsMargins(pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin()); - this->Ui.mainLayout->setSpacing(pqPropertiesPanel::suggestedVerticalSpacing()); - - this->Ui.cellLabelsButton->setMenu(&this->CellLabelsMenu); -diff --git a/Qt/Components/pqImageTip.cxx b/Qt/Components/pqImageTip.cxx -index 4626e2134..0213021e2 100644 ---- a/Qt/Components/pqImageTip.cxx -+++ b/Qt/Components/pqImageTip.cxx -@@ -38,7 +38,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include - #include - #include --#include - #include - #include - #include -@@ -138,7 +137,7 @@ bool pqImageTip::eventFilter(QObject*, QEvent* e) - return false; - } - --void pqImageTip::enterEvent(QEvent*) -+void pqImageTip::enterEvent(QEnterEvent *) - { - hide(); - } -@@ -153,7 +152,7 @@ void pqImageTip::paintEvent(QPaintEvent* ev) - { - QStylePainter p(this); - QStyleOptionFrame opt; -- opt.init(this); -+ this->initStyleOption(&opt); - p.drawPrimitive(QStyle::PE_PanelTipLabel, opt); - p.end(); - -diff --git a/Qt/Components/pqImageTip.h b/Qt/Components/pqImageTip.h -index d44f201d4..e10416f43 100644 ---- a/Qt/Components/pqImageTip.h -+++ b/Qt/Components/pqImageTip.h -@@ -60,7 +60,7 @@ private: - QBasicTimer* const hideTimer; - - bool eventFilter(QObject*, QEvent*) override; -- void enterEvent(QEvent*) override; -+ void enterEvent(QEnterEvent *) override; - void timerEvent(QTimerEvent* e) override; - void paintEvent(QPaintEvent* e) override; - }; -diff --git a/Qt/Components/pqIndexSelectionWidget.cxx b/Qt/Components/pqIndexSelectionWidget.cxx -index 9cae037d8..f274cd3c4 100644 ---- a/Qt/Components/pqIndexSelectionWidget.cxx -+++ b/Qt/Components/pqIndexSelectionWidget.cxx -@@ -116,7 +116,7 @@ Widgets::Widgets(pqIndexSelectionWidget* parent, const QString& key, int current - this->slider->setProperty(keyPropertyName, key); - this->edit->setProperty(keyPropertyName, key); - -- this->layout->setMargin(0); -+ this->layout->setContentsMargins(0,0,0,0); - this->layout->addWidget(this->slider); - this->layout->addWidget(this->edit); - -@@ -244,10 +244,10 @@ pqIndexSelectionWidget::pqIndexSelectionWidget( - - this->GroupBox->setAlignment(Qt::AlignLeft); - -- this->VBox->setMargin(pqPropertiesPanel::suggestedMargin()); -+ this->VBox->setContentsMargins(pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin()); - this->VBox->addWidget(this->GroupBox); - -- this->Form->setMargin(pqPropertiesPanel::suggestedMargin()); -+ this->Form->setContentsMargins(pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin()); - this->Form->setHorizontalSpacing(pqPropertiesPanel::suggestedHorizontalSpacing()); - this->Form->setLabelAlignment(Qt::AlignLeft); - -diff --git a/Qt/Components/pqInputSelectorWidget.cxx b/Qt/Components/pqInputSelectorWidget.cxx -index 8e13dd686..4049a1bb9 100644 ---- a/Qt/Components/pqInputSelectorWidget.cxx -+++ b/Qt/Components/pqInputSelectorWidget.cxx -@@ -96,7 +96,7 @@ pqInputSelectorWidget::pqInputSelectorWidget( - this->setProperty(smproperty); - - auto l = new QVBoxLayout(this); -- l->setMargin(pqPropertiesPanel::suggestedMargin()); -+ l->setContentsMargins(pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin()); - l->setSpacing(pqPropertiesPanel::suggestedVerticalSpacing()); - l->addWidget(this->ComboBox); - -diff --git a/Qt/Components/pqIntMaskPropertyWidget.cxx b/Qt/Components/pqIntMaskPropertyWidget.cxx -index e91a98f6f..335cee248 100644 ---- a/Qt/Components/pqIntMaskPropertyWidget.cxx -+++ b/Qt/Components/pqIntMaskPropertyWidget.cxx -@@ -51,7 +51,7 @@ public: - : Mask(0) - { - QHBoxLayout* hbox = new QHBoxLayout(self); -- hbox->setMargin(0); -+ hbox->setContentsMargins(0,0,0,0); - - this->Button = new QPushButton(self); - hbox->addWidget(this->Button); -diff --git a/Qt/Components/pqIntRangeWidget.cxx b/Qt/Components/pqIntRangeWidget.cxx -index b6f0e5d32..a8cf6289b 100644 ---- a/Qt/Components/pqIntRangeWidget.cxx -+++ b/Qt/Components/pqIntRangeWidget.cxx -@@ -57,7 +57,7 @@ pqIntRangeWidget::pqIntRangeWidget(QWidget* p) - this->DeferredValueEdited = false; - - QHBoxLayout* l = new QHBoxLayout(this); -- l->setMargin(0); -+ l->setContentsMargins(0,0,0,0); - this->Slider = new QSlider(Qt::Horizontal, this); - this->Slider->setRange(0, 1); - l->addWidget(this->Slider); -diff --git a/Qt/Components/pqIntVectorPropertyWidget.cxx b/Qt/Components/pqIntVectorPropertyWidget.cxx -index d54c5a304..7f783371e 100644 ---- a/Qt/Components/pqIntVectorPropertyWidget.cxx -+++ b/Qt/Components/pqIntVectorPropertyWidget.cxx -@@ -94,7 +94,7 @@ pqIntVectorPropertyWidget::pqIntVectorPropertyWidget( - } - - QHBoxLayout* layoutLocal = new QHBoxLayout; -- layoutLocal->setMargin(0); -+ layoutLocal->setContentsMargins(0,0,0,0); - - if (vtkSMBooleanDomain::SafeDownCast(domain)) - { -@@ -135,7 +135,7 @@ pqIntVectorPropertyWidget::pqIntVectorPropertyWidget( - treeWidget->setMaximumRowCountBeforeScrolling(smproperty); - - QTreeWidgetItem* header = new QTreeWidgetItem(); -- header->setData(0, Qt::DisplayRole, smproperty->GetXMLLabel()); -+ header->setData(0, Qt::DisplayRole, QString(smproperty->GetXMLLabel())); - treeWidget->setHeaderItem(header); - - // helper makes it easier to select multiple entries. -diff --git a/Qt/Components/pqKeyFrameEditor.cxx b/Qt/Components/pqKeyFrameEditor.cxx -index a2f59503a..d31cf6b4d 100644 ---- a/Qt/Components/pqKeyFrameEditor.cxx -+++ b/Qt/Components/pqKeyFrameEditor.cxx -@@ -103,7 +103,7 @@ public: - , Child(child) - { - QVBoxLayout* l = new QVBoxLayout(this); -- l->setMargin(0); -+ l->setContentsMargins(0,0,0,0); - l->addWidget(this->Child); - this->Child->show(); - } -@@ -156,7 +156,7 @@ public: - : CamWidget(&this->Widget) - { - QVBoxLayout* l = new QVBoxLayout(&this->Widget); -- l->setMargin(0); -+ l->setContentsMargins(0,0,0,0); - l->addWidget(&this->CamWidget); - } - -diff --git a/Qt/Components/pqLiveInsituManager.h b/Qt/Components/pqLiveInsituManager.h -index 30cd9f310..60376566f 100644 ---- a/Qt/Components/pqLiveInsituManager.h -+++ b/Qt/Components/pqLiveInsituManager.h -@@ -33,6 +33,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #define pqLiveInsituManager_h - - #include "pqComponentsModule.h" -+#include - #include - #include - -diff --git a/Qt/Components/pqLogViewerDialog.cxx b/Qt/Components/pqLogViewerDialog.cxx -index 0eb023826..49f8f7618 100644 ---- a/Qt/Components/pqLogViewerDialog.cxx -+++ b/Qt/Components/pqLogViewerDialog.cxx -@@ -307,7 +307,7 @@ void pqLogViewerDialog::recordRefTimes() - this->LogRecorderProxies[i]->GatherInformation(refTimeInfo); - auto startingLog = QString::fromStdString(refTimeInfo->GetStartingLogs()); - bool isRawLog; -- auto parts = pqLogViewerWidget::extractLogParts(&startingLog, isRawLog); -+ auto parts = pqLogViewerWidget::extractLogParts(startingLog, isRawLog); - this->RefTimes[LogLocation(this->LogRecorderProxies[i], j)] = - parts[0].replace('s', '0').toDouble(); - } -diff --git a/Qt/Components/pqMultiViewWidget.cxx b/Qt/Components/pqMultiViewWidget.cxx -index 7a1bd1b22..c8dca2e92 100644 ---- a/Qt/Components/pqMultiViewWidget.cxx -+++ b/Qt/Components/pqMultiViewWidget.cxx -@@ -128,7 +128,7 @@ public: - }); - - QVBoxLayout* slayout = new QVBoxLayout(self); -- slayout->setMargin(0); -+ slayout->setContentsMargins(0,0,0,0); - slayout->addWidget(this->Container); - - this->PopoutPlaceholder.reset(new QWidget()); -@@ -907,7 +907,7 @@ bool pqMultiViewWidget::togglePopout() - Qt::WindowCloseButtonHint)); - internals.PopoutWindow->setObjectName("PopoutWindow"); - auto l = new QVBoxLayout(internals.PopoutWindow.data()); -- l->setMargin(0); -+ l->setContentsMargins(0,0,0,0); - internals.PopoutWindow->resize(this->size()); - } - -diff --git a/Qt/Components/pqPipelineTimeKeyFrameEditor.cxx b/Qt/Components/pqPipelineTimeKeyFrameEditor.cxx -index 6b8082312..a9a289cb4 100644 ---- a/Qt/Components/pqPipelineTimeKeyFrameEditor.cxx -+++ b/Qt/Components/pqPipelineTimeKeyFrameEditor.cxx -@@ -73,7 +73,7 @@ pqPipelineTimeKeyFrameEditor::pqPipelineTimeKeyFrameEditor( - this->Internal->Editor = - new pqKeyFrameEditor(scene, cue, QString(), this->Internal->Ui.container); - QHBoxLayout* l = new QHBoxLayout(this->Internal->Ui.container); -- l->setMargin(0); -+ l->setContentsMargins(0,0,0,0); - l->addWidget(this->Internal->Editor); - - connect(this, SIGNAL(accepted()), this, SLOT(writeKeyFrameData())); -diff --git a/Qt/Components/pqPluginTreeWidgetEventPlayer.cxx b/Qt/Components/pqPluginTreeWidgetEventPlayer.cxx -index 05f2db061..8c9a10929 100644 ---- a/Qt/Components/pqPluginTreeWidgetEventPlayer.cxx -+++ b/Qt/Components/pqPluginTreeWidgetEventPlayer.cxx -@@ -37,6 +37,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - #include - #include -+#include - - //----------------------------------------------------------------------------- - pqPluginTreeWidgetEventPlayer::pqPluginTreeWidgetEventPlayer(QObject* parentObject) -diff --git a/Qt/Components/pqPopOutWidget.cxx b/Qt/Components/pqPopOutWidget.cxx -index 858fb3af9..f4deccc77 100644 ---- a/Qt/Components/pqPopOutWidget.cxx -+++ b/Qt/Components/pqPopOutWidget.cxx -@@ -76,7 +76,7 @@ pqPopOutWidget::pqPopOutWidget(QWidget* widgetToPopOut, const QString& dialogTit - { - this->Internals->Title = dialogTitle; - this->Internals->Layout = new QHBoxLayout(this); -- this->Internals->Layout->setMargin(0); -+ this->Internals->Layout->setContentsMargins(0,0,0,0); - this->Internals->Layout->setSpacing(0); - this->Internals->WidgetToPopOut = widgetToPopOut; - this->Internals->Layout->addWidget(this->Internals->WidgetToPopOut); -diff --git a/Qt/Components/pqPropertiesPanel.cxx b/Qt/Components/pqPropertiesPanel.cxx -index 757b8d7e1..ed5a948d4 100644 ---- a/Qt/Components/pqPropertiesPanel.cxx -+++ b/Qt/Components/pqPropertiesPanel.cxx -@@ -121,7 +121,7 @@ public: - - delete parentWdg->layout(); - QVBoxLayout* layout = new QVBoxLayout(parentWdg); -- layout->setMargin(0); -+ layout->setContentsMargins(0,0,0,0); - layout->setSpacing(0); - this->Panel->setObjectName("ProxyPanel"); - this->Panel->setParent(parentWdg); -diff --git a/Qt/Components/pqPropertyWidget.cxx b/Qt/Components/pqPropertyWidget.cxx -index 9d8d4c146..4dffa6c5d 100644 ---- a/Qt/Components/pqPropertyWidget.cxx -+++ b/Qt/Components/pqPropertyWidget.cxx -@@ -42,6 +42,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include "vtkSMDomain.h" - #include "vtkSMProperty.h" - -+#include -+ - //----------------------------------------------------------------------------- - pqPropertyWidget::pqPropertyWidget(vtkSMProxy* smProxy, QWidget* parentObject) - : QFrame(parentObject) -@@ -112,7 +114,7 @@ QString pqPropertyWidget::getTooltip(vtkSMProperty* smproperty) - { - QString doc = pqProxy::rstToHtml(smproperty->GetDocumentation()->GetDescription()).c_str(); - doc = doc.trimmed(); -- doc = doc.replace(QRegExp("\\s+"), " "); -+ doc = doc.replace(QRegularExpression("\\s+"), " "); - return QString("

%1

").arg(doc); - } - return QString(); -diff --git a/Qt/Components/pqProxiesWidget.cxx b/Qt/Components/pqProxiesWidget.cxx -index 82bb44167..88d7b25ae 100644 ---- a/Qt/Components/pqProxiesWidget.cxx -+++ b/Qt/Components/pqProxiesWidget.cxx -@@ -133,7 +133,7 @@ void pqProxiesWidget::updateLayout() - internals.clearExpanders(); - delete this->layout(); - QVBoxLayout* vbox = new QVBoxLayout(this); -- vbox->setMargin(0); -+ vbox->setContentsMargins(0,0,0,0); - vbox->setSpacing(pqPropertiesPanel::suggestedVerticalSpacing()); - - // Don't add expander buttons if there's only 1 component and that components -diff --git a/Qt/Components/pqProxyEditorPropertyWidget.cxx b/Qt/Components/pqProxyEditorPropertyWidget.cxx -index f72610b50..c81513f84 100644 ---- a/Qt/Components/pqProxyEditorPropertyWidget.cxx -+++ b/Qt/Components/pqProxyEditorPropertyWidget.cxx -@@ -71,7 +71,7 @@ pqProxyEditorPropertyWidget::pqProxyEditorPropertyWidget( - } - - QHBoxLayout* hbox = new QHBoxLayout(this); -- hbox->setMargin(0); -+ hbox->setContentsMargins(0,0,0,0); - hbox->setSpacing(pqPropertiesPanel::suggestedHorizontalSpacing()); - if (this->Checkbox) - { -diff --git a/Qt/Components/pqProxyPropertyWidget.cxx b/Qt/Components/pqProxyPropertyWidget.cxx -index 54daa99c3..6c348829c 100644 ---- a/Qt/Components/pqProxyPropertyWidget.cxx -+++ b/Qt/Components/pqProxyPropertyWidget.cxx -@@ -46,7 +46,7 @@ pqProxyPropertyWidget::pqProxyPropertyWidget( - : pqPropertyWidget(smProxy, parentObject) - { - QVBoxLayout* vbox = new QVBoxLayout; -- vbox->setMargin(0); -+ vbox->setContentsMargins(0,0,0,0); - vbox->setSpacing(0); - - bool selection_input = -diff --git a/Qt/Components/pqProxySelectionWidget.cxx b/Qt/Components/pqProxySelectionWidget.cxx -index cbab05d8c..8b12c9e74 100644 ---- a/Qt/Components/pqProxySelectionWidget.cxx -+++ b/Qt/Components/pqProxySelectionWidget.cxx -@@ -64,9 +64,9 @@ public: - { - this->Ui.setupUi(self); - this->Ui.verticalLayout->setSpacing(pqPropertiesPanel::suggestedVerticalSpacing()); -- this->Ui.verticalLayout->setMargin(pqPropertiesPanel::suggestedMargin()); -+ this->Ui.verticalLayout->setContentsMargins(pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin()); - this->Ui.horizontalLayout->setSpacing(pqPropertiesPanel::suggestedHorizontalSpacing()); -- this->Ui.horizontalLayout->setMargin(pqPropertiesPanel::suggestedMargin()); -+ this->Ui.horizontalLayout->setContentsMargins(pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin()); - this->Ui.frameLayout->setSpacing(pqPropertiesPanel::suggestedVerticalSpacing()); - } - -diff --git a/Qt/Components/pqProxyWidget.cxx b/Qt/Components/pqProxyWidget.cxx -index a3b722105..6f0adc74e 100644 ---- a/Qt/Components/pqProxyWidget.cxx -+++ b/Qt/Components/pqProxyWidget.cxx -@@ -700,7 +700,7 @@ pqProxyWidget::pqProxyWidget(vtkSMProxy* smproxy, const QStringList& properties, - this->connect(&internals.RequestUpdatePanel, SIGNAL(timeout()), SLOT(updatePanel())); - - QGridLayout* gridLayout = new QGridLayout(this); -- gridLayout->setMargin(pqPropertiesPanel::suggestedMargin()); -+ gridLayout->setContentsMargins(pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin()); - gridLayout->setHorizontalSpacing(pqPropertiesPanel::suggestedHorizontalSpacing()); - gridLayout->setVerticalSpacing(pqPropertiesPanel::suggestedVerticalSpacing()); - -diff --git a/Qt/Components/pqServerLauncher.cxx b/Qt/Components/pqServerLauncher.cxx -index e6fb5d542..9cd23a21e 100644 ---- a/Qt/Components/pqServerLauncher.cxx -+++ b/Qt/Components/pqServerLauncher.cxx -@@ -66,6 +66,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include - #include - #include -+#include - - #include - -diff --git a/Qt/Components/pqSettingsDialog.cxx b/Qt/Components/pqSettingsDialog.cxx -index 768a33c76..99c7b66c6 100644 ---- a/Qt/Components/pqSettingsDialog.cxx -+++ b/Qt/Components/pqSettingsDialog.cxx -@@ -134,7 +134,7 @@ pqSettingsDialog::pqSettingsDialog( - container->setContentsMargins(6, 0, 6, 0); - - QVBoxLayout* vbox = new QVBoxLayout(container); -- vbox->setMargin(0); -+ vbox->setContentsMargins(0,0,0,0); - vbox->setSpacing(0); - - pqProxyWidget* widget = new pqProxyWidget(proxy, container); -diff --git a/Qt/Components/pqShaderReplacementsSelectorPropertyWidget.cxx b/Qt/Components/pqShaderReplacementsSelectorPropertyWidget.cxx -index 33b7588b3..f90e3c781 100644 ---- a/Qt/Components/pqShaderReplacementsSelectorPropertyWidget.cxx -+++ b/Qt/Components/pqShaderReplacementsSelectorPropertyWidget.cxx -@@ -78,7 +78,7 @@ pqShaderReplacementsSelectorPropertyWidget::pqShaderReplacementsSelectorProperty - this->Internal = new pqInternal(vtkSMStringVectorProperty::SafeDownCast(smProperty)); - - QVBoxLayout* l = new QVBoxLayout; -- l->setMargin(0); -+ l->setContentsMargins(0,0,0,0); - - QGridLayout* gridLayout = new QGridLayout; - gridLayout->setColumnStretch(0, 0); -diff --git a/Qt/Components/pqStringVectorPropertyWidget.cxx b/Qt/Components/pqStringVectorPropertyWidget.cxx -index 44efe7560..903488705 100644 ---- a/Qt/Components/pqStringVectorPropertyWidget.cxx -+++ b/Qt/Components/pqStringVectorPropertyWidget.cxx -@@ -77,7 +77,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include - #include - #include --#include -+#include - #include - #include - #include -@@ -159,7 +159,7 @@ pqStringVectorPropertyWidget::pqStringVectorPropertyWidget( - domainIter->Delete(); - - QVBoxLayout* vbox = new QVBoxLayout; -- vbox->setMargin(0); -+ vbox->setContentsMargins(0,0,0,0); - vbox->setSpacing(0); - - if (fileListDomain) -@@ -313,7 +313,7 @@ pqStringVectorPropertyWidget::pqStringVectorPropertyWidget( - - QWidget* w = new QWidget(this); - QHBoxLayout* hbox = new QHBoxLayout(this); -- hbox->setMargin(0); -+ hbox->setContentsMargins(0,0,0,0); - hbox->setSpacing(0); - QLabel* label = new QLabel(smProperty->GetXMLLabel(), w); - hbox->addWidget(label); -@@ -489,7 +489,7 @@ void pqStringVectorPropertyWidget::processFileChooserHints(vtkPVXMLElement* hint - else - { - QStringList lextensions = -- QString(extensions).split(QRegExp("\\s+"), PV_QT_SKIP_EMPTY_PARTS); -+ QString(extensions).split(QRegularExpression("\\s+"), PV_QT_SKIP_EMPTY_PARTS); - supportedExtensions.push_back( - QString("%1 (*.%2)").arg(file_description).arg(lextensions.join(" *."))); - } -diff --git a/Qt/Components/pqTabbedMultiViewWidget.cxx b/Qt/Components/pqTabbedMultiViewWidget.cxx -index b1a2eec94..a371fa676 100644 ---- a/Qt/Components/pqTabbedMultiViewWidget.cxx -+++ b/Qt/Components/pqTabbedMultiViewWidget.cxx -@@ -459,7 +459,7 @@ pqTabbedMultiViewWidget::pqTabbedMultiViewWidget(QWidget* parentObject) - this, SLOT(contextMenuRequested(const QPoint&))); - - QGridLayout* glayout = new QGridLayout(this); -- glayout->setMargin(0); -+ glayout->setContentsMargins(0,0,0,0); - glayout->setSpacing(0); - glayout->addWidget(this->Internals->TabWidget, 0, 0); - -@@ -544,7 +544,7 @@ void pqTabbedMultiViewWidget::toggleFullScreen() - - QGridLayout* glayout = new QGridLayout(fullScreenWindow); - glayout->setSpacing(0); -- glayout->setMargin(0); -+ glayout->setContentsMargins(0,0,0,0); - glayout->addWidget(internals.TabWidget, 0, 0); - fullScreenWindow->showFullScreen(); - fullScreenWindow->show(); -diff --git a/Qt/Components/pqTextureSelectorPropertyWidget.cxx b/Qt/Components/pqTextureSelectorPropertyWidget.cxx -index d0b0a5e37..94f73c2f3 100644 ---- a/Qt/Components/pqTextureSelectorPropertyWidget.cxx -+++ b/Qt/Components/pqTextureSelectorPropertyWidget.cxx -@@ -60,7 +60,7 @@ pqTextureSelectorPropertyWidget::pqTextureSelectorPropertyWidget( - this->setToolTip("Select/Load texture to apply."); - - QVBoxLayout* l = new QVBoxLayout; -- l->setMargin(0); -+ l->setContentsMargins(0,0,0,0); - - // Create the combobox selector and set its value - auto* domain = smProperty->FindDomain(); -diff --git a/Qt/Components/pqTransferFunction2DWidget.cxx b/Qt/Components/pqTransferFunction2DWidget.cxx -index f5427eede..4a74ded94 100644 ---- a/Qt/Components/pqTransferFunction2DWidget.cxx -+++ b/Qt/Components/pqTransferFunction2DWidget.cxx -@@ -88,7 +88,7 @@ public: - - this->Widget->setParent(editor); - QVBoxLayout* layout = new QVBoxLayout(editor); -- layout->setMargin(0); -+ layout->setContentsMargins(0,0,0,0); - layout->addWidget(this->Widget); - - this->Chart->SetAutoSize(true); -diff --git a/Qt/Components/pqTransferFunctionWidget.cxx b/Qt/Components/pqTransferFunctionWidget.cxx -index 64958588a..1b1e5ee0e 100644 ---- a/Qt/Components/pqTransferFunctionWidget.cxx -+++ b/Qt/Components/pqTransferFunctionWidget.cxx -@@ -246,7 +246,7 @@ public: - - this->Widget->setParent(editor); - QVBoxLayout* layout = new QVBoxLayout(editor); -- layout->setMargin(0); -+ layout->setContentsMargins(0,0,0,0); - layout->addWidget(this->Widget); - - this->ChartXY->SetAutoAxes(false); -diff --git a/Qt/Core/CMakeLists.txt b/Qt/Core/CMakeLists.txt -index ae1b8bd36..dcaa7471d 100644 ---- a/Qt/Core/CMakeLists.txt -+++ b/Qt/Core/CMakeLists.txt -@@ -166,7 +166,7 @@ if (PARAVIEW_USE_PYTHON) - endif () - - set(qt_components -- Widgets) -+ Widgets Core5Compat) - - if (PARAVIEW_USE_QTHELP) - list(APPEND qt_components -@@ -174,9 +174,9 @@ if (PARAVIEW_USE_QTHELP) - endif () - - vtk_module_find_package( -- PACKAGE Qt5 -+ PACKAGE Qt${VTK_QT_VERSION} - COMPONENTS ${qt_components} -- VERSION 5.12 -+ VERSION 6.2 - FORWARD_VERSION_REQ MINOR) - - set(CMAKE_AUTOMOC 1) -@@ -195,11 +195,11 @@ vtk_module_add_module(ParaView::pqCore - HEADERS ${headers}) - vtk_module_link(ParaView::pqCore - PRIVATE -- Qt5::Widgets) -+ Qt${VTK_QT_VERSION}::Widgets Qt${VTK_QT_VERSION}::Core5Compat) - if (PARAVIEW_USE_QTHELP) - vtk_module_link(ParaView::pqCore - PRIVATE -- Qt5::Help) -+ Qt${VTK_QT_VERSION}::Help) - endif () - vtk_module_definitions(ParaView::pqCore PRIVATE QT_NO_KEYWORDS) - -diff --git a/Qt/Core/Testing/Cxx/CMakeLists.txt b/Qt/Core/Testing/Cxx/CMakeLists.txt -index 7518832d8..f75e7267c 100644 ---- a/Qt/Core/Testing/Cxx/CMakeLists.txt -+++ b/Qt/Core/Testing/Cxx/CMakeLists.txt -@@ -1,7 +1,7 @@ --find_package(Qt5 REQUIRED COMPONENTS Core Widgets Test) -+find_package(Qt${VTK_QT_VERSION} REQUIRED COMPONENTS Core Widgets Test) - set(CMAKE_AUTOMOC 1) - vtk_module_test_executable(pqCoreBasicApp BasicApp.cxx BasicApp.h) --target_link_libraries(pqCoreBasicApp PRIVATE Qt5::Core Qt5::Widgets) -+target_link_libraries(pqCoreBasicApp PRIVATE Qt${VTK_QT_VERSION}::Core Qt${VTK_QT_VERSION}::Widgets) - ExternalData_add_test("${_vtk_build_TEST_DATA_TARGET}" - NAME pqCoreBasicApp - COMMAND pqCoreBasicApp -@@ -24,7 +24,7 @@ set(MocSources - create_test_sourcelist(Tests pqCoreTest.cxx ${MyTests}) - - vtk_module_test_executable(pqCoreTest ${Tests}) --target_link_libraries(pqCoreTest PRIVATE Qt5::Core Qt5::Widgets Qt5::Test) -+target_link_libraries(pqCoreTest PRIVATE Qt${VTK_QT_VERSION}::Core Qt${VTK_QT_VERSION}::Widgets Qt${VTK_QT_VERSION}::Test) - - foreach(test_file ${MyTests}) - get_filename_component(test "${test_file}" NAME_WE) -diff --git a/Qt/Core/Testing/Cxx/KeySequences.cxx b/Qt/Core/Testing/Cxx/KeySequences.cxx -index c59c4b6c4..127ef21da 100644 ---- a/Qt/Core/Testing/Cxx/KeySequences.cxx -+++ b/Qt/Core/Testing/Cxx/KeySequences.cxx -@@ -69,7 +69,7 @@ KeySequencesWidget::KeySequencesWidget(const std::string& label, const std::stri - auto* hl = new QHBoxLayout(this); - hl->addWidget(m_label); - hl->addWidget(m_button); -- hl->setMargin(1); -+ hl->setContentsMargins(1,1,1,1); - m_shortcut = pqKeySequences::instance().addModalShortcut(shortcut, m_action, this); - m_shortcut->setObjectName(label.c_str()); - QObject::connect( -@@ -203,7 +203,7 @@ void KeySequencesTester::basic() - auto* widget = new QWidget(window); - window->setCentralWidget(widget); - auto* layout = new QVBoxLayout(widget); -- layout->setMargin(1); -+ layout->setContentsMargins(1,1,1,1); - layout->setSpacing(1); - - auto* w1 = new KeySequencesWidget("Thing 1", "1", QKeySequence(tr("Ctrl+A")), widget); -diff --git a/Qt/Core/Testing/Python/CMakeLists.txt b/Qt/Core/Testing/Python/CMakeLists.txt -index f7d6e6262..46f4b57fd 100644 ---- a/Qt/Core/Testing/Python/CMakeLists.txt -+++ b/Qt/Core/Testing/Python/CMakeLists.txt -@@ -1,8 +1,8 @@ --find_package(Qt5 REQUIRED QUIET COMPONENTS Core Widgets) -+find_package(Qt${VTK_QT_VERSION} REQUIRED QUIET COMPONENTS Core Widgets) - set(CMAKE_AUTOMOC 1) - vtk_module_test_executable(pqFileDialogTest - pqFileDialogTest.cxx pqFileDialogTest.h) --target_link_libraries(pqFileDialogTest LINK_PRIVATE Qt5::Core Qt5::Widgets) -+target_link_libraries(pqFileDialogTest LINK_PRIVATE Qt${VTK_QT_VERSION}::Core Qt${VTK_QT_VERSION}::Widgets) - - add_test( - NAME pqFileDialogTest -diff --git a/Qt/Core/pqAnnotationsModel.cxx b/Qt/Core/pqAnnotationsModel.cxx -index c00bd5df3..69b2a0dac 100644 ---- a/Qt/Core/pqAnnotationsModel.cxx -+++ b/Qt/Core/pqAnnotationsModel.cxx -@@ -34,6 +34,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include - #include - #include -+#include - - #include "vtkSMStringListDomain.h" - -diff --git a/Qt/Core/pqApplicationCore.cxx b/Qt/Core/pqApplicationCore.cxx -index b63cd8ae4..3388d884e 100644 ---- a/Qt/Core/pqApplicationCore.cxx -+++ b/Qt/Core/pqApplicationCore.cxx -@@ -49,6 +49,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include - #include - #include -+#include - - // ParaView includes. - #include "pqAnimationScene.h" -@@ -506,7 +507,7 @@ void pqApplicationCore::onStateSaved(vtkPVXMLElement* root) - if (!QApplication::applicationName().isEmpty()) - { - // Change root element to match the application name. -- QString valid_name = QApplication::applicationName().replace(QRegExp("\\W"), "_"); -+ QString valid_name = QApplication::applicationName().replace(QRegularExpression("\\W"), "_"); - root->SetName(valid_name.toUtf8().data()); - } - Q_EMIT this->stateSaved(root); -diff --git a/Qt/Core/pqApplicationCore.h b/Qt/Core/pqApplicationCore.h -index d8d594fcb..784551dbd 100644 ---- a/Qt/Core/pqApplicationCore.h -+++ b/Qt/Core/pqApplicationCore.h -@@ -37,6 +37,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include "vtkSmartPointer.h" // for vtkSmartPointer - #include - #include -+#include - #include // for std::exception - - class pqInterfaceTracker; -@@ -58,7 +59,6 @@ class pqTestUtility; - class pqUndoStack; - class QApplication; - class QHelpEngine; --class QStringList; - class vtkPVXMLElement; - class vtkSMProxyLocator; - class vtkSMStateLoader; -diff --git a/Qt/Core/pqComparativeContextView.cxx b/Qt/Core/pqComparativeContextView.cxx -index 8b05173b9..7b66cb9cc 100644 ---- a/Qt/Core/pqComparativeContextView.cxx -+++ b/Qt/Core/pqComparativeContextView.cxx -@@ -206,7 +206,7 @@ void pqComparativeContextView::updateViewWidgets() - QGridLayout* layout = new QGridLayout(wdg); - layout->setHorizontalSpacing(vtkSMPropertyHelper(compView, "Spacing").GetAsInt(0)); - layout->setVerticalSpacing(vtkSMPropertyHelper(compView, "Spacing").GetAsInt(1)); -- layout->setMargin(0); -+ layout->setContentsMargins(0,0,0,0); - for (int x = 0; x < dimensions[0]; ++x) - { - for (int y = 0; y < dimensions[1]; ++y) -diff --git a/Qt/Core/pqComparativeRenderView.cxx b/Qt/Core/pqComparativeRenderView.cxx -index 6500f0f8a..2fcc8deb0 100644 ---- a/Qt/Core/pqComparativeRenderView.cxx -+++ b/Qt/Core/pqComparativeRenderView.cxx -@@ -194,7 +194,7 @@ void pqComparativeRenderView::updateViewWidgets(QWidget* container /*=nullptr*/) - QGridLayout* layout = new QGridLayout(container); - layout->setHorizontalSpacing(vtkSMPropertyHelper(compView, "Spacing").GetAsInt(0)); - layout->setVerticalSpacing(vtkSMPropertyHelper(compView, "Spacing").GetAsInt(1)); -- layout->setMargin(0); -+ layout->setContentsMargins(0,0,0,0); - for (int x = 0; x < dimensions[0]; x++) - { - for (int y = 0; y < dimensions[1]; y++) -diff --git a/Qt/Core/pqFileDialog.cxx b/Qt/Core/pqFileDialog.cxx -index 715d97327..5d23d34e0 100644 ---- a/Qt/Core/pqFileDialog.cxx -+++ b/Qt/Core/pqFileDialog.cxx -@@ -54,6 +54,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include - #include - #include -+#include - - #include - #include -@@ -113,7 +114,7 @@ QStringList GetWildCardsFromFilter(const QString& filter) - } - - // separated by spaces or semi-colons -- QStringList fs = f.split(QRegExp("[\\s+;]"), PV_QT_SKIP_EMPTY_PARTS); -+ QStringList fs = f.split(QRegularExpression("[\\s+;]"), PV_QT_SKIP_EMPTY_PARTS); - - // add a *.ext.* for every *.ext we get to support file groups - QStringList ret = fs; -@@ -626,7 +627,7 @@ void pqFileDialog::RemoveDirectoryFromFavorites(QString const& directory) - //----------------------------------------------------------------------------- - void pqFileDialog::FilterDirectoryFromFavorites(const QString& filter) - { -- this->Implementation->proxyFavoriteModel->setFilterRegExp(filter); -+ this->Implementation->proxyFavoriteModel->setFilterRegularExpression(filter); - } - - //----------------------------------------------------------------------------- -diff --git a/Qt/Core/pqFileDialogFilter.cxx b/Qt/Core/pqFileDialogFilter.cxx -index 9acdb2bb1..4daeea158 100644 ---- a/Qt/Core/pqFileDialogFilter.cxx -+++ b/Qt/Core/pqFileDialogFilter.cxx -@@ -36,6 +36,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include - #include - #include -+#include - - #include "pqFileDialogModel.h" - -@@ -75,7 +76,7 @@ void pqFileDialogFilter::setFilter(const QString& filter) - f = f.trimmed(); - - // convert all spaces into | -- f.replace(QRegExp("[\\s+;]+"), "|"); -+ f.replace(QRegularExpression ("[\\s+;]+"), "|"); - - QStringList strings = f.split("|"); - QStringList extensions_list, filepatterns_list; -diff --git a/Qt/Core/pqFileDialogModel.cxx b/Qt/Core/pqFileDialogModel.cxx -index 95f6c31e6..f6b909f6f 100644 ---- a/Qt/Core/pqFileDialogModel.cxx -+++ b/Qt/Core/pqFileDialogModel.cxx -@@ -150,12 +150,12 @@ public: - QString modificationTimeString() const - { - return QLocale::system().toString( -- QDateTime::fromTime_t(this->ModificationTime), QLocale::ShortFormat); -+ QDateTime::fromSecsSinceEpoch(this->ModificationTime), QLocale::ShortFormat); - } - - qulonglong size() const { return static_cast(this->Size); } - -- QDateTime modificationTime() const { return QDateTime::fromTime_t(this->ModificationTime); } -+ QDateTime modificationTime() const { return QDateTime::fromSecsSinceEpoch(this->ModificationTime); } - - private: - QString Label; -diff --git a/Qt/Core/pqLogViewerWidget.cxx b/Qt/Core/pqLogViewerWidget.cxx -index 644e70077..480e61b77 100644 ---- a/Qt/Core/pqLogViewerWidget.cxx -+++ b/Qt/Core/pqLogViewerWidget.cxx -@@ -41,6 +41,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include - #include - #include -+#include - #include - - #include "pqCoreUtilities.h" -@@ -71,7 +72,7 @@ public: - this->Ui.details->setText(tr("")); - } - -- void addLines(const QVector& lines) -+ void addLines(const QStringList& lines) - { - QRegularExpression scopeBegin(R"==(^\s*{ (?