From 69981284a6e1334a6258ba1a9d41626de0aa3a1f Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 25 Nov 2019 20:48:13 +0100 Subject: [PATCH 001/419] make qt5 all features and add the missing qt modules --- ports/qt5-androidextras/CONTROL | 4 + ports/qt5-androidextras/portfile.cmake | 2 + ports/qt5-base/cmake/qt_port_hashes.cmake | 12 ++ ports/qt5-canvas3d/CONTROL | 4 + ports/qt5-canvas3d/portfile.cmake | 2 + ports/qt5-doc/CONTROL | 4 + ports/qt5-doc/portfile.cmake | 2 + ports/qt5-serialbus/CONTROL | 4 + ports/qt5-serialbus/portfile.cmake | 2 + ports/qt5-translations/CONTROL | 4 + ports/qt5-translations/portfile.cmake | 2 + ports/qt5-wayland/CONTROL | 4 + ports/qt5-wayland/portfile.cmake | 2 + ports/qt5-webengine/CONTROL | 4 + ports/qt5-webengine/portfile.cmake | 2 + ports/qt5-webglplugin/CONTROL | 4 + ports/qt5-webglplugin/portfile.cmake | 2 + ports/qt5-x11extras/CONTROL | 4 + ports/qt5-x11extras/portfile.cmake | 2 + ports/qt5/CONTROL | 160 +++++++++++++++++++++- 20 files changed, 224 insertions(+), 2 deletions(-) create mode 100644 ports/qt5-androidextras/CONTROL create mode 100644 ports/qt5-androidextras/portfile.cmake create mode 100644 ports/qt5-canvas3d/CONTROL create mode 100644 ports/qt5-canvas3d/portfile.cmake create mode 100644 ports/qt5-doc/CONTROL create mode 100644 ports/qt5-doc/portfile.cmake create mode 100644 ports/qt5-serialbus/CONTROL create mode 100644 ports/qt5-serialbus/portfile.cmake create mode 100644 ports/qt5-translations/CONTROL create mode 100644 ports/qt5-translations/portfile.cmake create mode 100644 ports/qt5-wayland/CONTROL create mode 100644 ports/qt5-wayland/portfile.cmake create mode 100644 ports/qt5-webengine/CONTROL create mode 100644 ports/qt5-webengine/portfile.cmake create mode 100644 ports/qt5-webglplugin/CONTROL create mode 100644 ports/qt5-webglplugin/portfile.cmake create mode 100644 ports/qt5-x11extras/CONTROL create mode 100644 ports/qt5-x11extras/portfile.cmake diff --git a/ports/qt5-androidextras/CONTROL b/ports/qt5-androidextras/CONTROL new file mode 100644 index 00000000000000..19d48a5b2d1f04 --- /dev/null +++ b/ports/qt5-androidextras/CONTROL @@ -0,0 +1,4 @@ +Source: qt5-androidextras +Version: 5.12.5-2 +Description: Qt5 androidextras Module; +Build-Depends: qt5-base diff --git a/ports/qt5-androidextras/portfile.cmake b/ports/qt5-androidextras/portfile.cmake new file mode 100644 index 00000000000000..214726759f3cf1 --- /dev/null +++ b/ports/qt5-androidextras/portfile.cmake @@ -0,0 +1,2 @@ +include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) +qt_submodule_installation() \ No newline at end of file diff --git a/ports/qt5-base/cmake/qt_port_hashes.cmake b/ports/qt5-base/cmake/qt_port_hashes.cmake index d3ad2a0ee12035..4ea373035eb4ae 100644 --- a/ports/qt5-base/cmake/qt_port_hashes.cmake +++ b/ports/qt5-base/cmake/qt_port_hashes.cmake @@ -41,6 +41,18 @@ set(QT_HASH_qt5-webview 310beedf88cefc05458e99838e7cb71971aa24ba6c46 set(QT_HASH_qt5-winextras 053ca5f60c7946f6409ef34094b4a7d1431039407a5195e539e8edfda795da20fc695ceec58ae0df15e4dcc597047518d06a424d11fb4aaf6ae82f1d4badab33) set(QT_HASH_qt5-xmlpatterns 30b25e152970bfe51fcdeffa43d11dd51496e5ea6a5da644b13fa0ce4835302ebec651c1ecdcf9590c6689598cea9bd63748aab4ee0ec69f9155dc310a7c04c3) +##TODO +set(QT_HASH_qt5-doc 896539861151fc65b30d1685bacc0332bef131d2c9850fe29f2c58efecd99313fd45a28f77108403fba65fc64a5af6ba8a4d37f60016bd406597e682aef11cd2) +set(QT_HASH_qt5-x11extras 1e83c2d350f423053fe07c41a8b889391100df93dd50f700e98116c36b3dbad9637a618765daf97b82b7ffcd0687fc52c9590d9ce48c2a9204f1edc6d2cae248) +set(QT_HASH_qt5-androidextras dd353112b70988a48891d34aa49ed9e8d0840a7174952879da450302be182f75a19762b25b63110dbfcc3efe41af7e9dec1eef90c44eec46bcdd861256de784d) +set(QT_HASH_qt5-canvas3d 6fe4b01eef1a319faf57d545f79d8e945cfeeea306c2aa26ec3b96d4524ccec0e336fcff65a252bf40141e00f870aa2672c045dc4881a322c1b53cb00b684470) +set(QT_HASH_qt5-translations a2120add3b82fd84d44a064f08c5e781410c86dfd5eee39a01f44840063be5b4030c47989a2e6a413c4298d79b473f50968078a12793b9145d7ee8a722fd1698) +set(QT_HASH_qt5-serialbus bf013a1e052cb0011c05f5dd52757f4944c86f4bd61f57244ffa299cd443166a80d27493a0ec8e22dcff817e89081502f091736bd37a27616de933e51184b0f4) +set(QT_HASH_qt5-webengine b485d37dca14f1cf4adf01bd8b1ae52c1d4916d7acf6ed210bc9feaece8efc2aa6cee8a3ef9174b50b767e373379c6a18d14db4426ac53a8c27d2d7b222826df) +set(QT_HASH_qt5-webglplugin 8c78761ddde2acbf862fa7ee2a5c33b6ebfdba283dfffb1a77027ed727105b16fc5ab191a8b48c491a8b29e857a03984206bfffaae0864490c8bb4c850803f73) +set(QT_HASH_qt5-wayland 19e19b3d6226839856f8e8792665eda1f09f0bbf95a38077bdf2831205ee09254c8df6a521ba3f5a228bcd98c4d1929a2bd9e9aa2f6f14c218d4d7458d1a866c) + + if(QT_UPDATE_VERSION) message(STATUS "Running Qt in automatic version port update mode!") set(_VCPKG_INTERNAL_NO_HASH_CHECK 1) diff --git a/ports/qt5-canvas3d/CONTROL b/ports/qt5-canvas3d/CONTROL new file mode 100644 index 00000000000000..99cf4053a6fead --- /dev/null +++ b/ports/qt5-canvas3d/CONTROL @@ -0,0 +1,4 @@ +Source: qt5-canvas3d +Version: 5.12.5-2 +Description: Qt5 Canvas 3d Module; +Build-Depends: qt5-base diff --git a/ports/qt5-canvas3d/portfile.cmake b/ports/qt5-canvas3d/portfile.cmake new file mode 100644 index 00000000000000..214726759f3cf1 --- /dev/null +++ b/ports/qt5-canvas3d/portfile.cmake @@ -0,0 +1,2 @@ +include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) +qt_submodule_installation() \ No newline at end of file diff --git a/ports/qt5-doc/CONTROL b/ports/qt5-doc/CONTROL new file mode 100644 index 00000000000000..38dc5d58aecdb0 --- /dev/null +++ b/ports/qt5-doc/CONTROL @@ -0,0 +1,4 @@ +Source: qt5-doc +Version: 5.12.5-2 +Description: Qt5 doc Module; +Build-Depends: qt5-base diff --git a/ports/qt5-doc/portfile.cmake b/ports/qt5-doc/portfile.cmake new file mode 100644 index 00000000000000..214726759f3cf1 --- /dev/null +++ b/ports/qt5-doc/portfile.cmake @@ -0,0 +1,2 @@ +include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) +qt_submodule_installation() \ No newline at end of file diff --git a/ports/qt5-serialbus/CONTROL b/ports/qt5-serialbus/CONTROL new file mode 100644 index 00000000000000..09139f808435a3 --- /dev/null +++ b/ports/qt5-serialbus/CONTROL @@ -0,0 +1,4 @@ +Source: qt5-serialbus +Version: 5.12.5-2 +Description: Qt5 Serialbus Module; +Build-Depends: qt5-base diff --git a/ports/qt5-serialbus/portfile.cmake b/ports/qt5-serialbus/portfile.cmake new file mode 100644 index 00000000000000..214726759f3cf1 --- /dev/null +++ b/ports/qt5-serialbus/portfile.cmake @@ -0,0 +1,2 @@ +include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) +qt_submodule_installation() \ No newline at end of file diff --git a/ports/qt5-translations/CONTROL b/ports/qt5-translations/CONTROL new file mode 100644 index 00000000000000..b639eafbeb1f5d --- /dev/null +++ b/ports/qt5-translations/CONTROL @@ -0,0 +1,4 @@ +Source: qt5-translations +Version: 5.12.5-2 +Description: Qt5 translations module +Build-Depends: qt5-base diff --git a/ports/qt5-translations/portfile.cmake b/ports/qt5-translations/portfile.cmake new file mode 100644 index 00000000000000..214726759f3cf1 --- /dev/null +++ b/ports/qt5-translations/portfile.cmake @@ -0,0 +1,2 @@ +include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) +qt_submodule_installation() \ No newline at end of file diff --git a/ports/qt5-wayland/CONTROL b/ports/qt5-wayland/CONTROL new file mode 100644 index 00000000000000..fa134b0283e868 --- /dev/null +++ b/ports/qt5-wayland/CONTROL @@ -0,0 +1,4 @@ +Source: qt5-wayland +Version: 5.12.5-2 +Description: Qt5 wayland Module; +Build-Depends: qt5-base diff --git a/ports/qt5-wayland/portfile.cmake b/ports/qt5-wayland/portfile.cmake new file mode 100644 index 00000000000000..214726759f3cf1 --- /dev/null +++ b/ports/qt5-wayland/portfile.cmake @@ -0,0 +1,2 @@ +include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) +qt_submodule_installation() \ No newline at end of file diff --git a/ports/qt5-webengine/CONTROL b/ports/qt5-webengine/CONTROL new file mode 100644 index 00000000000000..db3bfbf8c5a3c7 --- /dev/null +++ b/ports/qt5-webengine/CONTROL @@ -0,0 +1,4 @@ +Source: qt5-webengine +Version: 5.12.5-2 +Description: Qt5 webengine Module; +Build-Depends: qt5-base diff --git a/ports/qt5-webengine/portfile.cmake b/ports/qt5-webengine/portfile.cmake new file mode 100644 index 00000000000000..214726759f3cf1 --- /dev/null +++ b/ports/qt5-webengine/portfile.cmake @@ -0,0 +1,2 @@ +include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) +qt_submodule_installation() \ No newline at end of file diff --git a/ports/qt5-webglplugin/CONTROL b/ports/qt5-webglplugin/CONTROL new file mode 100644 index 00000000000000..6869a98efa5695 --- /dev/null +++ b/ports/qt5-webglplugin/CONTROL @@ -0,0 +1,4 @@ +Source: qt5-webglplugin +Version: 5.12.5-2 +Description: Qt5 webglplugin Module; +Build-Depends: qt5-base diff --git a/ports/qt5-webglplugin/portfile.cmake b/ports/qt5-webglplugin/portfile.cmake new file mode 100644 index 00000000000000..214726759f3cf1 --- /dev/null +++ b/ports/qt5-webglplugin/portfile.cmake @@ -0,0 +1,2 @@ +include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) +qt_submodule_installation() \ No newline at end of file diff --git a/ports/qt5-x11extras/CONTROL b/ports/qt5-x11extras/CONTROL new file mode 100644 index 00000000000000..d09435d19afeb0 --- /dev/null +++ b/ports/qt5-x11extras/CONTROL @@ -0,0 +1,4 @@ +Source: qt5-x11extras +Version: 5.12.5-2 +Description: Qt5 x11extras Module; +Build-Depends: qt5-base diff --git a/ports/qt5-x11extras/portfile.cmake b/ports/qt5-x11extras/portfile.cmake new file mode 100644 index 00000000000000..214726759f3cf1 --- /dev/null +++ b/ports/qt5-x11extras/portfile.cmake @@ -0,0 +1,2 @@ +include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) +qt_submodule_installation() \ No newline at end of file diff --git a/ports/qt5/CONTROL b/ports/qt5/CONTROL index 86e395438b2c43..e49d5406fe25b1 100644 --- a/ports/qt5/CONTROL +++ b/ports/qt5/CONTROL @@ -2,8 +2,164 @@ Source: qt5 Version: 5.12.5 Homepage: https://www.qt.io/ Description: Qt5 Application Framework -Build-Depends: qt5-3d, qt5-activeqt (windows), qt5-base, qt5-charts, qt5-datavis3d, qt5-declarative, qt5-gamepad, qt5-graphicaleffects, qt5-imageformats, qt5-location, qt5-multimedia, qt5-mqtt, qt5-networkauth, qt5-purchasing, qt5-quickcontrols, qt5-quickcontrols2, qt5-script, qt5-scxml, qt5-sensors, qt5-serialport, qt5-speech, qt5-svg, qt5-tools, qt5-virtualkeyboard, qt5-webchannel, qt5-websockets, qt5-winextras (windows), qt5-macextras (osx), qt5-xmlpatterns +Build-Depends: qt5-base +Default-Features: 3d, extras, tools, virtualkeyboard, networkauth, quickcontrols2, scxml, activeqt, charts, datavis3d, declarative, gamepad, graphicaleffects, imageformats, location, multimedia] Feature: latest Build-Depends: qt5-base[latest] -Description: Build latest qt version (5.13.1) instead of LTS \ No newline at end of file +Description: Build latest qt version (5.13.1) instead of LTS + +Feature: all +Build-Depends: qt5[3d, webchannel, websockets, extras, xmlpatterns, sensors, serialport, speech, svg, tools, virtualkeyboard, networkauth, purchasing, quickcontrols, quickcontrols2, script, scxml, activeqt, charts, datavis3d, declarative, gamepad, graphicaleffects, declarative, imageformats, location, multimedia, mqtt, webglplugin, webview, wayland, webengine, serialbus, translations, doc, remoteobjects, connectivity, canvas3d] + +Feature: 3d +Build-Depends: qt5-3d +Description: + +Feature: webchannel +Build-Depends: qt5-webchannel +Description: + +Feature: websockets +Build-Depends: qt5-websockets +Description: + +Feature: extras +Build-Depends: qt5-winextras (windows), qt5-macextras (osx), qt5-x11extras (linux), qt5-androidextras (android) +Description: + +Feature: xmlpatterns +Build-Depends: qt5-xmlpatterns +Description: (deprecated) + +Feature: sensors +Build-Depends: qt5-sensors +Description: + +Feature: serialport +Build-Depends: qt5-serialport +Description: + +Feature: speech +Build-Depends: qt5-speech +Description: + +Feature: svg +Build-Depends: qt5-svg +Description: + +Feature: tools +Build-Depends: qt5-tools +Description: + +Feature: virtualkeyboard +Build-Depends: qt5-virtualkeyboard +Description: + +Feature: networkauth +Build-Depends: qt5-networkauth +Description: + +Feature: purchasing +Build-Depends: qt5-purchasing +Description: + +Feature: quickcontrols +Build-Depends: qt5-quickcontrols +Description: (deprecated) + +Feature: quickcontrols2 +Build-Depends: qt5-quickcontrols2 +Description: + +Feature: script +Build-Depends: qt5-script +Description: (deprecated) + +Feature: scxml +Build-Depends: qt5-scxml +Description: + +Feature: activeqt +Build-Depends: qt5-activeqt (windows) +Description: Windows Only + +Feature: charts +Build-Depends: qt5-charts +Description: + +Feature: datavis3d +Build-Depends: qt5-datavis3d +Description: + +Feature: declarative +Build-Depends: qt5-declarative +Description: + +Feature: gamepad +Build-Depends: qt5-gamepad +Description: + +Feature: graphicaleffects +Build-Depends: qt5-graphicaleffects +Description: + +Feature: declarative +Build-Depends: qt5-declarative +Description: + +Feature: imageformats +Build-Depends: qt5-imageformats +Description: + +Feature: location +Build-Depends: qt5-location +Description: + +Feature: multimedia +Build-Depends: qt5-multimedia +Description: + +Feature: mqtt +Build-Depends: qt5-mqtt +Description: + +Feature: webglplugin +Build-Depends: qt5-webglplugin +Description: + +Feature: webview +Build-Depends: qt5-webview +Description: + +Feature: wayland +Build-Depends: qt5-wayland +Description: + +Feature: webengine +Build-Depends: qt5-webengine +Description: + +Feature: serialbus +Build-Depends: qt5-serialbus +Description: + +Feature: translations +Build-Depends: qt5-translations +Description: + +Feature: doc +Build-Depends: qt5-doc +Description: + +Feature: remoteobjects +Build-Depends: qt5-remoteobjects +Description: + +Feature: connectivity +Build-Depends: qt5-connectivity +Description: + +Feature: canvas3d +Build-Depends: qt5-canvas3d +Description: From 0ceda59f2425ba787de0fc204ace47fac75a1dda Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 25 Nov 2019 22:02:07 +0100 Subject: [PATCH 002/419] fix control --- ports/qt5/CONTROL | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/ports/qt5/CONTROL b/ports/qt5/CONTROL index e49d5406fe25b1..fcad24707dcfb7 100644 --- a/ports/qt5/CONTROL +++ b/ports/qt5/CONTROL @@ -3,14 +3,27 @@ Version: 5.12.5 Homepage: https://www.qt.io/ Description: Qt5 Application Framework Build-Depends: qt5-base -Default-Features: 3d, extras, tools, virtualkeyboard, networkauth, quickcontrols2, scxml, activeqt, charts, datavis3d, declarative, gamepad, graphicaleffects, imageformats, location, multimedia] +Default-Features: essentials, default + +Feature: essentials +Build-Depends: qt5[tools, networkauth, quickcontrols2, multimedia, imageformats, declarative, svg, activeqt] +Description: Build the essential qt modules Feature: latest Build-Depends: qt5-base[latest] Description: Build latest qt version (5.13.1) instead of LTS +Feature: default +Build-Depends: qt5[3d, webchannel, websockets, extras, sensors, serialport, speech, virtualkeyboard, purchasing, scxml, charts, datavis3d, gamepad, graphicaleffects, location, webglplugin, webview, translations, remoteobjects, connectivity, canvas3d] +Description: Build the essential qt modules + Feature: all -Build-Depends: qt5[3d, webchannel, websockets, extras, xmlpatterns, sensors, serialport, speech, svg, tools, virtualkeyboard, networkauth, purchasing, quickcontrols, quickcontrols2, script, scxml, activeqt, charts, datavis3d, declarative, gamepad, graphicaleffects, declarative, imageformats, location, multimedia, mqtt, webglplugin, webview, wayland, webengine, serialbus, translations, doc, remoteobjects, connectivity, canvas3d] +Build-Depends: qt5[3d, webchannel, websockets, extras, xmlpatterns, sensors, serialport, speech, svg, tools, virtualkeyboard, networkauth, purchasing, quickcontrols, quickcontrols2, script, scxml, activeqt, charts, datavis3d, declarative, gamepad, graphicaleffects, imageformats, location, multimedia, mqtt, webglplugin, webview, wayland, webengine, serialbus, translations, doc, remoteobjects, connectivity, canvas3d] +Description: Install all Qt5 submodules (Warning: Could take a long time...) + +Feature: extras +Build-Depends: qt5-winextras (windows), qt5-macextras (osx), qt5-x11extras (linux), qt5-androidextras (android) +Description: Feature: 3d Build-Depends: qt5-3d @@ -24,10 +37,6 @@ Feature: websockets Build-Depends: qt5-websockets Description: -Feature: extras -Build-Depends: qt5-winextras (windows), qt5-macextras (osx), qt5-x11extras (linux), qt5-androidextras (android) -Description: - Feature: xmlpatterns Build-Depends: qt5-xmlpatterns Description: (deprecated) @@ -162,4 +171,4 @@ Description: Feature: canvas3d Build-Depends: qt5-canvas3d -Description: +Description: \ No newline at end of file From 2d3447f120b9618d29c81684edf20447d597b665 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 26 Nov 2019 00:02:47 +0100 Subject: [PATCH 003/419] qt5 webengine enviromnent setup --- ports/qt5-webengine/portfile.cmake | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/ports/qt5-webengine/portfile.cmake b/ports/qt5-webengine/portfile.cmake index 214726759f3cf1..d216207b1fd04a 100644 --- a/ports/qt5-webengine/portfile.cmake +++ b/ports/qt5-webengine/portfile.cmake @@ -1,2 +1,29 @@ include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) + + +vcpkg_find_acquire_program(FLEX) +vcpkg_find_acquire_program(BISON) +vcpkg_find_acquire_program(GPERF) +vcpkg_find_acquire_program(PYTHON2) +vcpkg_find_acquire_program(NINJA) +get_filename_component(FLEX_DIR "${FLEX}" DIRECTORY ) +get_filename_component(BISON_DIR "${BISON}" DIRECTORY ) +get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY ) +get_filename_component(GPERF_DIR "${GPERF}" DIRECTORY ) +get_filename_component(NINJA_DIR "${GPERF}" DIRECTORY ) + +if(NOT EXISTS "${FLEX_DIR}/flex${VCPKG_HOST_EXECUTABLE_SUFFIX}") + file(CREATE_LINK "${FLEX}" "${FLEX_DIR}/flex${VCPKG_HOST_EXECUTABLE_SUFFIX}") +endif() +if(NOT EXISTS "${BISON_DIR}/BISON${VCPKG_HOST_EXECUTABLE_SUFFIX}") + file(CREATE_LINK "${BISON}" "${BISON_DIR}/bison${VCPKG_HOST_EXECUTABLE_SUFFIX}") +endif() + +vcpkg_add_to_path(PREPEND "${FLEX_DIR}") +vcpkg_add_to_path(PREPEND "${BISON_DIR}") +vcpkg_add_to_path(PREPEND "${PYTHON2_DIR}") +vcpkg_add_to_path(PREPEND "${GPERF_DIR}") +vcpkg_add_to_path(PREPEND "${NINJA_DIR}") + + qt_submodule_installation() \ No newline at end of file From d5bca36f12c50f5f411e7d73f7283e2a6399f62f Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 3 Dec 2019 00:23:45 +0100 Subject: [PATCH 004/419] Improve HDF5 port with features --- ports/hdf5/CONTROL | 20 +++++- ports/hdf5/portfile.cmake | 135 +++++++++++++++++++++++++++++++------- 2 files changed, 129 insertions(+), 26 deletions(-) diff --git a/ports/hdf5/CONTROL b/ports/hdf5/CONTROL index 542062c5067a10..ebec3f7732dfac 100644 --- a/ports/hdf5/CONTROL +++ b/ports/hdf5/CONTROL @@ -1,8 +1,9 @@ Source: hdf5 -Version: 1.10.5-8 +Version: 1.10.5-9 Homepage: https://www.hdfgroup.org/downloads/hdf5/ Description: HDF5 is a data model, library, and file format for storing and managing data -Build-Depends: zlib, szip +Build-Depends: +Default-Features: szip, zlib Feature: parallel Description: parallel support for HDF5 @@ -10,3 +11,18 @@ Build-Depends: mpi Feature: cpp Description: Builds cpp lib + +Feature: tools +Description: Build hdf tools + +Feature: szip +Description: Build with szip +Build-Depends: szip + +Feature: zlib +Description: Build with zlib +Build-Depends: zlib + +Feature: fortran +Description: Build with fortran (not implemented yet) +Build-Depends: \ No newline at end of file diff --git a/ports/hdf5/portfile.cmake b/ports/hdf5/portfile.cmake index 2be0803359e62f..d94b203d0ee82b 100644 --- a/ports/hdf5/portfile.cmake +++ b/ports/hdf5/portfile.cmake @@ -17,49 +17,136 @@ vcpkg_extract_source_archive_ex( hdf5_config.patch ) -if ("parallel" IN_LIST FEATURES) - set(ENABLE_PARALLEL ON) -else() - set(ENABLE_PARALLEL OFF) -endif() - -if ("cpp" IN_LIST FEATURES) - set(ENABLE_CPP ON) -else() - set(ENABLE_CPP OFF) -endif() +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES # <- Keyword FEATURES is required because INVERTED_FEATURES are being used + parallel HDF5_ENABLE_PARALLEL + tools HDF5_BUILD_TOOLS + cpp HDF5_BUILD_CPP_LIB + szip HDF5_ENABLE_SZIP_SUPPORT + zlib HDF5_ENABLE_Z_LIB_SUPPORT + fortran HDF5_BUILD_FORTRAN +# INVERTED_FEATURES +# tbb ROCKSDB_IGNORE_PACKAGE_TBB +) file(REMOVE ${SOURCE_PATH}/config/cmake_ext_mod/FindSZIP.cmake)#Outdated; does not find debug szip +if(FEATURES MATCHES "tools" AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") + list(APPEND FEATURE_OPTIONS -DBUILD_STATIC_EXECS=ON) +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH}/hdf5-1.10.5 DISABLE_PARALLEL_CONFIGURE PREFER_NINJA OPTIONS + ${FEATURE_OPTIONS} -DBUILD_TESTING=OFF -DHDF5_BUILD_EXAMPLES=OFF - -DHDF5_BUILD_TOOLS=OFF - -DHDF5_BUILD_CPP_LIB=${ENABLE_CPP} - -DHDF5_ENABLE_PARALLEL=${ENABLE_PARALLEL} - -DHDF5_ENABLE_Z_LIB_SUPPORT=ON - -DHDF5_ENABLE_SZIP_SUPPORT=ON - -DHDF5_ENABLE_SZIP_ENCODING=ON + -DHDF5_ENABLE_SZIP_ENCODING=${HDF5_ENABLE_SZIP_SUPPORT} -DHDF5_INSTALL_DATA_DIR=share/hdf5/data -DHDF5_INSTALL_CMAKE_DIR=share ) - -vcpkg_install_cmake() +vcpkg_install_cmake(${COMPONENT}) vcpkg_copy_pdbs() vcpkg_fixup_cmake_targets() -#Linux build create additional scripts here. I dont know what they are doing so I am deleting them and hope for the best -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) -endif() - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(RENAME ${CURRENT_PACKAGES_DIR}/share/hdf5/data/COPYING ${CURRENT_PACKAGES_DIR}/share/hdf5/copyright) configure_file(${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake ${CURRENT_PACKAGES_DIR}/share/hdf5/vcpkg-cmake-wrapper.cmake @ONLY) + +file(READ "${CURRENT_PACKAGES_DIR}/share/hdf5/hdf5-config.cmake" contents) +string(REPLACE [[${HDF5_PACKAGE_NAME}_TOOLS_DIR "${PACKAGE_PREFIX_DIR}/bin"]] [[${HDF5_PACKAGE_NAME}_TOOLS_DIR "${PACKAGE_PREFIX_DIR}/tools/hdf5"]] contents ${contents}) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/hdf5/hdf5-config.cmake" ${contents}) + +if(FEATURES MATCHES "tools") + if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/bin) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") # waiting for single build PR to get merged + set(DEBUG_SHARED_BINS + ${CURRENT_PACKAGES_DIR}/debug/bin/h5copy-shared${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/debug/bin/h5diff-shared${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/debug/bin/h5dump-shared${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/debug/bin/h5ls-shared${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/debug/bin/h5repack-shared${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/debug/bin/h5stat-shared${VCPKG_TARGET_EXECUTABLE_SUFFIX}) + else() + set(DEBUG_SHARED_BINS ) + endif() + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/gif2h5${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/debug/bin/h52gif${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/debug/bin/h5clear${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/debug/bin/h5copy${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/debug/bin/h5debug${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/debug/bin/h5diff${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/debug/bin/h5dump${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/debug/bin/h5format_convert${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/debug/bin/h5import${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/debug/bin/h5jam${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/debug/bin/h5ls${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/debug/bin/h5mkgrp${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/debug/bin/h5repack${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/debug/bin/h5repart${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/debug/bin/h5stat${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/debug/bin/h5unjam${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/debug/bin/h5watch${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${DEBUG_SHARED_BINS}) + endif() + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") # waiting for single build PR to get merged + set(RELEASE_SHARED_BINS + ${CURRENT_PACKAGES_DIR}/bin/h5copy-shared${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/bin/h5diff-shared${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/bin/h5dump-shared${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/bin/h5ls-shared${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/bin/h5repack-shared${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/bin/h5stat-shared${VCPKG_TARGET_EXECUTABLE_SUFFIX}) + else() + set(RELEASE_SHARED_BINS ) + endif() + file(INSTALL ${CURRENT_PACKAGES_DIR}/bin/gif2h5${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/bin/h52gif${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/bin/h5clear${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/bin/h5copy${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/bin/h5debug${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/bin/h5diff${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/bin/h5dump${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/bin/h5format_convert${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/bin/h5import${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/bin/h5jam${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/bin/h5ls${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/bin/h5mkgrp${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/bin/h5repack${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/bin/h5repart${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/bin/h5stat${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/bin/h5unjam${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/bin/h5watch${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${RELEASE_SHARED_BINS} + DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) + file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/gif2h5${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/bin/h52gif${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/bin/h5clear${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/bin/h5copy${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/bin/h5debug${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/bin/h5diff${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/bin/h5dump${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/bin/h5format_convert${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/bin/h5import${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/bin/h5jam${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/bin/h5ls${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/bin/h5mkgrp${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/bin/h5repack${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/bin/h5repart${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/bin/h5stat${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/bin/h5unjam${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/bin/h5watch${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${RELEASE_SHARED_BINS} + ) + vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) +endif() + +#Linux build create additional scripts here. I dont know what they are doing so I am deleting them and hope for the best +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() \ No newline at end of file From 9edd8525d058cdff7d0517d8696ab947adcb11b1 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 3 Dec 2019 00:23:54 +0100 Subject: [PATCH 005/419] add port cgns --- ports/cgns/CONTROL | 29 +++++++++ ports/cgns/hdf5.patch | 86 +++++++++++++++++++++++++ ports/cgns/portfile.cmake | 132 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 247 insertions(+) create mode 100644 ports/cgns/CONTROL create mode 100644 ports/cgns/hdf5.patch create mode 100644 ports/cgns/portfile.cmake diff --git a/ports/cgns/CONTROL b/ports/cgns/CONTROL new file mode 100644 index 00000000000000..4a238605874571 --- /dev/null +++ b/ports/cgns/CONTROL @@ -0,0 +1,29 @@ +Source: cgns +Version: 3.4.0 +Homepage: http://cgns.org/ +Description: The CFD General Notation System (CGNS) provides a standard for recording and recovering computer data associated with the numerical solution of fluid dynamics equations. +Build-Depends: +Default-Features: hdf5, lfs + +Feature: mpi +Description: Compile with support for the message passage interface (MPI) +Build-Depends: hdf5[mpi] + +Feature: fortran +Description: Enable fortran support (not yet implemented) + +Feature: tests +Description: Build tests + +Feature: tools +Description: Build tools + +Feature: hdf5 +Description: Enable hdf5 support +Build-Depends: hdf5[tools] + +Feature: lfs +Description: Enable LFS support + +Feature: legacy +Description: Enable legacy support diff --git a/ports/cgns/hdf5.patch b/ports/cgns/hdf5.patch new file mode 100644 index 00000000000000..62ecd57f629529 --- /dev/null +++ b/ports/cgns/hdf5.patch @@ -0,0 +1,86 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 58f078fe7..46446da8a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -194,71 +194,17 @@ endif (CGNS_ENABLE_FORTRAN AND HAS_FORTRAN) + option(CGNS_ENABLE_HDF5 "Enable or disable HDF5 interface" "OFF") + if (CGNS_ENABLE_HDF5) + +- if (CGNS_BUILD_SHARED) +- set (FIND_HDF_COMPONENTS C shared) +- else (CGNS_BUILD_SHARED) +- set (FIND_HDF_COMPONENTS C static) +- endif (CGNS_BUILD_SHARED) +- message (STATUS "HDF5 find comps: ${FIND_HDF_COMPONENTS}") +- +- #set (SEARCH_PACKAGE_NAME ${HDF5_PACKAGE_NAME}) +- set (SEARCH_PACKAGE_NAME "hdf5") +- +- find_package (HDF5 NAMES ${SEARCH_PACKAGE_NAME} COMPONENTS ${FIND_HDF_COMPONENTS}) +- message (STATUS "HDF5 C libs:${HDF5_FOUND} static:${HDF5_static_C_FOUND} and shared:${HDF5_shared_C_FOUND}") +- if (HDF5_FOUND) +- add_executable (h5dump IMPORTED) +- if (NOT HDF5_static_C_FOUND AND NOT HDF5_shared_C_FOUND) +- set (FIND_HDF_COMPONENTS C) +- +- find_package (HDF5 NAMES ${SEARCH_PACKAGE_NAME} COMPONENTS ${FIND_HDF_COMPONENTS}) +- message (STATUS "HDF5 libs:${HDF5_FOUND} C:${HDF5_C_FOUND}") +- set (LINK_LIBS ${LINK_LIBS} ${HDF5_LIBRARIES}) +- if (HDF5_BUILD_SHARED_LIBS) +- add_definitions (-DH5_BUILT_AS_DYNAMIC_LIB) +- else (HDF5_BUILD_SHARED_LIBS) +- add_definitions (-DH5_BUILT_AS_STATIC_LIB) +- endif (HDF5_BUILD_SHARED_LIBS) +- if (BUILD_SHARED_LIBS AND WIN32) +- set_property (TARGET h5dump PROPERTY IMPORTED_LOCATION "${HDF5_TOOLS_DIR}/h5dumpdll") +- else (BUILD_SHARED_LIBS AND WIN32) +- set_property (TARGET h5dump PROPERTY IMPORTED_LOCATION "${HDF5_TOOLS_DIR}/h5dump") +- endif (BUILD_SHARED_LIBS AND WIN32) +- else (NOT HDF5_static_C_FOUND AND NOT HDF5_shared_C_FOUND) +- if (BUILD_SHARED_LIBS AND HDF5_shared_C_FOUND) +- set (LINK_LIBS ${LINK_LIBS} ${HDF5_C_SHARED_LIBRARY}) +- else (HDF5_static_C_FOUND) +- set (LINK_LIBS ${LINK_LIBS} ${HDF5_C_STATIC_LIBRARY}) +- endif (BUILD_SHARED_LIBS AND HDF5_shared_C_FOUND) +- set_property (TARGET h5dump PROPERTY IMPORTED_LOCATION "${HDF5_TOOLS_DIR}/h5dump") +- endif (NOT HDF5_static_C_FOUND AND NOT HDF5_shared_C_FOUND) ++ find_package(HDF5 CONFIG REQUIRED) ++ if(TARGET hdf5::hdf5-shared) ++ set (LINK_LIBS ${LINK_LIBS} hdf5::hdf5-shared) ++ #add_executable(h5dump ALIAS hdf5::h5dump-shared) ++ set (HDF5_DUMP_EXECUTABLE $) ++ else() ++ set (LINK_LIBS ${LINK_LIBS} hdf5::hdf5-static) ++ #add_executable(h5dump ALIAS hdf5::h5dump) + set (HDF5_DUMP_EXECUTABLE $) +- +- set (HDF5_HAVE_H5PUBCONF_H 1) +- set (HDF5_HAVE_HDF5 1) +- set (HDF5_HDF5_HEADER "h5pubconf.h") +- set (HDF5_INCLUDE_DIR_GEN ${HDF5_INCLUDE_DIR}) +- message (STATUS "HDF5-${HDF5_VERSION_STRING} found: INC=${HDF5_INCLUDE_DIR} TOOLS=${HDF5_TOOLS_DIR}") +- else (HDF5_FOUND) +- find_package (HDF5) # Legacy find +-#Legacy find_package does not set HDF5_TOOLS_DIR, so we set it here +- set(HDF5_TOOLS_DIR ${HDF5_LIBRARY_DIRS}/../bin) +-#Legacy find_package does not set HDF5_BUILD_SHARED_LIBS, so we set it here +- if (CGNS_BUILD_SHARED AND EXISTS "${HDF5_LIBRARY_DIRS}/libhdf5${CMAKE_SHARED_LIBRARY_SUFFIX}") +- set (HDF5_BUILD_SHARED_LIBS 1) +- add_definitions (-DH5_BUILT_AS_DYNAMIC_LIB) +- else () +- set (HDF5_BUILD_SHARED_LIBS 0) +- add_definitions (-DH5_BUILT_AS_STATIC_LIB) +- endif () +- set (LINK_LIBS ${LINK_LIBS} ${HDF5_LIBRARIES}) +- +- add_executable (h5dump IMPORTED) +- set_property (TARGET h5dump PROPERTY IMPORTED_LOCATION "${HDF5_TOOLS_DIR}/h5dump") +- set (HDF5_DUMP_EXECUTABLE $) +- endif (HDF5_FOUND) +- set (HDF5_PACKAGE_NAME ${SEARCH_PACKAGE_NAME}) +- ++ endif() ++ + if (HDF5_FOUND) + set (HDF5_HAVE_H5PUBCONF_H 1) + set (HDF5_HAVE_HDF5 1) diff --git a/ports/cgns/portfile.cmake b/ports/cgns/portfile.cmake new file mode 100644 index 00000000000000..2292373db2640a --- /dev/null +++ b/ports/cgns/portfile.cmake @@ -0,0 +1,132 @@ +# Common Ambient Variables: +# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} +# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} +# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} +# CURRENT_INSTALLED_DIR = ${VCPKG_ROOT_DIR}\installed\${TRIPLET} +# DOWNLOADS = ${VCPKG_ROOT_DIR}\downloads +# PORT = current port name (zlib, etc) +# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) +# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) +# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) +# VCPKG_ROOT_DIR = +# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) +# VCPKG_TOOLCHAIN = ON OFF +# TRIPLET_SYSTEM_ARCH = arm x86 x64 +# BUILD_ARCH = "Win32" "x64" "ARM" +# MSBUILD_PLATFORM = "Win32"/"x64"/${TRIPLET_SYSTEM_ARCH} +# DEBUG_CONFIG = "Debug Static" "Debug Dll" +# RELEASE_CONFIG = "Release Static"" "Release DLL" +# VCPKG_TARGET_IS_WINDOWS +# VCPKG_TARGET_IS_UWP +# VCPKG_TARGET_IS_LINUX +# VCPKG_TARGET_IS_OSX +# VCPKG_TARGET_IS_FREEBSD +# VCPKG_TARGET_IS_ANDROID +# VCPKG_TARGET_EXECUTABLE_SUFFIX +# VCPKG_TARGET_STATIC_LIBRARY_SUFFIX +# VCPKG_TARGET_SHARED_LIBRARY_SUFFIX +# +# See additional helpful variables in /docs/maintainers/vcpkg_common_definitions.md + +# # Specifies if the port install should fail immediately given a condition +# vcpkg_fail_port_install(MESSAGE "cgns currently only supports Linux and Mac platforms" ON_TARGET "Windows") + + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO CGNS/CGNS + REF 3420e23febf0eb38c1b05af3c157d614d8476557 # v3.4.0 + SHA512 3fec1c32f1514cd9bc327f12f3f9db6a229df05f514193bd9e913d06b8ae6465664410a3c77a30b0c29f3e999e5efcb1ebed3a8b80e14be92035940c10b1d6d7 + HEAD_REF develop + PATCHES + hdf5.patch +) + +# # Check if one or more features are a part of a package installation. +# # See /docs/maintainers/vcpkg_check_features.md for more details +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES # <- Keyword FEATURES is required because INVERTED_FEATURES are being used + mpi HDF5_NEEDS_MPI + fortran CGNS_ENABLE_FORTRAN + tests CGNS_ENABLE_TESTS + hdf5 CGNS_ENABLE_HDF5 + lfs CGNS_ENABLE_LFS + legacy CGNS_ENABLE_LEGACY +# INVERTED_FEATURES +# tbb ROCKSDB_IGNORE_PACKAGE_TBB +) + +if(VCPKG_TARGET_ARCHITECTURE MATCHES "64") + list(APPEND CGNS_BUILD_OPTS "-DCGNS_ENABLE_64BIT=ON") +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + list(APPEND CGNS_BUILD_OPTS "-DCGNS_BUILD_SHARED=ON;-DCGNS_USE_SHARED=ON") +else() + list(APPEND CGNS_BUILD_OPTS "-DCGNS_BUILD_SHARED=OFF;-DCGNS_USE_SHARED=OFF") +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA # Disable this option if project cannot be built with Ninja + OPTIONS + ${FEATURE_OPTIONS} + ${CGNS_BUILD_OPTS} + -DHDF5_NEEDS_ZLIB=${CGNS_ENABLE_HDF5} + -DHDF5_NEEDS_SZIP=${CGNS_ENABLE_HDF5} + #-DHDF5_TOOLS_DIR=${CURRENT_INSTALLED_DIR}/tools/hdf5/ +) + +vcpkg_install_cmake() + +file(INSTALL ${CURRENT_PACKAGES_DIR}/include/cgnsBuild.defs ${CURRENT_PACKAGES_DIR}/include/cgnsconfig.h DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL ${CURRENT_PACKAGES_DIR}/include/cgnsconfig.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}/) +file(REMOVE ${CURRENT_PACKAGES_DIR}/include/cgnsBuild.defs ${CURRENT_PACKAGES_DIR}/include/cgnsconfig.h) + +IF(EXISTS ${CURRENT_PACKAGES_DIR}/debug) + file(INSTALL ${CURRENT_PACKAGES_DIR}/debug/include/cgnsconfig.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}/debug) + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/include/cgnsBuild.defs ${CURRENT_PACKAGES_DIR}/debug/include/cgnsconfig.h) + file(REMOVE + ${CURRENT_PACKAGES_DIR}/debug/bin/cgnscheck${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/debug/bin/cgnscompress${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/debug/bin/cgnsconvert${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/debug/bin/cgnsdiff${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/debug/bin/cgnslist${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/debug/bin/cgnsnames${VCPKG_TARGET_EXECUTABLE_SUFFIX}) +endif() +file(REMOVE ${CURRENT_PACKAGES_DIR}/include/cgnsBuild.defs ${CURRENT_PACKAGES_DIR}/include/cgnsconfig.h) +file(GLOB_RECURSE BATCH_FILES ${CURRENT_PACKAGES_DIR}/bin/*.bat) +file(INSTALL + ${BATCH_FILES} + ${CURRENT_PACKAGES_DIR}/bin/cgnscheck${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/bin/cgnscompress${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/bin/cgnsconvert${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/bin/cgnsdiff${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/bin/cgnslist${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/bin/cgnsnames${VCPKG_TARGET_EXECUTABLE_SUFFIX} + DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) +file(REMOVE + ${BATCH_FILES} + ${CURRENT_PACKAGES_DIR}/bin/cgnscheck${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/bin/cgnscompress${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/bin/cgnsconvert${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/bin/cgnsdiff${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/bin/cgnslist${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/bin/cgnsnames${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() +# # Moves all .cmake files from /debug/share/cgns/ to /share/cgns/ +# # See /docs/maintainers/vcpkg_fixup_cmake_targets.md for more details +# vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/cgns) + +# # Handle copyright +file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +# # Post-build test for cmake libraries +# vcpkg_test_cmake(PACKAGE_NAME cgns) From ad520b96837585517acf270dbe334fbcf1151eb7 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 3 Dec 2019 09:16:40 +0100 Subject: [PATCH 006/419] fix linux build and fix cgnsconfig.h --- ports/cgns/cgnsconfig.h | 6 ++++++ ports/cgns/defines.patch | 16 ++++++++++++++++ ports/cgns/linux_lfs.patch | 12 ++++++++++++ ports/cgns/portfile.cmake | 12 +++++++----- ports/cgns/zlib_szip.patch | 27 +++++++++++++++++++++++++++ 5 files changed, 68 insertions(+), 5 deletions(-) create mode 100644 ports/cgns/cgnsconfig.h create mode 100644 ports/cgns/defines.patch create mode 100644 ports/cgns/linux_lfs.patch create mode 100644 ports/cgns/zlib_szip.patch diff --git a/ports/cgns/cgnsconfig.h b/ports/cgns/cgnsconfig.h new file mode 100644 index 00000000000000..7ebe18ac5ee9c8 --- /dev/null +++ b/ports/cgns/cgnsconfig.h @@ -0,0 +1,6 @@ +#ifndef CGNSCONFIG_H +#define CGNSCONFIG_H + +#include "cgnstypes.h" + +#endif \ No newline at end of file diff --git a/ports/cgns/defines.patch b/ports/cgns/defines.patch new file mode 100644 index 00000000000000..e17d488287a6a6 --- /dev/null +++ b/ports/cgns/defines.patch @@ -0,0 +1,16 @@ +diff --git a/src/cgnstypes.h.in b/src/cgnstypes.h.in +index 98c4e7fdc..8c6bcea62 100644 +--- a/src/cgnstypes.h.in ++++ b/src/cgnstypes.h.in +@@ -29,6 +29,11 @@ + #ifndef CGNSTYPES_H + #define CGNSTYPES_H + ++#define CG_BUILD_HDF5 @BUILDHDF5@ ++#define CG_BUILD_FORTRAN @BUILDFORTRAN@ ++#define CG_BUILD_PARALLEL @BUILDPARALLEL@ ++#define CG_BUILD_BASESCOPE @BUILDBASESCOPE@ ++ + #define CG_BUILD_LEGACY @BUILDLEGACY@ + #define CG_BUILD_64BIT @BUILD64BIT@ + #define CG_BUILD_SCOPE @BUILDSCOPE@ diff --git a/ports/cgns/linux_lfs.patch b/ports/cgns/linux_lfs.patch new file mode 100644 index 00000000000000..3ccda64e27a304 --- /dev/null +++ b/ports/cgns/linux_lfs.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 46446da8a..a3d8cd98f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -82,6 +82,7 @@ if (CGNS_ENABLE_LFS) + else (WIN32) + check_symbol_exists(open64 "sys/types.h;sys/stat.h;unistd.h" HAVE_OPEN64) + check_symbol_exists(lseek64 "sys/types.h;unistd.h" HAVE_LSEEK64) ++ add_definitions(-D_FILE_OFFSET_BITS=64 -D__LARGEFILE64_SOURCE -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE) + endif (WIN32) + if (HAVE_OPEN64) + add_definitions(-DHAVE_OPEN64) diff --git a/ports/cgns/portfile.cmake b/ports/cgns/portfile.cmake index 2292373db2640a..77dddd8dc12d3a 100644 --- a/ports/cgns/portfile.cmake +++ b/ports/cgns/portfile.cmake @@ -40,6 +40,9 @@ vcpkg_from_github( HEAD_REF develop PATCHES hdf5.patch + linux_lfs.patch + zlib_szip.patch + defines.patch ) # # Check if one or more features are a part of a package installation. @@ -72,19 +75,18 @@ vcpkg_configure_cmake( OPTIONS ${FEATURE_OPTIONS} ${CGNS_BUILD_OPTS} - -DHDF5_NEEDS_ZLIB=${CGNS_ENABLE_HDF5} - -DHDF5_NEEDS_SZIP=${CGNS_ENABLE_HDF5} #-DHDF5_TOOLS_DIR=${CURRENT_INSTALLED_DIR}/tools/hdf5/ ) vcpkg_install_cmake() file(INSTALL ${CURRENT_PACKAGES_DIR}/include/cgnsBuild.defs ${CURRENT_PACKAGES_DIR}/include/cgnsconfig.h DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL ${CURRENT_PACKAGES_DIR}/include/cgnsconfig.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}/) +#file(INSTALL ${CURRENT_PACKAGES_DIR}/include/cgnsconfig.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}/) # old config file(REMOVE ${CURRENT_PACKAGES_DIR}/include/cgnsBuild.defs ${CURRENT_PACKAGES_DIR}/include/cgnsconfig.h) +file(INSTALL cgnsconfig.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/) # we patched the config and the include is all that is needed -IF(EXISTS ${CURRENT_PACKAGES_DIR}/debug) - file(INSTALL ${CURRENT_PACKAGES_DIR}/debug/include/cgnsconfig.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}/debug) +IF(EXISTS ${CURRENT_PACKAGES_DIR}/debug) + #file(INSTALL ${CURRENT_PACKAGES_DIR}/debug/include/cgnsconfig.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}/debug) #old config file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/include/cgnsBuild.defs ${CURRENT_PACKAGES_DIR}/debug/include/cgnsconfig.h) file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/cgnscheck${VCPKG_TARGET_EXECUTABLE_SUFFIX} diff --git a/ports/cgns/zlib_szip.patch b/ports/cgns/zlib_szip.patch new file mode 100644 index 00000000000000..e20621096092ee --- /dev/null +++ b/ports/cgns/zlib_szip.patch @@ -0,0 +1,27 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 46446da8a..cd05cf51a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -219,20 +221,10 @@ if (CGNS_ENABLE_HDF5) + endif (HDF5_FOUND) + + set(HDF5_NEED_ZLIB "OFF" CACHE BOOL "Does the HDF5 library require linking to zlib?") +- if(HDF5_NEED_ZLIB) +- find_library(ZLIB_LIBRARY z) +- mark_as_advanced(CLEAR ZLIB_LIBRARY) +- else (HDF5_NEED_ZLIB) +- mark_as_advanced(FORCE ZLIB_LIBRARY) +- endif(HDF5_NEED_ZLIB) ++ set(HDF5_NEED_ZLIB ${ZLIB_FOUND}) # HDF5 does a find_dependency call + + set(HDF5_NEED_SZIP "OFF" CACHE BOOL "Does the HDF5 library require linking to zlib?") +- if (HDF5_NEED_SZIP) +- find_library(SZIP_LIBRARY szip) +- mark_as_advanced(CLEAR SZIP_LIBRARY) +- else (HDF5_NEED_SZIP) +- mark_as_advanced(FORCE SZIP_LIBRARY) +- endif (HDF5_NEED_SZIP) ++ set(HDF5_NEED_SZIP ${SZIP_FOUND}) # HDF5 does a find_dependency call + + # Check if HDF5 version is 1.8 or greater + if (HDF5_VERSION VERSION_LESS "1.8.0") From b3e516b5be91aef3cc895b0653b718849b816399 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 3 Dec 2019 09:21:30 +0100 Subject: [PATCH 007/419] use correct variable --- ports/cgns/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/cgns/portfile.cmake b/ports/cgns/portfile.cmake index 77dddd8dc12d3a..1def22178ac04f 100644 --- a/ports/cgns/portfile.cmake +++ b/ports/cgns/portfile.cmake @@ -83,7 +83,7 @@ vcpkg_install_cmake() file(INSTALL ${CURRENT_PACKAGES_DIR}/include/cgnsBuild.defs ${CURRENT_PACKAGES_DIR}/include/cgnsconfig.h DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) #file(INSTALL ${CURRENT_PACKAGES_DIR}/include/cgnsconfig.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}/) # old config file(REMOVE ${CURRENT_PACKAGES_DIR}/include/cgnsBuild.defs ${CURRENT_PACKAGES_DIR}/include/cgnsconfig.h) -file(INSTALL cgnsconfig.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/) # we patched the config and the include is all that is needed +file(INSTALL ${CURRENT_PORT_DIR}/cgnsconfig.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) # we patched the config and the include is all that is needed IF(EXISTS ${CURRENT_PACKAGES_DIR}/debug) #file(INSTALL ${CURRENT_PACKAGES_DIR}/debug/include/cgnsconfig.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}/debug) #old config From b12cb994b42e7c41d4d0a1ba82966407e515d194 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 3 Dec 2019 10:11:31 +0100 Subject: [PATCH 008/419] correctly determine szip and zlib support --- ports/cgns/zlib_szip.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/cgns/zlib_szip.patch b/ports/cgns/zlib_szip.patch index e20621096092ee..0aa5a4695831ea 100644 --- a/ports/cgns/zlib_szip.patch +++ b/ports/cgns/zlib_szip.patch @@ -12,7 +12,7 @@ index 46446da8a..cd05cf51a 100644 - else (HDF5_NEED_ZLIB) - mark_as_advanced(FORCE ZLIB_LIBRARY) - endif(HDF5_NEED_ZLIB) -+ set(HDF5_NEED_ZLIB ${ZLIB_FOUND}) # HDF5 does a find_dependency call ++ set(HDF5_NEED_ZLIB ${HDF5_ENABLE_Z_LIB_SUPPORT}) set(HDF5_NEED_SZIP "OFF" CACHE BOOL "Does the HDF5 library require linking to zlib?") - if (HDF5_NEED_SZIP) @@ -21,7 +21,7 @@ index 46446da8a..cd05cf51a 100644 - else (HDF5_NEED_SZIP) - mark_as_advanced(FORCE SZIP_LIBRARY) - endif (HDF5_NEED_SZIP) -+ set(HDF5_NEED_SZIP ${SZIP_FOUND}) # HDF5 does a find_dependency call ++ set(HDF5_NEED_SZIP ${HDF5_ENABLE_SZIP_SUPPORT}) # Check if HDF5 version is 1.8 or greater if (HDF5_VERSION VERSION_LESS "1.8.0") From 61caf7c3a1ca5fab17c07c8aba1f13ecddb1b171 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 3 Dec 2019 10:16:49 +0100 Subject: [PATCH 009/419] also deal with hdf5 and mpi in the same patch --- ports/cgns/portfile.cmake | 2 +- ports/cgns/{zlib_szip.patch => zlib_szip_mpi.patch} | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) rename ports/cgns/{zlib_szip.patch => zlib_szip_mpi.patch} (63%) diff --git a/ports/cgns/portfile.cmake b/ports/cgns/portfile.cmake index 1def22178ac04f..a7f17d8394448e 100644 --- a/ports/cgns/portfile.cmake +++ b/ports/cgns/portfile.cmake @@ -41,7 +41,7 @@ vcpkg_from_github( PATCHES hdf5.patch linux_lfs.patch - zlib_szip.patch + zlib_szip_mpi.patch defines.patch ) diff --git a/ports/cgns/zlib_szip.patch b/ports/cgns/zlib_szip_mpi.patch similarity index 63% rename from ports/cgns/zlib_szip.patch rename to ports/cgns/zlib_szip_mpi.patch index 0aa5a4695831ea..4f6608cf4d1641 100644 --- a/ports/cgns/zlib_szip.patch +++ b/ports/cgns/zlib_szip_mpi.patch @@ -12,7 +12,7 @@ index 46446da8a..cd05cf51a 100644 - else (HDF5_NEED_ZLIB) - mark_as_advanced(FORCE ZLIB_LIBRARY) - endif(HDF5_NEED_ZLIB) -+ set(HDF5_NEED_ZLIB ${HDF5_ENABLE_Z_LIB_SUPPORT}) ++ set(HDF5_NEED_ZLIB ${HDF5_ENABLE_Z_LIB_SUPPORT} CACHE INTERNAL "" FORCE) set(HDF5_NEED_SZIP "OFF" CACHE BOOL "Does the HDF5 library require linking to zlib?") - if (HDF5_NEED_SZIP) @@ -21,7 +21,15 @@ index 46446da8a..cd05cf51a 100644 - else (HDF5_NEED_SZIP) - mark_as_advanced(FORCE SZIP_LIBRARY) - endif (HDF5_NEED_SZIP) -+ set(HDF5_NEED_SZIP ${HDF5_ENABLE_SZIP_SUPPORT}) ++ set(HDF5_NEED_SZIP ${HDF5_ENABLE_SZIP_SUPPORT} CACHE INTERNAL "" FORCE) # Check if HDF5 version is 1.8 or greater if (HDF5_VERSION VERSION_LESS "1.8.0") +@@ -240,6 +231,7 @@ if (CGNS_ENABLE_HDF5) + endif (HDF5_VERSION VERSION_LESS "1.8.0") + + set(HDF5_NEED_MPI "OFF" CACHE BOOL "Does the HDF5 library require linking to mpi? (Only true if using parallel HDF5)") ++ set(HDF5_NEED_MPI ${HDF5_ENABLE_PARALLEL} CACHE INTERNAL "" FORCE) + set(MPI_INC) + set(MPI_LIBS) + if (HDF5_NEED_MPI) From 425eac2a8033c81a8a3722283c9e4c55e494aee3 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 3 Dec 2019 10:25:26 +0100 Subject: [PATCH 010/419] removed most of the unnecessary template stuff --- ports/cgns/portfile.cmake | 58 +++++++-------------------------------- 1 file changed, 10 insertions(+), 48 deletions(-) diff --git a/ports/cgns/portfile.cmake b/ports/cgns/portfile.cmake index a7f17d8394448e..ab7fd2432b55cc 100644 --- a/ports/cgns/portfile.cmake +++ b/ports/cgns/portfile.cmake @@ -1,36 +1,3 @@ -# Common Ambient Variables: -# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} -# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} -# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} -# CURRENT_INSTALLED_DIR = ${VCPKG_ROOT_DIR}\installed\${TRIPLET} -# DOWNLOADS = ${VCPKG_ROOT_DIR}\downloads -# PORT = current port name (zlib, etc) -# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) -# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) -# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) -# VCPKG_ROOT_DIR = -# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) -# VCPKG_TOOLCHAIN = ON OFF -# TRIPLET_SYSTEM_ARCH = arm x86 x64 -# BUILD_ARCH = "Win32" "x64" "ARM" -# MSBUILD_PLATFORM = "Win32"/"x64"/${TRIPLET_SYSTEM_ARCH} -# DEBUG_CONFIG = "Debug Static" "Debug Dll" -# RELEASE_CONFIG = "Release Static"" "Release DLL" -# VCPKG_TARGET_IS_WINDOWS -# VCPKG_TARGET_IS_UWP -# VCPKG_TARGET_IS_LINUX -# VCPKG_TARGET_IS_OSX -# VCPKG_TARGET_IS_FREEBSD -# VCPKG_TARGET_IS_ANDROID -# VCPKG_TARGET_EXECUTABLE_SUFFIX -# VCPKG_TARGET_STATIC_LIBRARY_SUFFIX -# VCPKG_TARGET_SHARED_LIBRARY_SUFFIX -# -# See additional helpful variables in /docs/maintainers/vcpkg_common_definitions.md - -# # Specifies if the port install should fail immediately given a condition -# vcpkg_fail_port_install(MESSAGE "cgns currently only supports Linux and Mac platforms" ON_TARGET "Windows") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -45,18 +12,14 @@ vcpkg_from_github( defines.patch ) -# # Check if one or more features are a part of a package installation. -# # See /docs/maintainers/vcpkg_check_features.md for more details vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES # <- Keyword FEATURES is required because INVERTED_FEATURES are being used + FEATURES mpi HDF5_NEEDS_MPI fortran CGNS_ENABLE_FORTRAN tests CGNS_ENABLE_TESTS hdf5 CGNS_ENABLE_HDF5 lfs CGNS_ENABLE_LFS legacy CGNS_ENABLE_LEGACY -# INVERTED_FEATURES -# tbb ROCKSDB_IGNORE_PACKAGE_TBB ) if(VCPKG_TARGET_ARCHITECTURE MATCHES "64") @@ -75,26 +38,24 @@ vcpkg_configure_cmake( OPTIONS ${FEATURE_OPTIONS} ${CGNS_BUILD_OPTS} - #-DHDF5_TOOLS_DIR=${CURRENT_INSTALLED_DIR}/tools/hdf5/ ) vcpkg_install_cmake() -file(INSTALL ${CURRENT_PACKAGES_DIR}/include/cgnsBuild.defs ${CURRENT_PACKAGES_DIR}/include/cgnsconfig.h DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -#file(INSTALL ${CURRENT_PACKAGES_DIR}/include/cgnsconfig.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}/) # old config +file(INSTALL ${CURRENT_PACKAGES_DIR}/include/cgnsBuild.defs DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) file(REMOVE ${CURRENT_PACKAGES_DIR}/include/cgnsBuild.defs ${CURRENT_PACKAGES_DIR}/include/cgnsconfig.h) + file(INSTALL ${CURRENT_PORT_DIR}/cgnsconfig.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) # we patched the config and the include is all that is needed IF(EXISTS ${CURRENT_PACKAGES_DIR}/debug) - #file(INSTALL ${CURRENT_PACKAGES_DIR}/debug/include/cgnsconfig.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}/debug) #old config file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/include/cgnsBuild.defs ${CURRENT_PACKAGES_DIR}/debug/include/cgnsconfig.h) file(REMOVE - ${CURRENT_PACKAGES_DIR}/debug/bin/cgnscheck${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/debug/bin/cgnscompress${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/debug/bin/cgnsconvert${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/debug/bin/cgnsdiff${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/debug/bin/cgnslist${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/debug/bin/cgnsnames${VCPKG_TARGET_EXECUTABLE_SUFFIX}) + ${CURRENT_PACKAGES_DIR}/debug/bin/cgnscheck${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/debug/bin/cgnscompress${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/debug/bin/cgnsconvert${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/debug/bin/cgnsdiff${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/debug/bin/cgnslist${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/debug/bin/cgnsnames${VCPKG_TARGET_EXECUTABLE_SUFFIX}) endif() file(REMOVE ${CURRENT_PACKAGES_DIR}/include/cgnsBuild.defs ${CURRENT_PACKAGES_DIR}/include/cgnsconfig.h) file(GLOB_RECURSE BATCH_FILES ${CURRENT_PACKAGES_DIR}/bin/*.bat) @@ -123,6 +84,7 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) endif() + # # Moves all .cmake files from /debug/share/cgns/ to /share/cgns/ # # See /docs/maintainers/vcpkg_fixup_cmake_targets.md for more details # vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/cgns) From a3a1262dc79b5ab03ca4197da869debaef9a39f4 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 3 Dec 2019 15:55:41 +0100 Subject: [PATCH 011/419] partial work commit. Trying to figure out which modules VTK must install --- ports/paraview/CONTROL | 10 ++++ ports/paraview/FindPythonModules.cmake | 25 ++++++++ ports/paraview/portfile.cmake | 80 ++++++++++++++++++++++++++ ports/vtk/portfile.cmake | 14 ++++- 4 files changed, 126 insertions(+), 3 deletions(-) create mode 100644 ports/paraview/CONTROL create mode 100644 ports/paraview/FindPythonModules.cmake create mode 100644 ports/paraview/portfile.cmake diff --git a/ports/paraview/CONTROL b/ports/paraview/CONTROL new file mode 100644 index 00000000000000..272a0573230ba9 --- /dev/null +++ b/ports/paraview/CONTROL @@ -0,0 +1,10 @@ +Source: paraview +Version: 5.6.3 +Homepage: https://www.paraview.org/ +Description: VTK-based Data Analysis and Visualization Application +Build-Depends: vtk[qt, python] +Default-Features: + +Feature: all_modules +Description: enables the build of all paraview modules +Build-Depends: gdal, pdal, ffmpeg, laszip diff --git a/ports/paraview/FindPythonModules.cmake b/ports/paraview/FindPythonModules.cmake new file mode 100644 index 00000000000000..f2d3c15247f9f6 --- /dev/null +++ b/ports/paraview/FindPythonModules.cmake @@ -0,0 +1,25 @@ + +# Check whether a Python module is available by name, and if it is, +# define a variable in the internal cache. +function(_find_python_module_internal module_name) + # Check for presence of the module. Even though we don't use all the + # variable names set here, assigning them suppresses their output in CMake. + execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import ${module_name}" + RESULT_VARIABLE IMPORT_${module_name}_EXITCODE + OUTPUT_VARIABLE IMPORT_${module_name}_OUTPUT + ERROR_VARIABLE IMPORT_${module_name}_ERROR + ) + if(${IMPORT_${module_name}_EXITCODE} EQUAL 0) + set(PYTHON_MODULE_${module_name}_FOUND TRUE PARENT_SCOPE) + else() + set(PYTHON_MODULE_${module_name}_FOUND FALSE PARENT_SCOPE) + endif() +endfunction() + +# Function to simplify checking if a Python module is available +function(find_python_module module_name result) + if(NOT PYTHON_MODULE_${module_name}_FOUND) + _find_python_module_internal(${module_name}) + endif() + set(${result} ${PYTHON_MODULE_${module_name}_FOUND} PARENT_SCOPE) +endfunction() diff --git a/ports/paraview/portfile.cmake b/ports/paraview/portfile.cmake new file mode 100644 index 00000000000000..b8e9cdfb364094 --- /dev/null +++ b/ports/paraview/portfile.cmake @@ -0,0 +1,80 @@ +# Common Ambient Variables: +# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} +# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} +# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} +# CURRENT_INSTALLED_DIR = ${VCPKG_ROOT_DIR}\installed\${TRIPLET} +# DOWNLOADS = ${VCPKG_ROOT_DIR}\downloads +# PORT = current port name (zlib, etc) +# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) +# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) +# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) +# VCPKG_ROOT_DIR = +# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) +# VCPKG_TOOLCHAIN = ON OFF +# TRIPLET_SYSTEM_ARCH = arm x86 x64 +# BUILD_ARCH = "Win32" "x64" "ARM" +# MSBUILD_PLATFORM = "Win32"/"x64"/${TRIPLET_SYSTEM_ARCH} +# DEBUG_CONFIG = "Debug Static" "Debug Dll" +# RELEASE_CONFIG = "Release Static"" "Release DLL" +# VCPKG_TARGET_IS_WINDOWS +# VCPKG_TARGET_IS_UWP +# VCPKG_TARGET_IS_LINUX +# VCPKG_TARGET_IS_OSX +# VCPKG_TARGET_IS_FREEBSD +# VCPKG_TARGET_IS_ANDROID +# VCPKG_TARGET_EXECUTABLE_SUFFIX +# VCPKG_TARGET_STATIC_LIBRARY_SUFFIX +# VCPKG_TARGET_SHARED_LIBRARY_SUFFIX +# +# See additional helpful variables in /docs/maintainers/vcpkg_common_definitions.md + +# # Specifies if the port install should fail immediately given a condition +# vcpkg_fail_port_install(MESSAGE "paraview currently only supports Linux and Mac platforms" ON_TARGET "Windows") + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Kitware/ParaView + REF 587b66e78632f6d30443c990141c4a99dec74f0a # v5.6.3 + SHA512 1a693074830c5ca0e95a628f7c55ca93ddc03ff832715e893e5cf69a1097c1e3afe794d264f9bcb36632ca487d78fd2961a3eb5358b5c2601387d75befbb8138 + HEAD_REF master + PATCHES +) + + +# # Check if one or more features are a part of a package installation. +# # See /docs/maintainers/vcpkg_check_features.md for more details +# vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +# FEATURES # <- Keyword FEATURES is required because INVERTED_FEATURES are being used +# tbb WITH_TBB +# INVERTED_FEATURES +# tbb ROCKSDB_IGNORE_PACKAGE_TBB +# ) + +vcpkg_find_acquire_program(PYTHON3) +get_filename_component(PYTHON3_EXE_PATH ${PYTHON3} DIRECTORY) +vcpkg_add_to_path(PREPEND "${PYTHON3_EXE_PATH}") + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA # Disable this option if project cannot be built with Ninja + OPTIONS + -DPARAVIEW_USE_EXTERNAL:BOOL=ON + -DVTK_MODULES_DIR:STRING=${CURRENT_INSTALLED_DIR}/share/vtk/Modules + -DUSE_EXTERNAL_VTK:BOOL=ON + # OPTIONS_RELEASE -DOPTIMIZE=1 + # OPTIONS_DEBUG -DDEBUGGABLE=1 +) + +#VTK_MODULE_USE_EXTERNAL_ + +vcpkg_install_cmake() + +# # Moves all .cmake files from /debug/share/paraview/ to /share/paraview/ +# # See /docs/maintainers/vcpkg_fixup_cmake_targets.md for more details +# vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/paraview) + +# # Handle copyright +# file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/paraview RENAME copyright) + +# # Post-build test for cmake libraries +# vcpkg_test_cmake(PACKAGE_NAME paraview) diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index c2d12c498f2562..0ca1dbec241208 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -1,14 +1,13 @@ -if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") +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() -include(vcpkg_common_functions) - set(VTK_SHORT_VERSION "8.2") set(VTK_LONG_VERSION "${VTK_SHORT_VERSION}.0") # ============================================================================= # Options: vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + qt VTK_Group_Qt qt VTK_WITH_QT mpi VTK_Group_MPI python VTK_WITH_PYTHON @@ -49,10 +48,16 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindGDAL.cmake DESTINATION ${SOURCE_PATH}/CM # ============================================================================= # Collect CMake options for optional components if(VTK_WITH_QT) + MESSAGE(STATUS BUILDING WITH QT) list(APPEND ADDITIONAL_OPTIONS -DVTK_Group_Qt=ON -DVTK_QT_VERSION=5 -DVTK_BUILD_QT_DESIGNER_PLUGIN=OFF + -DVTK_Module_vtkViewsQT=ON + -DVTK_Module_vtkRenderingQT=ON + -DVTK_Module_vtkGUISupportQt=ON + -DVTK_Module_vtkGUISupportQtOpenGL=ON + -DVTK_Module_vtkGUISupportQtSQL=ON ) endif() @@ -253,3 +258,6 @@ file(COPY ${SOURCE_PATH}/Copyright.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share file(RENAME ${CURRENT_PACKAGES_DIR}/share/vtk/Copyright.txt ${CURRENT_PACKAGES_DIR}/share/vtk/copyright) vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/vtk) + + +#add install for CMAKE/FindPythonModules.cmake vtkCompilerPlatformFlags vtkWrappingTools \ No newline at end of file From a50dac48159c66c3c9ce38fe01598781acb125b0 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 3 Dec 2019 17:25:19 +0100 Subject: [PATCH 012/419] fix missing setting of variable for portfiles. --- scripts/cmake/vcpkg_check_features.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/cmake/vcpkg_check_features.cmake b/scripts/cmake/vcpkg_check_features.cmake index 81ebc234d94720..c3def2cf7f8e39 100644 --- a/scripts/cmake/vcpkg_check_features.cmake +++ b/scripts/cmake/vcpkg_check_features.cmake @@ -169,8 +169,10 @@ function(vcpkg_check_features) set(_vcf_FEATURE_VARIABLE ${_vcf_ARG}) if(${_vcf_FEATURE_NAME} IN_LIST FEATURES) list(APPEND _vcf_FEATURE_OPTIONS "-D${_vcf_FEATURE_VARIABLE}=${_set_if}") + set(${_vcf_FEATURE_VARIABLE} ${_set_if} PARENT_SCOPE) else() list(APPEND _vcf_FEATURE_OPTIONS "-D${_vcf_FEATURE_VARIABLE}=${_set_else}") + set(${_vcf_FEATURE_VARIABLE} ${_set_else} PARENT_SCOPE) endif() set(_vcf_IS_FEATURE_NAME_ARG ON) endif() From 845c44176419742ee317f59577f268b56120031f Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 3 Dec 2019 17:25:30 +0100 Subject: [PATCH 013/419] bump vtk control for testing --- ports/vtk/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL index 990e2aa329fea9..f0731b24c42a3a 100644 --- a/ports/vtk/CONTROL +++ b/ports/vtk/CONTROL @@ -1,5 +1,5 @@ Source: vtk -Version: 8.2.0-9 +Version: 8.2.0-10 Description: Software system for 3D computer graphics, image processing, and visualization Homepage: https://github.com/Kitware/VTK Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, libtheora, eigen3, double-conversion, pugixml, libharu, sqlite3, netcdf-c From ac101adc17ae6ce763d8a9c543cfe9e60baa7e31 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 4 Dec 2019 00:08:28 +0100 Subject: [PATCH 014/419] working commit 1/n --- ports/paraview/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/paraview/CONTROL b/ports/paraview/CONTROL index 272a0573230ba9..24285ab4280650 100644 --- a/ports/paraview/CONTROL +++ b/ports/paraview/CONTROL @@ -2,7 +2,7 @@ Source: paraview Version: 5.6.3 Homepage: https://www.paraview.org/ Description: VTK-based Data Analysis and Visualization Application -Build-Depends: vtk[qt, python] +Build-Depends: vtk[qt, python], vtk[atlmfc] (windows) Default-Features: Feature: all_modules From d2c12c5f6234ed5fe9705b3a83731c086ebd8500 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 4 Dec 2019 16:55:41 +0100 Subject: [PATCH 015/419] working commit 2/n --- ports/paraview/CONTROL | 2 +- ports/paraview/portfile.cmake | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ports/paraview/CONTROL b/ports/paraview/CONTROL index 24285ab4280650..195c46323f7630 100644 --- a/ports/paraview/CONTROL +++ b/ports/paraview/CONTROL @@ -2,7 +2,7 @@ Source: paraview Version: 5.6.3 Homepage: https://www.paraview.org/ Description: VTK-based Data Analysis and Visualization Application -Build-Depends: vtk[qt, python], vtk[atlmfc] (windows) +Build-Depends: vtk[qt, python], vtk[atlmfc] (windows), protobuf Default-Features: Feature: all_modules diff --git a/ports/paraview/portfile.cmake b/ports/paraview/portfile.cmake index b8e9cdfb364094..ab305cd3a475be 100644 --- a/ports/paraview/portfile.cmake +++ b/ports/paraview/portfile.cmake @@ -40,7 +40,8 @@ vcpkg_from_github( PATCHES ) - +#file(REMOVE_RECURSE ${SOURCE_PATH}/ThirdPary/protobuf/vtkprotobuf) +#file(REMOVE_RECURSE ${SOURCE_PATH}/ThirdPary/QtTesting/vtkqttesting) # # Check if one or more features are a part of a package installation. # # See /docs/maintainers/vcpkg_check_features.md for more details # vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -58,13 +59,18 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA # Disable this option if project cannot be built with Ninja OPTIONS + -DCMAKE_MODULE_PATH:PATH=${CURRENT_INSTALLED_DIR}/share -DPARAVIEW_USE_EXTERNAL:BOOL=ON - -DVTK_MODULES_DIR:STRING=${CURRENT_INSTALLED_DIR}/share/vtk/Modules + -DVTK_MODULES_DIR:PATH=${CURRENT_INSTALLED_DIR}/share/vtk/Modules + -DVTK_INSTALL_PACKAGE_DIR:PATH= + -DVTK_MODULES_DIR:PATH=${CURRENT_INSTALLED_DIR}/share/vtk/Modules -DUSE_EXTERNAL_VTK:BOOL=ON + -DVTK_USE_SYSTEM_PROTOBUF:BOOL=ON # OPTIONS_RELEASE -DOPTIMIZE=1 # OPTIONS_DEBUG -DDEBUGGABLE=1 ) +#TODO. Patch .cmake from FindPythonModules in CMakeLists.txt away #VTK_MODULE_USE_EXTERNAL_ vcpkg_install_cmake() From 4b6dd455d8f6c4832043eef7e0ce9b86c77b8cec Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 4 Dec 2019 16:56:01 +0100 Subject: [PATCH 016/419] fix some vtk issues --- ports/vtk/portfile.cmake | 111 +++++++++++++++++++++++++++++---------- 1 file changed, 82 insertions(+), 29 deletions(-) diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 0ca1dbec241208..a67a4e0d54c1fc 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -87,12 +87,13 @@ if(VTK_WITH_ALL_MODULES) ) endif() -set(PROJ_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/proj.lib") -set(PROJ_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/proj_d.lib") - +include(SelectLibraryConfigurations) +find_library(PROJ_LIBRARY_RELEASE proj proj4 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(PROJ_LIBRARY_DEBUG proj proj4 proj_d proj4_d PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +select_library_configurations(PROJ) +message(STATUS ${PROJ_LIBRARY};DEBUG;${PROJ_LIBRARY_DEBUG};RELEASE;${PROJ_LIBRARY_RELEASE}) # ============================================================================= # Configure & Install - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -116,10 +117,7 @@ vcpkg_configure_cmake( -DPYTHON_EXECUTABLE=${PYTHON3} ${ADDITIONAL_OPTIONS} - OPTIONS_RELEASE - -DPROJ_LIBRARY=${PROJ_LIBRARY_REL} - OPTIONS_DEBUG - -DPROJ_LIBRARY=${PROJ_LIBRARY_DBG} + -DPROJ_LIBRARY=${PROJ_LIBRARY} ) vcpkg_install_cmake() @@ -165,24 +163,83 @@ endif() file(GLOB_RECURSE CMAKE_FILES ${CURRENT_PACKAGES_DIR}/share/vtk/Modules/*.cmake) foreach(FILE IN LISTS CMAKE_FILES) file(READ "${FILE}" _contents) + file(WRITE "${FILE}.bak" "${_contents}") string(REPLACE "\${_IMPORT_PREFIX}" "\${VTK_INSTALL_PREFIX}" _contents "${_contents}") file(WRITE "${FILE}" "${_contents}") endforeach() +# Correct 3rd Party modules in *.cmake: +set(FILE "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtkdoubleconversion.cmake") +file(READ "${FILE}" _contents) +string(REPLACE [["${VTK_INSTALL_PREFIX}/lib/double-conversion.lib"]] + [[optimized;"${VTK_INSTALL_PREFIX}/lib/double-conversion.lib";debug;"${VTK_INSTALL_PREFIX}/debug/lib/double-conversion.lib"]] + _contents "${_contents}") +file(WRITE "${FILE}" "${_contents}") + +set(FILE "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtkexpat.cmake") +file(READ "${FILE}" _contents) +string(REPLACE [["${VTK_INSTALL_PREFIX}/lib/expat.lib"]] + [[optimized;"${VTK_INSTALL_PREFIX}/lib/expat.lib";debug;"${VTK_INSTALL_PREFIX}/debug/lib/expat.lib"]] + _contents "${_contents}") +file(WRITE "${FILE}" "${_contents}") + +set(FILE "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtkjsoncpp.cmake") +file(READ "${FILE}" _contents) +string(REPLACE [["${VTK_INSTALL_PREFIX}/lib/jsoncpp.lib"]] + [[optimized;"${VTK_INSTALL_PREFIX}/lib/jsoncpp.lib";debug;"${VTK_INSTALL_PREFIX}/debug/lib/jsoncpp.lib"]] + _contents "${_contents}") +file(WRITE "${FILE}" "${_contents}") + +set(FILE "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtklibproj.cmake") +file(READ "${FILE}" _contents) +string(REPLACE [["${VTK_INSTALL_PREFIX}/lib/proj.lib"]] + [[optimized;"${VTK_INSTALL_PREFIX}/lib/proj.lib";debug;"${VTK_INSTALL_PREFIX}/debug/lib/proj_d.lib"]] + _contents "${_contents}") +file(WRITE "${FILE}" "${_contents}") + +set(FILE "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtklibxml2.cmake") +file(READ "${FILE}" _contents) +string(REPLACE [["${VTK_INSTALL_PREFIX}/lib/libxml2.lib"]] + [[optimized;"${VTK_INSTALL_PREFIX}/lib/libxml2.lib";debug;"${VTK_INSTALL_PREFIX}/debug/lib/libxml2.lib"]] + _contents "${_contents}") +file(WRITE "${FILE}" "${_contents}") + +set(FILE "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtknetcdf.cmake") +file(READ "${FILE}" _contents) +string(REPLACE [["${VTK_INSTALL_PREFIX}/lib/netcdf.lib"]] + [[optimized;"${VTK_INSTALL_PREFIX}/lib/netcdf.lib";debug;"${VTK_INSTALL_PREFIX}/debug/lib/netcdf.lib"]] + _contents "${_contents}") +file(WRITE "${FILE}" "${_contents}") + +set(FILE "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtkogg.cmake") +file(READ "${FILE}" _contents) +string(REPLACE [["${VTK_INSTALL_PREFIX}/lib/ogg.lib"]] + [[optimized;"${VTK_INSTALL_PREFIX}/lib/ogg.lib";debug;"${VTK_INSTALL_PREFIX}/debug/lib/ogg.lib"]] + _contents "${_contents}") +file(WRITE "${FILE}" "${_contents}") + +set(FILE "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtksqlite.cmake") +file(READ "${FILE}" _contents) +string(REPLACE [["${VTK_INSTALL_PREFIX}/lib/sqlite3.lib"]] + [[optimized;"${VTK_INSTALL_PREFIX}/lib/sqlite3.lib";debug;"${VTK_INSTALL_PREFIX}/debug/lib/sqlite3.lib"]] + _contents "${_contents}") +file(WRITE "${FILE}" "${_contents}") + +set(FILE "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtktheora.cmake") +file(READ "${FILE}" _contents) +string(REPLACE [["${VTK_INSTALL_PREFIX}/lib/theoraenc.lib;${VTK_INSTALL_PREFIX}/lib/theoradec.lib"]] + [[optimized;"${VTK_INSTALL_PREFIX}/lib/theoraenc.lib";optimized;"${VTK_INSTALL_PREFIX}/lib/theoradec.lib";debug;"${VTK_INSTALL_PREFIX}/debug/lib/theoraenc.lib;";debug;"${VTK_INSTALL_PREFIX}/debug/lib/theoradec.lib"]] + _contents "${_contents}") +file(WRITE "${FILE}" "${_contents}") + # ============================================================================= # Clean-up other directories # Delete the debug binary TOOL_NAME that is not required function(_vtk_remove_debug_tool TOOL_NAME) - # on windows, the tools end with .exe - set(filename_win ${CURRENT_PACKAGES_DIR}/debug/bin/${TOOL_NAME}.exe) - if(EXISTS ${filename_win}) - file(REMOVE ${filename_win}) - endif() - # on other OS, it doesn't - set(filename_unix ${CURRENT_PACKAGES_DIR}/debug/bin/${TOOL_NAME}) - if(EXISTS ${filename_unix}) - file(REMOVE ${filename_unix}) + set(filename ${CURRENT_PACKAGES_DIR}/debug/bin/${TOOL_NAME}${VCPKG_TARGET_EXECUTABLE_SUFFIX}) + if(EXISTS ${filename}) + file(REMOVE ${filename}) endif() # we also have to bend the lines referencing the tools in VTKTargets-debug.cmake # to make them point to the release version of the tools @@ -193,18 +250,12 @@ endfunction() # Move the release binary TOOL_NAME from bin to tools function(_vtk_move_release_tool TOOL_NAME) - # on windows, the tools end with .exe - set(old_filename_win "${CURRENT_PACKAGES_DIR}/bin/${TOOL_NAME}.exe") - if(EXISTS ${old_filename_win}) - file(INSTALL ${old_filename_win} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/vtk") - file(REMOVE ${old_filename_win}) - endif() - # on other OS, it doesn't - set(old_filename_unix "${CURRENT_PACKAGES_DIR}/bin/${TOOL_NAME}") - if(EXISTS ${old_filename_unix}) - file(INSTALL ${old_filename_unix} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/vtk") - file(REMOVE ${old_filename_unix}) + set(old_filename "${CURRENT_PACKAGES_DIR}/bin/${TOOL_NAME}${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + if(EXISTS ${old_filename}) + file(INSTALL ${old_filename} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/vtk") + file(REMOVE ${old_filename}) endif() + # we also have to bend the lines referencing the tools in VTKTargets-release.cmake # to make them point to the tool folder file(READ "${CURRENT_PACKAGES_DIR}/share/vtk/VTKTargets-release.cmake" VTK_TARGETS_CONTENT_RELEASE) @@ -259,5 +310,7 @@ file(RENAME ${CURRENT_PACKAGES_DIR}/share/vtk/Copyright.txt ${CURRENT_PACKAGES_D vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/vtk) +file(INSTALL "${SOURCE_PATH}/CMake/FindPythonModules.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/vtk/CMake) +file(INSTALL "${SOURCE_PATH}/CMake/vtkCompilerPlatformFlags.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/vtk) -#add install for CMAKE/FindPythonModules.cmake vtkCompilerPlatformFlags vtkWrappingTools \ No newline at end of file +#add install for CMAKE/FindPythonModules.cmake vtkCompilerPlatformFlags \ No newline at end of file From 58856452a32cee54efd6e9b7ef323fc175adda75 Mon Sep 17 00:00:00 2001 From: acdemiralp Date: Wed, 4 Dec 2019 22:51:39 +0100 Subject: [PATCH 017/419] Added vtk-m port. --- ports/vtk-m/CONTROL | 19 +++++++++++++++++++ ports/vtk-m/portfile.cmake | 21 +++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 ports/vtk-m/CONTROL create mode 100644 ports/vtk-m/portfile.cmake diff --git a/ports/vtk-m/CONTROL b/ports/vtk-m/CONTROL new file mode 100644 index 00000000000000..10083bc8e88a86 --- /dev/null +++ b/ports/vtk-m/CONTROL @@ -0,0 +1,19 @@ +Source: vtk-m +Version: 1.5.0 +Homepage: https://gitlab.kitware.com/vtk/vtk-m/ +Description: VTK-m is a toolkit of scientific visualization algorithms for emerging processor architectures. + +Feature: cuda +Description: Use the NVIDIA CUDA device adapter. +Build-Depends: cuda + +Feature: omp +Description: Use the OpenMP device adapter. + +Feature: tbb +Description: Use the Intel TBB device adapter. +Build-Depends: tbb + +Feature: mpi +Description: Use the MPI controller. +Build-Depends: mpi diff --git a/ports/vtk-m/portfile.cmake b/ports/vtk-m/portfile.cmake new file mode 100644 index 00000000000000..9961b532e3f818 --- /dev/null +++ b/ports/vtk-m/portfile.cmake @@ -0,0 +1,21 @@ +include(vcpkg_common_functions) + +vcpkg_check_features (OUT_FEATURE_OPTIONS OPTIONS FEATURES + cuda VTKm_ENABLE_CUDA + omp VTKm_ENABLE_OPENMP + tbb VTKm_ENABLE_TBB + mpi VTKm_ENABLE_MPI +) +if ("cuda" IN_LIST FEATURES AND NOT ENV{CUDACXX}) + set(ENV{CUDACXX} "$ENV{CUDA_PATH}/bin/nvcc") + set(BUILD_SHARED_LIBS OFF) # CUDA forces static build. +endif() + +list (APPEND OPTIONS -DVTKm_ENABLE_RENDERING=OFF) +vcpkg_from_gitlab (GITLAB_URL "https://gitlab.kitware.com" OUT_SOURCE_PATH SOURCE_PATH REPO vtk/vtk-m REF v1.5.0 SHA512 c75c224ce86fee694b37a841befe5b4917d7c9dfeb47c3c899632cb81b772bc3178867c45668168a5377ad3b971c4e20da798130e36f67ab957e494582f94f9a) +vcpkg_configure_cmake (SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS ${OPTIONS}) +vcpkg_install_cmake () +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/vtkm-1.5) +file (REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file (REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file (INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) From e261766ac1bd492318d3cf72b144324e4949a124 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 4 Dec 2019 22:53:24 +0100 Subject: [PATCH 018/419] added paraview feature to vtk --- ports/vtk/CONTROL | 6 +++++- ports/vtk/portfile.cmake | 10 ++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL index f0731b24c42a3a..d179a2044c446f 100644 --- a/ports/vtk/CONTROL +++ b/ports/vtk/CONTROL @@ -22,4 +22,8 @@ Build-Depends: python3 Feature: atlmfc Description: Mfc functionality for vtk on Windows -Build-Depends: atlmfc (windows) \ No newline at end of file +Build-Depends: atlmfc (windows) + +Feature: paraview +Description: Build vtk modules required by paraview +Build-Depends: vtk[qt, python], vtk[atlmfc] (windows) \ No newline at end of file diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index a67a4e0d54c1fc..b19255fab93a54 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -8,11 +8,18 @@ set(VTK_LONG_VERSION "${VTK_SHORT_VERSION}.0") # Options: vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS qt VTK_Group_Qt + qt Module_vtkGUISupportQtOpenGL + qt Module_vtkImagingOpenGL2 + qt Module_vtkIOPostgreSQL # Qt is build with libpq any way so add it here qt VTK_WITH_QT mpi VTK_Group_MPI python VTK_WITH_PYTHON openvr Module_vtkRenderingOpenVR atlmfc Module_vtkGUISupportMFC + paraview Module_vtkIOParallelExodus:BOOL + paraview Module_vtkRenderingParallel:BOOL + paraview Module_vtkRenderingVolumeAMR:BOOL + paraview Module_vtkUtilitiesEncodeString:BOOL ) set(VTK_WITH_ALL_MODULES OFF) # IMPORTANT: if ON make sure `qt5`, `mpi`, `python3`, `ffmpeg`, `gdal`, `fontconfig`, @@ -48,7 +55,6 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindGDAL.cmake DESTINATION ${SOURCE_PATH}/CM # ============================================================================= # Collect CMake options for optional components if(VTK_WITH_QT) - MESSAGE(STATUS BUILDING WITH QT) list(APPEND ADDITIONAL_OPTIONS -DVTK_Group_Qt=ON -DVTK_QT_VERSION=5 @@ -91,7 +97,7 @@ include(SelectLibraryConfigurations) find_library(PROJ_LIBRARY_RELEASE proj proj4 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(PROJ_LIBRARY_DEBUG proj proj4 proj_d proj4_d PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) select_library_configurations(PROJ) -message(STATUS ${PROJ_LIBRARY};DEBUG;${PROJ_LIBRARY_DEBUG};RELEASE;${PROJ_LIBRARY_RELEASE}) + # ============================================================================= # Configure & Install vcpkg_configure_cmake( From 3501443f8155d406b10dce98932918e5c6304233 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 4 Dec 2019 22:53:46 +0100 Subject: [PATCH 019/419] working commit 3/n --- ports/paraview/CONTROL | 2 +- ports/paraview/FindPythonModule.patch | 13 +++++++++++++ ports/paraview/FindPythonModules.cmake | 25 ------------------------- ports/paraview/portfile.cmake | 8 +++++++- 4 files changed, 21 insertions(+), 27 deletions(-) create mode 100644 ports/paraview/FindPythonModule.patch delete mode 100644 ports/paraview/FindPythonModules.cmake diff --git a/ports/paraview/CONTROL b/ports/paraview/CONTROL index 195c46323f7630..89be05c8911945 100644 --- a/ports/paraview/CONTROL +++ b/ports/paraview/CONTROL @@ -2,7 +2,7 @@ Source: paraview Version: 5.6.3 Homepage: https://www.paraview.org/ Description: VTK-based Data Analysis and Visualization Application -Build-Depends: vtk[qt, python], vtk[atlmfc] (windows), protobuf +Build-Depends: vtk[paraview], protobuf Default-Features: Feature: all_modules diff --git a/ports/paraview/FindPythonModule.patch b/ports/paraview/FindPythonModule.patch new file mode 100644 index 00000000000000..fb057c305dd849 --- /dev/null +++ b/ports/paraview/FindPythonModule.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 22de78ec7..fa63031e3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -440,7 +440,7 @@ endif() + + set(paraview_web_default ON) + if (WIN32) +- include(VTK/CMake/FindPythonModules.cmake) ++ include(VTK/CMake/FindPythonModules) + find_python_module(win32api have_pywin32) + set(paraview_web_default "${have_pywin32}") + endif () diff --git a/ports/paraview/FindPythonModules.cmake b/ports/paraview/FindPythonModules.cmake deleted file mode 100644 index f2d3c15247f9f6..00000000000000 --- a/ports/paraview/FindPythonModules.cmake +++ /dev/null @@ -1,25 +0,0 @@ - -# Check whether a Python module is available by name, and if it is, -# define a variable in the internal cache. -function(_find_python_module_internal module_name) - # Check for presence of the module. Even though we don't use all the - # variable names set here, assigning them suppresses their output in CMake. - execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import ${module_name}" - RESULT_VARIABLE IMPORT_${module_name}_EXITCODE - OUTPUT_VARIABLE IMPORT_${module_name}_OUTPUT - ERROR_VARIABLE IMPORT_${module_name}_ERROR - ) - if(${IMPORT_${module_name}_EXITCODE} EQUAL 0) - set(PYTHON_MODULE_${module_name}_FOUND TRUE PARENT_SCOPE) - else() - set(PYTHON_MODULE_${module_name}_FOUND FALSE PARENT_SCOPE) - endif() -endfunction() - -# Function to simplify checking if a Python module is available -function(find_python_module module_name result) - if(NOT PYTHON_MODULE_${module_name}_FOUND) - _find_python_module_internal(${module_name}) - endif() - set(${result} ${PYTHON_MODULE_${module_name}_FOUND} PARENT_SCOPE) -endfunction() diff --git a/ports/paraview/portfile.cmake b/ports/paraview/portfile.cmake index ab305cd3a475be..509183fcbb4cc6 100644 --- a/ports/paraview/portfile.cmake +++ b/ports/paraview/portfile.cmake @@ -38,10 +38,11 @@ vcpkg_from_github( SHA512 1a693074830c5ca0e95a628f7c55ca93ddc03ff832715e893e5cf69a1097c1e3afe794d264f9bcb36632ca487d78fd2961a3eb5358b5c2601387d75befbb8138 HEAD_REF master PATCHES + FindPythonModule.patch ) #file(REMOVE_RECURSE ${SOURCE_PATH}/ThirdPary/protobuf/vtkprotobuf) -#file(REMOVE_RECURSE ${SOURCE_PATH}/ThirdPary/QtTesting/vtkqttesting) +file(REMOVE_RECURSE "${SOURCE_PATH}/ThirdParty/QtTesting") # # Check if one or more features are a part of a package installation. # # See /docs/maintainers/vcpkg_check_features.md for more details # vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -66,6 +67,11 @@ vcpkg_configure_cmake( -DVTK_MODULES_DIR:PATH=${CURRENT_INSTALLED_DIR}/share/vtk/Modules -DUSE_EXTERNAL_VTK:BOOL=ON -DVTK_USE_SYSTEM_PROTOBUF:BOOL=ON + -DVTK_USE_SYSTEM_CGNS:BOOL=ON + -DPARAVIEW_USE_VTKM:BOOL=OFF # VTK-m port is missing + -DVTK_MODULE_ENABLE_vtkqttesting:BOOL=OFF + -DVTK_MODULE_ENABLE_vtkIOParallelExodus:BOOL=OFF + -DVTK_MODULE_ENABLE_vtkRenderingParallel:BOOL=OFF # OPTIONS_RELEASE -DOPTIMIZE=1 # OPTIONS_DEBUG -DDEBUGGABLE=1 ) From 052b60a61f3d07c4d271122c401600ea62050813 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 5 Dec 2019 00:06:41 +0100 Subject: [PATCH 020/419] paraview needs kits as it seems --- ports/paraview/portfile.cmake | 1 + ports/vtk/portfile.cmake | 11 +++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ports/paraview/portfile.cmake b/ports/paraview/portfile.cmake index 509183fcbb4cc6..7931ea3270039f 100644 --- a/ports/paraview/portfile.cmake +++ b/ports/paraview/portfile.cmake @@ -72,6 +72,7 @@ vcpkg_configure_cmake( -DVTK_MODULE_ENABLE_vtkqttesting:BOOL=OFF -DVTK_MODULE_ENABLE_vtkIOParallelExodus:BOOL=OFF -DVTK_MODULE_ENABLE_vtkRenderingParallel:BOOL=OFF + -DVTK_ENABLE_KITS:BOOL=ON # OPTIONS_RELEASE -DOPTIMIZE=1 # OPTIONS_DEBUG -DDEBUGGABLE=1 ) diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index b19255fab93a54..91477b9a9f8457 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -7,8 +7,11 @@ set(VTK_LONG_VERSION "${VTK_SHORT_VERSION}.0") # ============================================================================= # Options: vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +FEATURES qt VTK_Group_Qt + qt Module_vtkGUISupportQt qt Module_vtkGUISupportQtOpenGL + qt Module_vtkGUISupportQtSQL qt Module_vtkImagingOpenGL2 qt Module_vtkIOPostgreSQL # Qt is build with libpq any way so add it here qt VTK_WITH_QT @@ -20,6 +23,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS paraview Module_vtkRenderingParallel:BOOL paraview Module_vtkRenderingVolumeAMR:BOOL paraview Module_vtkUtilitiesEncodeString:BOOL + paraview VTK_ENABLE_KITS:BOOL ) set(VTK_WITH_ALL_MODULES OFF) # IMPORTANT: if ON make sure `qt5`, `mpi`, `python3`, `ffmpeg`, `gdal`, `fontconfig`, @@ -59,11 +63,6 @@ if(VTK_WITH_QT) -DVTK_Group_Qt=ON -DVTK_QT_VERSION=5 -DVTK_BUILD_QT_DESIGNER_PLUGIN=OFF - -DVTK_Module_vtkViewsQT=ON - -DVTK_Module_vtkRenderingQT=ON - -DVTK_Module_vtkGUISupportQt=ON - -DVTK_Module_vtkGUISupportQtOpenGL=ON - -DVTK_Module_vtkGUISupportQtSQL=ON ) endif() @@ -318,5 +317,5 @@ vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/vtk) file(INSTALL "${SOURCE_PATH}/CMake/FindPythonModules.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/vtk/CMake) file(INSTALL "${SOURCE_PATH}/CMake/vtkCompilerPlatformFlags.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/vtk) - +file(INSTALL "${SOURCE_PATH}/CMake/vtkEncodeString.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/vtk) #add install for CMAKE/FindPythonModules.cmake vtkCompilerPlatformFlags \ No newline at end of file From ed153c1a81b6a250b3d744a8a5ea0f7f79c56960 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 5 Dec 2019 16:21:22 +0100 Subject: [PATCH 021/419] need to build VTK with VTK_ENABLE_KITS. pugixml target can not be used. VTKs module system does not correctly handle linkage to targets due to a messed up dependency load order which tries to link to pugixml directly and not to the target pugixml. --- ports/vtk/portfile.cmake | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 91477b9a9f8457..78618b92463658 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -22,9 +22,11 @@ FEATURES paraview Module_vtkIOParallelExodus:BOOL paraview Module_vtkRenderingParallel:BOOL paraview Module_vtkRenderingVolumeAMR:BOOL - paraview Module_vtkUtilitiesEncodeString:BOOL - paraview VTK_ENABLE_KITS:BOOL + paraview VTK_ENABLE_KITS:BOOL ) +# paraview Module_vtkUtilitiesEncodeString:BOOL +#INVERTED_FEATURES +# paraview VTK_USE_SYSTEM_PUGIXML:BOOL # Bug in VTK 8.2.0 fixed in master but the macro for it was complelty changed so it cannot be transfered. set(VTK_WITH_ALL_MODULES OFF) # IMPORTANT: if ON make sure `qt5`, `mpi`, `python3`, `ffmpeg`, `gdal`, `fontconfig`, # `libmysql` and `atlmfc` are listed as dependency in the CONTROL file @@ -40,7 +42,7 @@ vcpkg_from_github( PATCHES fix-find-lz4.patch fix_ogg_linkage.patch - fix-pugixml-link.patch + #fix-pugixml-link.patch TARGETS do not work correctly in VTK!!!! hdf5_static.patch fix-find-lzma.patch fix-proj4.patch @@ -96,7 +98,9 @@ include(SelectLibraryConfigurations) find_library(PROJ_LIBRARY_RELEASE proj proj4 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(PROJ_LIBRARY_DEBUG proj proj4 proj_d proj4_d PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) select_library_configurations(PROJ) - +find_library(PUGIXML_LIBRARY_RELEASE pugixml PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(PUGIXML_LIBRARY_DEBUG pugixml PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +select_library_configurations(PUGIXML) # ============================================================================= # Configure & Install vcpkg_configure_cmake( @@ -123,6 +127,13 @@ vcpkg_configure_cmake( ${ADDITIONAL_OPTIONS} -DPROJ_LIBRARY=${PROJ_LIBRARY} + + #-DVTK_USE_SYSTEM_PUGIXML:BOOL=OFF + -DPUGIXML_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include + #-DPUGIXML_LIBRARIES=${PUGIXML_LIBRARY} + #-DPUGIXML_LIBRARY=${PUGIXML_LIBRARY} + -Dpugixml_LIBRARIES=${PUGIXML_LIBRARY} + #-Dpugixml_LIBRARY=${PUGIXML_LIBRARY} ) vcpkg_install_cmake() From e21fa5a7450bb02acb16d47d350fbab106850925 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 5 Dec 2019 16:21:35 +0100 Subject: [PATCH 022/419] remove double variable --- ports/paraview/portfile.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/paraview/portfile.cmake b/ports/paraview/portfile.cmake index 7931ea3270039f..fb9b67426ae926 100644 --- a/ports/paraview/portfile.cmake +++ b/ports/paraview/portfile.cmake @@ -64,7 +64,6 @@ vcpkg_configure_cmake( -DPARAVIEW_USE_EXTERNAL:BOOL=ON -DVTK_MODULES_DIR:PATH=${CURRENT_INSTALLED_DIR}/share/vtk/Modules -DVTK_INSTALL_PACKAGE_DIR:PATH= - -DVTK_MODULES_DIR:PATH=${CURRENT_INSTALLED_DIR}/share/vtk/Modules -DUSE_EXTERNAL_VTK:BOOL=ON -DVTK_USE_SYSTEM_PROTOBUF:BOOL=ON -DVTK_USE_SYSTEM_CGNS:BOOL=ON From 22d3a714702e363c087a65b52eadef5131e6076f Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 5 Dec 2019 21:15:04 +0100 Subject: [PATCH 023/419] working commit x of n --- ports/vtk/fix-pugixml-link.patch | 10 +++++----- ports/vtk/portfile.cmake | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ports/vtk/fix-pugixml-link.patch b/ports/vtk/fix-pugixml-link.patch index 8708506b6e8ac4..acdf2a8353f652 100644 --- a/ports/vtk/fix-pugixml-link.patch +++ b/ports/vtk/fix-pugixml-link.patch @@ -2,13 +2,13 @@ diff --git a/IO/CityGML/CMakeLists.txt b/IO/CityGML/CMakeLists.txt index ce979ba..322e2de 100644 --- a/IO/CityGML/CMakeLists.txt +++ b/IO/CityGML/CMakeLists.txt -@@ -4,8 +4,5 @@ vtk_module_library(vtkIOCityGML ${Module_SRCS}) +@@ -4,8 +4,8 @@ vtk_module_library(vtkIOCityGML ${Module_SRCS}) # pugixml does not set _INCLUDE_DIRS or _LIBRARIES if(VTK_USE_SYSTEM_PUGIXML AND NOT pugixml_INCLUDE_DIRS) find_package(pugixml REQUIRED) -- get_target_property(pugixml_INCLUDE_DIRS pugixml INTERFACE_INCLUDE_DIRECTORIES) + get_target_property(pugixml_INCLUDE_DIRS pugixml INTERFACE_INCLUDE_DIRECTORIES) - get_target_property(pugixml_LIBRARIES pugixml LOCATION) -- include_directories(${pugixml_INCLUDE_DIRS}) -- vtk_module_link_libraries(vtkIOCityGML LINK_PRIVATE ${pugixml_LIBRARIES}) -+ vtk_module_link_libraries(vtkIOCityGML LINK_PRIVATE pugixml) ++ #get_target_property(pugixml_LIBRARIES pugixml LOCATION) # set by portfile! + include_directories(${pugixml_INCLUDE_DIRS}) + vtk_module_link_libraries(vtkIOCityGML LINK_PRIVATE ${pugixml_LIBRARIES}) endif() diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 78618b92463658..75711cb0bf8641 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -42,7 +42,7 @@ vcpkg_from_github( PATCHES fix-find-lz4.patch fix_ogg_linkage.patch - #fix-pugixml-link.patch TARGETS do not work correctly in VTK!!!! + fix-pugixml-link.patch #TARGETS do not work correctly in VTK!!!! hdf5_static.patch fix-find-lzma.patch fix-proj4.patch From 24ef1ab58616d2ee7556d037432d7b7e7405662d Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 5 Dec 2019 23:01:02 +0100 Subject: [PATCH 024/419] fix pugixml linkage and a few other things --- ports/vtk/fix-pugixml-link.patch | 49 ++++++++++++++++++++++- ports/vtk/portfile.cmake | 67 ++++++++++++++++++++++---------- 2 files changed, 94 insertions(+), 22 deletions(-) diff --git a/ports/vtk/fix-pugixml-link.patch b/ports/vtk/fix-pugixml-link.patch index acdf2a8353f652..8dee44546fec71 100644 --- a/ports/vtk/fix-pugixml-link.patch +++ b/ports/vtk/fix-pugixml-link.patch @@ -4,11 +4,56 @@ index ce979ba..322e2de 100644 +++ b/IO/CityGML/CMakeLists.txt @@ -4,8 +4,8 @@ vtk_module_library(vtkIOCityGML ${Module_SRCS}) # pugixml does not set _INCLUDE_DIRS or _LIBRARIES - if(VTK_USE_SYSTEM_PUGIXML AND NOT pugixml_INCLUDE_DIRS) - find_package(pugixml REQUIRED) +-if(VTK_USE_SYSTEM_PUGIXML AND NOT pugixml_INCLUDE_DIRS) +- find_package(pugixml REQUIRED) ++if(VTK_USE_SYSTEM_PUGIXML) ++ find_package(pugixml REQUIRED) get_target_property(pugixml_INCLUDE_DIRS pugixml INTERFACE_INCLUDE_DIRECTORIES) - get_target_property(pugixml_LIBRARIES pugixml LOCATION) + #get_target_property(pugixml_LIBRARIES pugixml LOCATION) # set by portfile! include_directories(${pugixml_INCLUDE_DIRS}) vtk_module_link_libraries(vtkIOCityGML LINK_PRIVATE ${pugixml_LIBRARIES}) endif() +diff --git a/ThirdParty/pugixml/CMakeLists.txt b/ThirdParty/pugixml/CMakeLists.txt +index 19dcb774e..a3d0b3fba 100644 +--- a/ThirdParty/pugixml/CMakeLists.txt ++++ b/ThirdParty/pugixml/CMakeLists.txt +@@ -1,10 +1,22 @@ + vtk_module_third_party(pugixml + LIBRARIES vtkpugixml +- INCLUDE_DIRS ${vtkpugixml_SOURCE_DIR}/vtkpugixml +- ${vtkpugixml_BINARY_DIR}/vtkpugixml +- NO_ADD_SUBDIRECTORY) ++ INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/vtkpugixml ++ ${CMAKE_CURRENT_BINARY_DIR}/vtkpugixml ++ ) + +-vtk_module_export_info() +-add_subdirectory(vtkpugixml) ++#vtk_module_export_info() ++#if(NOT VTK_USE_SYSTEM_PUGIXML) ++# add_subdirectory(vtkpugixml) ++#endif() ++#vtk_target_export(vtkpugixml) + +-vtk_target_export(vtkpugixml) ++configure_file( ++ "${CMAKE_CURRENT_SOURCE_DIR}/vtk_pugixml.h.in" ++ "${CMAKE_CURRENT_BINARY_DIR}/vtk_pugixml.h") ++ ++if (NOT VTK_INSTALL_NO_DEVELOPMENT) ++ install(FILES ++ "${CMAKE_CURRENT_BINARY_DIR}/vtk_pugixml.h" ++ DESTINATION "${VTK_INSTALL_INCLUDE_DIR}" ++ COMPONENT Development) ++endif() +diff --git a/ThirdParty/pugixml/module.cmake b/ThirdParty/pugixml/module.cmake +index 3a920d1d1..572dab7b1 100644 +--- a/ThirdParty/pugixml/module.cmake ++++ b/ThirdParty/pugixml/module.cmake +@@ -1 +1,5 @@ ++if (VTK_USE_SYSTEM_PUGIXML) ++ message(STATUS "PUGIXML-LIBS:${pugixml_LIBRARIES}") ++ set(vtkpugixml_LIBRARIES ${pugixml_LIBRARIES}) ++endif () + vtk_module(vtkpugixml EXCLUDE_FROM_WRAPPING) diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 75711cb0bf8641..0e1462a064516a 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -60,22 +60,30 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindGDAL.cmake DESTINATION ${SOURCE_PATH}/CM # ============================================================================= # Collect CMake options for optional components -if(VTK_WITH_QT) +if("qt" IN_LIST FEATURES) list(APPEND ADDITIONAL_OPTIONS - -DVTK_Group_Qt=ON -DVTK_QT_VERSION=5 -DVTK_BUILD_QT_DESIGNER_PLUGIN=OFF + #-DVTK_OPENGL_HAS_EGL:BOOL=ON # Qt automatically sets EGL to yes so I assume it is generally available if Qt is installed + #-DVTK_OPENGL_HAS_GLES ) endif() -if(VTK_WITH_PYTHON) +if("python" IN_LIST FEATURES) vcpkg_find_acquire_program(PYTHON3) list(APPEND ADDITIONAL_OPTIONS - -DVTK_WRAP_PYTHON=ON + -DVTK_WRAP_PYTHON:BOOL=ON -DVTK_PYTHON_VERSION=3 ) endif() +if("java" IN_LIST FEATURES) + vcpkg_find_acquire_program(PYTHON3) + list(APPEND ADDITIONAL_OPTIONS + -DVTK_WRAP_JAVA:BOOL=ON + ) +endif() + if(VTK_WITH_ALL_MODULES) list(APPEND ADDITIONAL_OPTIONS -DVTK_BUILD_ALL_MODULES=ON @@ -94,13 +102,23 @@ if(VTK_WITH_ALL_MODULES) ) endif() -include(SelectLibraryConfigurations) -find_library(PROJ_LIBRARY_RELEASE proj proj4 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(PROJ_LIBRARY_DEBUG proj proj4 proj_d proj4_d PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -select_library_configurations(PROJ) -find_library(PUGIXML_LIBRARY_RELEASE pugixml PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(PUGIXML_LIBRARY_DEBUG pugixml PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -select_library_configurations(PUGIXML) +include(SelectLibraryConfigurations REQUIRED) + +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + find_library(PROJ_LIBRARY_RELEASE proj proj4 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) + list(APPEND PROJ_LIBRARY optimized "${PROJ_LIBRARY_RELEASE}") + find_library(PUGIXML_LIBRARY_RELEASE pugixml PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) + list(APPEND PUGIXML_LIBRARY optimized "${PUGIXML_LIBRARY_RELEASE}") +endif() +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + find_library(PROJ_LIBRARY_DEBUG proj proj4 proj_d proj4_d PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) + list(APPEND PROJ_LIBRARY debug "${PROJ_LIBRARY_DEBUG}") + find_library(PUGIXML_LIBRARY_DEBUG pugixml PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) + list(APPEND PUGIXML_LIBRARY debug "${PUGIXML_LIBRARY_DEBUG}") +endif() +string(REPLACE ";" "\\\\\\;" PROJ_LIBRARY "${PROJ_LIBRARY}") +string(REPLACE ";" "\\\\\\;" PUGIXML_LIBRARY "${PUGIXML_LIBRARY}") + # ============================================================================= # Configure & Install vcpkg_configure_cmake( @@ -116,6 +134,15 @@ vcpkg_configure_cmake( -DVTK_INSTALL_RUNTIME_DIR=bin -DVTK_FORBID_DOWNLOADS=ON + #-DVTK_OPENGL_HAS_OSMESA + #-DVTK_SMP_IMPLEMENTATION_TYPE Sequentiell # OpenMP or TBB + + #-DVTK_ANDROID_BUILD + #-DVTK_IOS_BUILD + + #-DVTK_LEGACY_REMOVE + #-DVTK_LEGACY_SILENT + # We set all libraries to "system" and explicitly list the ones that should use embedded copies -DVTK_USE_SYSTEM_LIBRARIES=ON -DVTK_USE_SYSTEM_GL2PS=OFF @@ -126,13 +153,13 @@ vcpkg_configure_cmake( -DPYTHON_EXECUTABLE=${PYTHON3} ${ADDITIONAL_OPTIONS} - -DPROJ_LIBRARY=${PROJ_LIBRARY} + "-DPROJ_LIBRARY:STRING=${PROJ_LIBRARY}" #-DVTK_USE_SYSTEM_PUGIXML:BOOL=OFF - -DPUGIXML_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include + -DPUGIXML_INCLUDE_DIR:PATH=${CURRENT_INSTALLED_DIR}/include #-DPUGIXML_LIBRARIES=${PUGIXML_LIBRARY} #-DPUGIXML_LIBRARY=${PUGIXML_LIBRARY} - -Dpugixml_LIBRARIES=${PUGIXML_LIBRARY} + "-Dpugixml_LIBRARIES:STRING=${PUGIXML_LIBRARY}" #-Dpugixml_LIBRARY=${PUGIXML_LIBRARY} ) @@ -206,12 +233,12 @@ string(REPLACE [["${VTK_INSTALL_PREFIX}/lib/jsoncpp.lib"]] _contents "${_contents}") file(WRITE "${FILE}" "${_contents}") -set(FILE "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtklibproj.cmake") -file(READ "${FILE}" _contents) -string(REPLACE [["${VTK_INSTALL_PREFIX}/lib/proj.lib"]] - [[optimized;"${VTK_INSTALL_PREFIX}/lib/proj.lib";debug;"${VTK_INSTALL_PREFIX}/debug/lib/proj_d.lib"]] - _contents "${_contents}") -file(WRITE "${FILE}" "${_contents}") +# set(FILE "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtklibproj.cmake") +# file(READ "${FILE}" _contents) +# string(REPLACE [["${VTK_INSTALL_PREFIX}/lib/proj.lib"]] + # [[optimized;"${VTK_INSTALL_PREFIX}/lib/proj.lib";debug;"${VTK_INSTALL_PREFIX}/debug/lib/proj_d.lib"]] + # _contents "${_contents}") +# file(WRITE "${FILE}" "${_contents}") set(FILE "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtklibxml2.cmake") file(READ "${FILE}" _contents) From a9ed1b3f51a217db9049dc8ac238b157ab1c80f0 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 6 Dec 2019 10:21:58 +0100 Subject: [PATCH 025/419] [paraview] use latest version --- ports/paraview/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/paraview/portfile.cmake b/ports/paraview/portfile.cmake index fb9b67426ae926..586ac1c3dc9a26 100644 --- a/ports/paraview/portfile.cmake +++ b/ports/paraview/portfile.cmake @@ -34,7 +34,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Kitware/ParaView - REF 587b66e78632f6d30443c990141c4a99dec74f0a # v5.6.3 + REF 0d5c94ac254a1eb1e55b3a0db291d97acd25790d # v5.7.0 SHA512 1a693074830c5ca0e95a628f7c55ca93ddc03ff832715e893e5cf69a1097c1e3afe794d264f9bcb36632ca487d78fd2961a3eb5358b5c2601387d75befbb8138 HEAD_REF master PATCHES From d9182947520aad76ab05035b1114b9b67398d9fe Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 6 Dec 2019 10:22:15 +0100 Subject: [PATCH 026/419] [vtk] upgrade to new version --- ports/vtk/MR6108.patch | 21 +++++++++++++ ports/vtk/{ => old}/FindGDAL.cmake | 0 ports/vtk/{ => old}/fix-find-lz4.patch | 0 ports/vtk/{ => old}/fix-find-lzma.patch | 0 ports/vtk/{ => old}/fix-proj4.patch | 0 ports/vtk/{ => old}/fix-pugixml-link.patch | 0 ports/vtk/{ => old}/fix_ogg_linkage.patch | 0 ports/vtk/{ => old}/hdf5_static.patch | 0 ports/vtk/portfile.cmake | 35 ++++++++++------------ 9 files changed, 37 insertions(+), 19 deletions(-) create mode 100644 ports/vtk/MR6108.patch rename ports/vtk/{ => old}/FindGDAL.cmake (100%) rename ports/vtk/{ => old}/fix-find-lz4.patch (100%) rename ports/vtk/{ => old}/fix-find-lzma.patch (100%) rename ports/vtk/{ => old}/fix-proj4.patch (100%) rename ports/vtk/{ => old}/fix-pugixml-link.patch (100%) rename ports/vtk/{ => old}/fix_ogg_linkage.patch (100%) rename ports/vtk/{ => old}/hdf5_static.patch (100%) diff --git a/ports/vtk/MR6108.patch b/ports/vtk/MR6108.patch new file mode 100644 index 00000000000000..e82b8b3426ce67 --- /dev/null +++ b/ports/vtk/MR6108.patch @@ -0,0 +1,21 @@ +diff --git a/ThirdParty/pugixml/CMakeLists.txt b/ThirdParty/pugixml/CMakeLists.txt +index a7ab1dc237617d3426802d56689a723fe32e7471..903ccbbd83bc92413e33e7afb207ebe680014c6d 100644 +--- a/ThirdParty/pugixml/CMakeLists.txt ++++ b/ThirdParty/pugixml/CMakeLists.txt +@@ -1,7 +1,12 @@ +-vtk_module_third_party_internal( +- LICENSE_FILES "vtkpugixml/LICENSE" +- VERSION "1.9" +- STANDARD_INCLUDE_DIRS) ++vtk_module_third_party( ++ INTERNAL ++ LICENSE_FILES "vtkpugixml/LICENSE" ++ VERSION "1.9" ++ STANDARD_INCLUDE_DIRS ++ EXTERNAL ++ PACKAGE pugixml ++ TARGETS pugixml ++ STANDARD_INCLUDE_DIRS) + + configure_file( + "${CMAKE_CURRENT_SOURCE_DIR}/vtk_pugixml.h.in" diff --git a/ports/vtk/FindGDAL.cmake b/ports/vtk/old/FindGDAL.cmake similarity index 100% rename from ports/vtk/FindGDAL.cmake rename to ports/vtk/old/FindGDAL.cmake diff --git a/ports/vtk/fix-find-lz4.patch b/ports/vtk/old/fix-find-lz4.patch similarity index 100% rename from ports/vtk/fix-find-lz4.patch rename to ports/vtk/old/fix-find-lz4.patch diff --git a/ports/vtk/fix-find-lzma.patch b/ports/vtk/old/fix-find-lzma.patch similarity index 100% rename from ports/vtk/fix-find-lzma.patch rename to ports/vtk/old/fix-find-lzma.patch diff --git a/ports/vtk/fix-proj4.patch b/ports/vtk/old/fix-proj4.patch similarity index 100% rename from ports/vtk/fix-proj4.patch rename to ports/vtk/old/fix-proj4.patch diff --git a/ports/vtk/fix-pugixml-link.patch b/ports/vtk/old/fix-pugixml-link.patch similarity index 100% rename from ports/vtk/fix-pugixml-link.patch rename to ports/vtk/old/fix-pugixml-link.patch diff --git a/ports/vtk/fix_ogg_linkage.patch b/ports/vtk/old/fix_ogg_linkage.patch similarity index 100% rename from ports/vtk/fix_ogg_linkage.patch rename to ports/vtk/old/fix_ogg_linkage.patch diff --git a/ports/vtk/hdf5_static.patch b/ports/vtk/old/hdf5_static.patch similarity index 100% rename from ports/vtk/hdf5_static.patch rename to ports/vtk/old/hdf5_static.patch diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 75711cb0bf8641..e099f90c96f976 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -8,13 +8,7 @@ set(VTK_LONG_VERSION "${VTK_SHORT_VERSION}.0") # Options: vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - qt VTK_Group_Qt - qt Module_vtkGUISupportQt - qt Module_vtkGUISupportQtOpenGL - qt Module_vtkGUISupportQtSQL - qt Module_vtkImagingOpenGL2 - qt Module_vtkIOPostgreSQL # Qt is build with libpq any way so add it here - qt VTK_WITH_QT + qt VTK_GROUP_ENABLE_Qt mpi VTK_Group_MPI python VTK_WITH_PYTHON openvr Module_vtkRenderingOpenVR @@ -22,8 +16,9 @@ FEATURES paraview Module_vtkIOParallelExodus:BOOL paraview Module_vtkRenderingParallel:BOOL paraview Module_vtkRenderingVolumeAMR:BOOL - paraview VTK_ENABLE_KITS:BOOL + ) +# paraview VTK_ENABLE_KITS:BOOL # paraview Module_vtkUtilitiesEncodeString:BOOL #INVERTED_FEATURES # paraview VTK_USE_SYSTEM_PUGIXML:BOOL # Bug in VTK 8.2.0 fixed in master but the macro for it was complelty changed so it cannot be transfered. @@ -36,16 +31,17 @@ set(VTK_WITH_ALL_MODULES OFF) # IMPORTANT: if ON make sure `qt5` vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Kitware/VTK - REF "v${VTK_LONG_VERSION}" - SHA512 fd1d9c2872baa6eca7f8105b0057b56ec554e9d5eaf25985302e7fc032bdce72255d79e3f5f16ca50504151bda49cb3a148272ba32e0f410b4bdb70959b8f3f4 + REF e4e8a4df9cc67fd2bb3dbb3b1c50a25177cbfe68 # VTK commit used by ParaView v5.7.0 + SHA512 058607a2000535474eb09ac4318937035733105b28a2fa1fef0857dc94d586239460d5d67d0c0c733984df4dc3bcb91720b2a0c16e7edf7c691b378c8ced6cc9 HEAD_REF master PATCHES - fix-find-lz4.patch - fix_ogg_linkage.patch - fix-pugixml-link.patch #TARGETS do not work correctly in VTK!!!! - hdf5_static.patch - fix-find-lzma.patch - fix-proj4.patch + MR6108.patch # Fixes usage of system pugixml! (Already merged in master) + #fix-find-lz4.patch + #fix_ogg_linkage.patch + #fix-pugixml-link.patch #TARGETS do not work correctly in VTK!!!! + #hdf5_static.patch + #fix-find-lzma.patch + #fix-proj4.patch ) # Remove the FindGLEW.cmake and FindPythonLibs.cmake that are distributed with VTK, @@ -53,10 +49,10 @@ vcpkg_from_github( # The default files distributed with CMake (>= 3.9) should be superior by all means. # For GDAL, the one distributed with CMake does not detect the debug libraries correctly, # so we provide an own one. -file(REMOVE ${SOURCE_PATH}/CMake/FindGLEW.cmake) -file(REMOVE ${SOURCE_PATH}/CMake/FindPythonLibs.cmake) +#file(REMOVE ${SOURCE_PATH}/CMake/FindGLEW.cmake) +#file(REMOVE ${SOURCE_PATH}/CMake/FindPythonLibs.cmake) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindGDAL.cmake DESTINATION ${SOURCE_PATH}/CMake) +#file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindGDAL.cmake DESTINATION ${SOURCE_PATH}/CMake) # ============================================================================= # Collect CMake options for optional components @@ -108,6 +104,7 @@ vcpkg_configure_cmake( PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} -DBUILD_TESTING=OFF + -DVTK_BUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF -DVTK_INSTALL_INCLUDE_DIR=include -DVTK_INSTALL_DATA_DIR=share/vtk/data From 520eb1b60af8a3440dbc149c915b533727e58b11 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 6 Dec 2019 12:27:03 +0100 Subject: [PATCH 027/419] make vtk configure and maybe build. --- ports/vtk/CONTROL | 10 +- ports/vtk/portfile.cmake | 283 ++++++++++++++++++--------------------- 2 files changed, 140 insertions(+), 153 deletions(-) diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL index d179a2044c446f..c8597728d036fb 100644 --- a/ports/vtk/CONTROL +++ b/ports/vtk/CONTROL @@ -1,8 +1,8 @@ Source: vtk -Version: 8.2.0-10 +Version: 8.2-PV-v5.7 Description: Software system for 3D computer graphics, image processing, and visualization Homepage: https://github.com/Kitware/VTK -Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, libtheora, eigen3, double-conversion, pugixml, libharu, sqlite3, netcdf-c +Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, liblzma, libtheora, eigen3, double-conversion, pugixml, libharu, sqlite3, netcdf-c, utfcpp, libogg Feature: openvr Description: OpenVR functionality for VTK @@ -26,4 +26,8 @@ Build-Depends: atlmfc (windows) Feature: paraview Description: Build vtk modules required by paraview -Build-Depends: vtk[qt, python], vtk[atlmfc] (windows) \ No newline at end of file +Build-Depends: vtk[qt, python], vtk[atlmfc] (windows) + +Feature: all +Description: Build vtk modules required by paraview +Build-Depends: libmysql, ffmpeg, gdal, vtk[qt, python, mpi], vtk[atlmfc] (windows) \ No newline at end of file diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index e099f90c96f976..9a1b7cbc56ef03 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -2,29 +2,34 @@ 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(VTK_SHORT_VERSION "8.2") -set(VTK_LONG_VERSION "${VTK_SHORT_VERSION}.0") # ============================================================================= # Options: -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS -FEATURES - qt VTK_GROUP_ENABLE_Qt - mpi VTK_Group_MPI - python VTK_WITH_PYTHON - openvr Module_vtkRenderingOpenVR - atlmfc Module_vtkGUISupportMFC - paraview Module_vtkIOParallelExodus:BOOL - paraview Module_vtkRenderingParallel:BOOL - paraview Module_vtkRenderingVolumeAMR:BOOL - -) -# paraview VTK_ENABLE_KITS:BOOL -# paraview Module_vtkUtilitiesEncodeString:BOOL -#INVERTED_FEATURES -# paraview VTK_USE_SYSTEM_PUGIXML:BOOL # Bug in VTK 8.2.0 fixed in master but the macro for it was complelty changed so it cannot be transfered. +# Collect CMake options for optional components +if("qt" IN_LIST FEATURES) + list(APPEND ADDITIONAL_OPTIONS + -DVTK_GROUP_ENABLE_Qt=YES + -DVTK_BUILD_QT_DESIGNER_PLUGIN=OFF + ) +endif() -set(VTK_WITH_ALL_MODULES OFF) # IMPORTANT: if ON make sure `qt5`, `mpi`, `python3`, `ffmpeg`, `gdal`, `fontconfig`, - # `libmysql` and `atlmfc` are listed as dependency in the CONTROL file +if("python" IN_LIST FEATURES) + vcpkg_find_acquire_program(PYTHON3) + list(APPEND ADDITIONAL_OPTIONS + -DVTK_WRAP_PYTHON=ON + -DVTK_PYTHON_VERSION=3 + ) +endif() + +if("mpi" IN_LIST FEATURES) + set(VTK_GROUP_ENABLE_MPI NO) +endif() + +if("all" IN_LIST FEATURES) + set(VTK_WITH_ALL_MODULES ON) # IMPORTANT: if ON make sure `qt5`, `mpi`, `python3`, `ffmpeg`, `gdal`, `fontconfig`, + # `libmysql` and `atlmfc` are listed as dependency in the CONTROL file +else() + set(VTK_WITH_ALL_MODULES OFF) +endif() # ============================================================================= # Clone & patch @@ -36,12 +41,6 @@ vcpkg_from_github( HEAD_REF master PATCHES MR6108.patch # Fixes usage of system pugixml! (Already merged in master) - #fix-find-lz4.patch - #fix_ogg_linkage.patch - #fix-pugixml-link.patch #TARGETS do not work correctly in VTK!!!! - #hdf5_static.patch - #fix-find-lzma.patch - #fix-proj4.patch ) # Remove the FindGLEW.cmake and FindPythonLibs.cmake that are distributed with VTK, @@ -55,81 +54,65 @@ vcpkg_from_github( #file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindGDAL.cmake DESTINATION ${SOURCE_PATH}/CMake) # ============================================================================= -# Collect CMake options for optional components -if(VTK_WITH_QT) - list(APPEND ADDITIONAL_OPTIONS - -DVTK_Group_Qt=ON - -DVTK_QT_VERSION=5 - -DVTK_BUILD_QT_DESIGNER_PLUGIN=OFF - ) -endif() -if(VTK_WITH_PYTHON) - vcpkg_find_acquire_program(PYTHON3) - list(APPEND ADDITIONAL_OPTIONS - -DVTK_WRAP_PYTHON=ON - -DVTK_PYTHON_VERSION=3 - ) -endif() if(VTK_WITH_ALL_MODULES) list(APPEND ADDITIONAL_OPTIONS -DVTK_BUILD_ALL_MODULES=ON -DVTK_USE_TK=OFF # TCL/TK currently not included in vcpkg - # -DVTK_USE_SYSTEM_AUTOBAHN=ON - # -DVTK_USE_SYSTEM_SIX=ON - # -DVTK_USE_SYSTEM_MPI4PY=ON - # -DVTK_USE_SYSTEM_CONSTANTLY=ON - # -DVTK_USE_SYSTEM_INCREMENTAL=ON - # -DVTK_USE_SYSTEM_TWISTED=ON - # -DVTK_USE_SYSTEM_XDMF2=ON - # -DVTK_USE_SYSTEM_XDMF3=ON - # -DVTK_USE_SYSTEM_ZFP=ON - # -DVTK_USE_SYSTEM_ZOPE=ON - # -DVTK_USE_SYSTEM_LIBPROJ=ON ) endif() -include(SelectLibraryConfigurations) -find_library(PROJ_LIBRARY_RELEASE proj proj4 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(PROJ_LIBRARY_DEBUG proj proj4 proj_d proj4_d PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -select_library_configurations(PROJ) -find_library(PUGIXML_LIBRARY_RELEASE pugixml PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(PUGIXML_LIBRARY_DEBUG pugixml PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -select_library_configurations(PUGIXML) +# include(SelectLibraryConfigurations) +# find_library(PROJ_LIBRARY_RELEASE proj proj4 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +# find_library(PROJ_LIBRARY_DEBUG proj proj4 proj_d proj4_d PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +# select_library_configurations(PROJ) +# find_library(PUGIXML_LIBRARY_RELEASE pugixml PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +# find_library(PUGIXML_LIBRARY_DEBUG pugixml PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +# select_library_configurations(PUGIXML) # ============================================================================= # Configure & Install + +# We set all libraries to "system" and explicitly list the ones that should use embedded copies + +# set(EXTERNAL_MODULES doubleconversion eigen expat freetype glew hdf5 jpeg jsoncpp libharu libproj libxml2 lz4 lzma netcdf ogg pugixml sqlite theora tiff utf8 zlib) +# foreach(dep IN_LIST EXTERNAL_MODULES) + # list(APPEND ADDITIONAL_OPTIONS -DVTK_MODULE_USE_EXTERNAL_VTK_${dep}:BOOL=ON) +# endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} -DBUILD_TESTING=OFF -DVTK_BUILD_TESTING=OFF - -DBUILD_EXAMPLES=OFF + -DVTK_BUILD_EXAMPLES=OFF -DVTK_INSTALL_INCLUDE_DIR=include -DVTK_INSTALL_DATA_DIR=share/vtk/data -DVTK_INSTALL_DOC_DIR=share/vtk/doc -DVTK_INSTALL_PACKAGE_DIR=share/vtk -DVTK_INSTALL_RUNTIME_DIR=bin -DVTK_FORBID_DOWNLOADS=ON - - # We set all libraries to "system" and explicitly list the ones that should use embedded copies - -DVTK_USE_SYSTEM_LIBRARIES=ON - -DVTK_USE_SYSTEM_GL2PS=OFF - + + -DVTK_GROUP_ENABLE_StandAlone=YES + -DVTK_GROUP_ENABLE_Rendering=YES + -DVTK_GROUP_ENABLE_Views=YES + # Select modules / groups to install - -DVTK_Group_Imaging=ON - -DVTK_Group_Views=ON + -DVTK_USE_EXTERNAL:BOOL=ON + -DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps:BOOL=OFF -DPYTHON_EXECUTABLE=${PYTHON3} ${ADDITIONAL_OPTIONS} - -DPROJ_LIBRARY=${PROJ_LIBRARY} + + # Explicit library paths + #-DPROJ_LIBRARY=${PROJ_LIBRARY} #-DVTK_USE_SYSTEM_PUGIXML:BOOL=OFF - -DPUGIXML_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include + #-DPUGIXML_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include #-DPUGIXML_LIBRARIES=${PUGIXML_LIBRARY} #-DPUGIXML_LIBRARY=${PUGIXML_LIBRARY} - -Dpugixml_LIBRARIES=${PUGIXML_LIBRARY} + #-Dpugixml_LIBRARIES=${PUGIXML_LIBRARY} #-Dpugixml_LIBRARY=${PUGIXML_LIBRARY} ) @@ -142,21 +125,21 @@ vcpkg_fixup_cmake_targets() # For some reason the references to the XDMF libraries in the target files do not end up # correctly, so we fix them here. -if(VTK_WITH_ALL_MODULES) - file(READ ${CURRENT_PACKAGES_DIR}/share/vtk/VTKTargets-release.cmake VTK_TARGETS_RELEASE_CONTENT) - string(REPLACE "lib/../XdmfCore.lib" "lib/XdmfCore.lib" VTK_TARGETS_RELEASE_CONTENT "${VTK_TARGETS_RELEASE_CONTENT}") - string(REPLACE "bin/../XdmfCore.dll" "bin/XdmfCore.dll" VTK_TARGETS_RELEASE_CONTENT "${VTK_TARGETS_RELEASE_CONTENT}") - string(REPLACE "lib/../vtkxdmf3.lib" "lib/vtkxdmf3.lib" VTK_TARGETS_RELEASE_CONTENT "${VTK_TARGETS_RELEASE_CONTENT}") - string(REPLACE "bin/../vtkxdmf3.dll" "bin/vtkxdmf3.dll" VTK_TARGETS_RELEASE_CONTENT "${VTK_TARGETS_RELEASE_CONTENT}") - file(WRITE ${CURRENT_PACKAGES_DIR}/share/vtk/VTKTargets-release.cmake "${VTK_TARGETS_RELEASE_CONTENT}") - - file(READ ${CURRENT_PACKAGES_DIR}/share/vtk/VTKTargets-debug.cmake VTK_TARGETS_DEBUG_CONTENT) - string(REPLACE "lib/../XdmfCore.lib" "lib/XdmfCore.lib" VTK_TARGETS_DEBUG_CONTENT "${VTK_TARGETS_DEBUG_CONTENT}") - string(REPLACE "bin/../XdmfCore.dll" "bin/XdmfCore.dll" VTK_TARGETS_DEBUG_CONTENT "${VTK_TARGETS_DEBUG_CONTENT}") - string(REPLACE "lib/../vtkxdmf3.lib" "lib/vtkxdmf3.lib" VTK_TARGETS_DEBUG_CONTENT "${VTK_TARGETS_DEBUG_CONTENT}") - string(REPLACE "bin/../vtkxdmf3.dll" "bin/vtkxdmf3.dll" VTK_TARGETS_DEBUG_CONTENT "${VTK_TARGETS_DEBUG_CONTENT}") - file(WRITE ${CURRENT_PACKAGES_DIR}/share/vtk/VTKTargets-debug.cmake "${VTK_TARGETS_DEBUG_CONTENT}") -endif() +# if(VTK_WITH_ALL_MODULES) + # file(READ ${CURRENT_PACKAGES_DIR}/share/vtk/VTKTargets-release.cmake VTK_TARGETS_RELEASE_CONTENT) + # string(REPLACE "lib/../XdmfCore.lib" "lib/XdmfCore.lib" VTK_TARGETS_RELEASE_CONTENT "${VTK_TARGETS_RELEASE_CONTENT}") + # string(REPLACE "bin/../XdmfCore.dll" "bin/XdmfCore.dll" VTK_TARGETS_RELEASE_CONTENT "${VTK_TARGETS_RELEASE_CONTENT}") + # string(REPLACE "lib/../vtkxdmf3.lib" "lib/vtkxdmf3.lib" VTK_TARGETS_RELEASE_CONTENT "${VTK_TARGETS_RELEASE_CONTENT}") + # string(REPLACE "bin/../vtkxdmf3.dll" "bin/vtkxdmf3.dll" VTK_TARGETS_RELEASE_CONTENT "${VTK_TARGETS_RELEASE_CONTENT}") + # file(WRITE ${CURRENT_PACKAGES_DIR}/share/vtk/VTKTargets-release.cmake "${VTK_TARGETS_RELEASE_CONTENT}") + + # file(READ ${CURRENT_PACKAGES_DIR}/share/vtk/VTKTargets-debug.cmake VTK_TARGETS_DEBUG_CONTENT) + # string(REPLACE "lib/../XdmfCore.lib" "lib/XdmfCore.lib" VTK_TARGETS_DEBUG_CONTENT "${VTK_TARGETS_DEBUG_CONTENT}") + # string(REPLACE "bin/../XdmfCore.dll" "bin/XdmfCore.dll" VTK_TARGETS_DEBUG_CONTENT "${VTK_TARGETS_DEBUG_CONTENT}") + # string(REPLACE "lib/../vtkxdmf3.lib" "lib/vtkxdmf3.lib" VTK_TARGETS_DEBUG_CONTENT "${VTK_TARGETS_DEBUG_CONTENT}") + # string(REPLACE "bin/../vtkxdmf3.dll" "bin/vtkxdmf3.dll" VTK_TARGETS_DEBUG_CONTENT "${VTK_TARGETS_DEBUG_CONTENT}") + # file(WRITE ${CURRENT_PACKAGES_DIR}/share/vtk/VTKTargets-debug.cmake "${VTK_TARGETS_DEBUG_CONTENT}") +# endif() #file(READ "${CURRENT_PACKAGES_DIR}/share/vtk/VTKTargets.cmake" VTK_TARGETS_CONTENT) # Remove unset of _IMPORT_PREFIX in VTKTargets.cmake @@ -182,68 +165,68 @@ foreach(FILE IN LISTS CMAKE_FILES) endforeach() # Correct 3rd Party modules in *.cmake: -set(FILE "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtkdoubleconversion.cmake") -file(READ "${FILE}" _contents) -string(REPLACE [["${VTK_INSTALL_PREFIX}/lib/double-conversion.lib"]] - [[optimized;"${VTK_INSTALL_PREFIX}/lib/double-conversion.lib";debug;"${VTK_INSTALL_PREFIX}/debug/lib/double-conversion.lib"]] - _contents "${_contents}") -file(WRITE "${FILE}" "${_contents}") - -set(FILE "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtkexpat.cmake") -file(READ "${FILE}" _contents) -string(REPLACE [["${VTK_INSTALL_PREFIX}/lib/expat.lib"]] - [[optimized;"${VTK_INSTALL_PREFIX}/lib/expat.lib";debug;"${VTK_INSTALL_PREFIX}/debug/lib/expat.lib"]] - _contents "${_contents}") -file(WRITE "${FILE}" "${_contents}") - -set(FILE "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtkjsoncpp.cmake") -file(READ "${FILE}" _contents) -string(REPLACE [["${VTK_INSTALL_PREFIX}/lib/jsoncpp.lib"]] - [[optimized;"${VTK_INSTALL_PREFIX}/lib/jsoncpp.lib";debug;"${VTK_INSTALL_PREFIX}/debug/lib/jsoncpp.lib"]] - _contents "${_contents}") -file(WRITE "${FILE}" "${_contents}") - -set(FILE "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtklibproj.cmake") -file(READ "${FILE}" _contents) -string(REPLACE [["${VTK_INSTALL_PREFIX}/lib/proj.lib"]] - [[optimized;"${VTK_INSTALL_PREFIX}/lib/proj.lib";debug;"${VTK_INSTALL_PREFIX}/debug/lib/proj_d.lib"]] - _contents "${_contents}") -file(WRITE "${FILE}" "${_contents}") - -set(FILE "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtklibxml2.cmake") -file(READ "${FILE}" _contents) -string(REPLACE [["${VTK_INSTALL_PREFIX}/lib/libxml2.lib"]] - [[optimized;"${VTK_INSTALL_PREFIX}/lib/libxml2.lib";debug;"${VTK_INSTALL_PREFIX}/debug/lib/libxml2.lib"]] - _contents "${_contents}") -file(WRITE "${FILE}" "${_contents}") - -set(FILE "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtknetcdf.cmake") -file(READ "${FILE}" _contents) -string(REPLACE [["${VTK_INSTALL_PREFIX}/lib/netcdf.lib"]] - [[optimized;"${VTK_INSTALL_PREFIX}/lib/netcdf.lib";debug;"${VTK_INSTALL_PREFIX}/debug/lib/netcdf.lib"]] - _contents "${_contents}") -file(WRITE "${FILE}" "${_contents}") - -set(FILE "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtkogg.cmake") -file(READ "${FILE}" _contents) -string(REPLACE [["${VTK_INSTALL_PREFIX}/lib/ogg.lib"]] - [[optimized;"${VTK_INSTALL_PREFIX}/lib/ogg.lib";debug;"${VTK_INSTALL_PREFIX}/debug/lib/ogg.lib"]] - _contents "${_contents}") -file(WRITE "${FILE}" "${_contents}") - -set(FILE "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtksqlite.cmake") -file(READ "${FILE}" _contents) -string(REPLACE [["${VTK_INSTALL_PREFIX}/lib/sqlite3.lib"]] - [[optimized;"${VTK_INSTALL_PREFIX}/lib/sqlite3.lib";debug;"${VTK_INSTALL_PREFIX}/debug/lib/sqlite3.lib"]] - _contents "${_contents}") -file(WRITE "${FILE}" "${_contents}") - -set(FILE "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtktheora.cmake") -file(READ "${FILE}" _contents) -string(REPLACE [["${VTK_INSTALL_PREFIX}/lib/theoraenc.lib;${VTK_INSTALL_PREFIX}/lib/theoradec.lib"]] - [[optimized;"${VTK_INSTALL_PREFIX}/lib/theoraenc.lib";optimized;"${VTK_INSTALL_PREFIX}/lib/theoradec.lib";debug;"${VTK_INSTALL_PREFIX}/debug/lib/theoraenc.lib;";debug;"${VTK_INSTALL_PREFIX}/debug/lib/theoradec.lib"]] - _contents "${_contents}") -file(WRITE "${FILE}" "${_contents}") +# set(FILE "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtkdoubleconversion.cmake") +# file(READ "${FILE}" _contents) +# string(REPLACE [["${VTK_INSTALL_PREFIX}/lib/double-conversion.lib"]] + # [[optimized;"${VTK_INSTALL_PREFIX}/lib/double-conversion.lib";debug;"${VTK_INSTALL_PREFIX}/debug/lib/double-conversion.lib"]] + # _contents "${_contents}") +# file(WRITE "${FILE}" "${_contents}") + +# set(FILE "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtkexpat.cmake") +# file(READ "${FILE}" _contents) +# string(REPLACE [["${VTK_INSTALL_PREFIX}/lib/expat.lib"]] + # [[optimized;"${VTK_INSTALL_PREFIX}/lib/expat.lib";debug;"${VTK_INSTALL_PREFIX}/debug/lib/expat.lib"]] + # _contents "${_contents}") +# file(WRITE "${FILE}" "${_contents}") + +# set(FILE "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtkjsoncpp.cmake") +# file(READ "${FILE}" _contents) +# string(REPLACE [["${VTK_INSTALL_PREFIX}/lib/jsoncpp.lib"]] + # [[optimized;"${VTK_INSTALL_PREFIX}/lib/jsoncpp.lib";debug;"${VTK_INSTALL_PREFIX}/debug/lib/jsoncpp.lib"]] + # _contents "${_contents}") +# file(WRITE "${FILE}" "${_contents}") + +# set(FILE "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtklibproj.cmake") +# file(READ "${FILE}" _contents) +# string(REPLACE [["${VTK_INSTALL_PREFIX}/lib/proj.lib"]] + # [[optimized;"${VTK_INSTALL_PREFIX}/lib/proj.lib";debug;"${VTK_INSTALL_PREFIX}/debug/lib/proj_d.lib"]] + # _contents "${_contents}") +# file(WRITE "${FILE}" "${_contents}") + +# set(FILE "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtklibxml2.cmake") +# file(READ "${FILE}" _contents) +# string(REPLACE [["${VTK_INSTALL_PREFIX}/lib/libxml2.lib"]] + # [[optimized;"${VTK_INSTALL_PREFIX}/lib/libxml2.lib";debug;"${VTK_INSTALL_PREFIX}/debug/lib/libxml2.lib"]] + # _contents "${_contents}") +# file(WRITE "${FILE}" "${_contents}") + +# set(FILE "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtknetcdf.cmake") +# file(READ "${FILE}" _contents) +# string(REPLACE [["${VTK_INSTALL_PREFIX}/lib/netcdf.lib"]] + # [[optimized;"${VTK_INSTALL_PREFIX}/lib/netcdf.lib";debug;"${VTK_INSTALL_PREFIX}/debug/lib/netcdf.lib"]] + # _contents "${_contents}") +# file(WRITE "${FILE}" "${_contents}") + +# set(FILE "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtkogg.cmake") +# file(READ "${FILE}" _contents) +# string(REPLACE [["${VTK_INSTALL_PREFIX}/lib/ogg.lib"]] + # [[optimized;"${VTK_INSTALL_PREFIX}/lib/ogg.lib";debug;"${VTK_INSTALL_PREFIX}/debug/lib/ogg.lib"]] + # _contents "${_contents}") +# file(WRITE "${FILE}" "${_contents}") + +# set(FILE "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtksqlite.cmake") +# file(READ "${FILE}" _contents) +# string(REPLACE [["${VTK_INSTALL_PREFIX}/lib/sqlite3.lib"]] + # [[optimized;"${VTK_INSTALL_PREFIX}/lib/sqlite3.lib";debug;"${VTK_INSTALL_PREFIX}/debug/lib/sqlite3.lib"]] + # _contents "${_contents}") +# file(WRITE "${FILE}" "${_contents}") + +# set(FILE "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtktheora.cmake") +# file(READ "${FILE}" _contents) +# string(REPLACE [["${VTK_INSTALL_PREFIX}/lib/theoraenc.lib;${VTK_INSTALL_PREFIX}/lib/theoradec.lib"]] + # [[optimized;"${VTK_INSTALL_PREFIX}/lib/theoraenc.lib";optimized;"${VTK_INSTALL_PREFIX}/lib/theoradec.lib";debug;"${VTK_INSTALL_PREFIX}/debug/lib/theoraenc.lib;";debug;"${VTK_INSTALL_PREFIX}/debug/lib/theoradec.lib"]] + # _contents "${_contents}") +# file(WRITE "${FILE}" "${_contents}") # ============================================================================= # Clean-up other directories @@ -323,7 +306,7 @@ file(RENAME ${CURRENT_PACKAGES_DIR}/share/vtk/Copyright.txt ${CURRENT_PACKAGES_D vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/vtk) -file(INSTALL "${SOURCE_PATH}/CMake/FindPythonModules.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/vtk/CMake) -file(INSTALL "${SOURCE_PATH}/CMake/vtkCompilerPlatformFlags.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/vtk) -file(INSTALL "${SOURCE_PATH}/CMake/vtkEncodeString.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/vtk) +# file(INSTALL "${SOURCE_PATH}/CMake/FindPythonModules.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/vtk/CMake) +# file(INSTALL "${SOURCE_PATH}/CMake/vtkCompilerPlatformFlags.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/vtk) +# file(INSTALL "${SOURCE_PATH}/CMake/vtkEncodeString.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/vtk) #add install for CMAKE/FindPythonModules.cmake vtkCompilerPlatformFlags \ No newline at end of file From 0474c1d1dde55ecf34a8c6fd120fd1577ffd65d9 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 6 Dec 2019 15:11:32 +0100 Subject: [PATCH 028/419] make post build validation work --- ports/vtk/portfile.cmake | 72 ++++++++++++++++++++-------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 9a1b7cbc56ef03..1ba6318f2ea842 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -93,27 +93,17 @@ vcpkg_configure_cmake( -DVTK_INSTALL_PACKAGE_DIR=share/vtk -DVTK_INSTALL_RUNTIME_DIR=bin -DVTK_FORBID_DOWNLOADS=ON - + #VTK groups to enable -DVTK_GROUP_ENABLE_StandAlone=YES -DVTK_GROUP_ENABLE_Rendering=YES -DVTK_GROUP_ENABLE_Views=YES - + # Select modules / groups to install -DVTK_USE_EXTERNAL:BOOL=ON -DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps:BOOL=OFF -DPYTHON_EXECUTABLE=${PYTHON3} ${ADDITIONAL_OPTIONS} - - # Explicit library paths - #-DPROJ_LIBRARY=${PROJ_LIBRARY} - - #-DVTK_USE_SYSTEM_PUGIXML:BOOL=OFF - #-DPUGIXML_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include - #-DPUGIXML_LIBRARIES=${PUGIXML_LIBRARY} - #-DPUGIXML_LIBRARY=${PUGIXML_LIBRARY} - #-Dpugixml_LIBRARIES=${PUGIXML_LIBRARY} - #-Dpugixml_LIBRARY=${PUGIXML_LIBRARY} ) vcpkg_install_cmake() @@ -121,7 +111,7 @@ vcpkg_copy_pdbs() # ============================================================================= # Fixup target files -vcpkg_fixup_cmake_targets() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/vtk-8.90) # For some reason the references to the XDMF libraries in the target files do not end up # correctly, so we fix them here. @@ -156,13 +146,13 @@ vcpkg_fixup_cmake_targets() # Fix _IMPORT_PREFIX. It is not set within the Modules cmake (only set in VTKTargets.cmake). # Since for VCPKG _IMPORT_PREFIX == VTK_INSTALL_PREFIX we just replace it with that. -file(GLOB_RECURSE CMAKE_FILES ${CURRENT_PACKAGES_DIR}/share/vtk/Modules/*.cmake) -foreach(FILE IN LISTS CMAKE_FILES) - file(READ "${FILE}" _contents) - file(WRITE "${FILE}.bak" "${_contents}") - string(REPLACE "\${_IMPORT_PREFIX}" "\${VTK_INSTALL_PREFIX}" _contents "${_contents}") - file(WRITE "${FILE}" "${_contents}") -endforeach() +# file(GLOB_RECURSE CMAKE_FILES ${CURRENT_PACKAGES_DIR}/share/vtk/Modules/*.cmake) +# foreach(FILE IN LISTS CMAKE_FILES) + # file(READ "${FILE}" _contents) + # file(WRITE "${FILE}.bak" "${_contents}") + # string(REPLACE "\${_IMPORT_PREFIX}" "\${VTK_INSTALL_PREFIX}" _contents "${_contents}") + # file(WRITE "${FILE}" "${_contents}") +# endforeach() # Correct 3rd Party modules in *.cmake: # set(FILE "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtkdoubleconversion.cmake") @@ -237,11 +227,15 @@ function(_vtk_remove_debug_tool TOOL_NAME) if(EXISTS ${filename}) file(REMOVE ${filename}) endif() + set(filename ${CURRENT_PACKAGES_DIR}/debug/bin/${TOOL_NAME}d${VCPKG_TARGET_EXECUTABLE_SUFFIX}) + if(EXISTS ${filename}) + file(REMOVE ${filename}) + endif() # we also have to bend the lines referencing the tools in VTKTargets-debug.cmake # to make them point to the release version of the tools - file(READ "${CURRENT_PACKAGES_DIR}/share/vtk/VTKTargets-debug.cmake" VTK_TARGETS_CONTENT_DEBUG) + file(READ "${CURRENT_PACKAGES_DIR}/share/vtk/VTK-targets-debug.cmake" VTK_TARGETS_CONTENT_DEBUG) string(REPLACE "debug/bin/${TOOL_NAME}" "tools/vtk/${TOOL_NAME}" VTK_TARGETS_CONTENT_DEBUG "${VTK_TARGETS_CONTENT_DEBUG}") - file(WRITE "${CURRENT_PACKAGES_DIR}/share/vtk/VTKTargets-debug.cmake" "${VTK_TARGETS_CONTENT_DEBUG}") + file(WRITE "${CURRENT_PACKAGES_DIR}/share/vtk/VTK-targets-debug.cmake" "${VTK_TARGETS_CONTENT_DEBUG}") endfunction() # Move the release binary TOOL_NAME from bin to tools @@ -254,11 +248,15 @@ function(_vtk_move_release_tool TOOL_NAME) # we also have to bend the lines referencing the tools in VTKTargets-release.cmake # to make them point to the tool folder - file(READ "${CURRENT_PACKAGES_DIR}/share/vtk/VTKTargets-release.cmake" VTK_TARGETS_CONTENT_RELEASE) + file(READ "${CURRENT_PACKAGES_DIR}/share/vtk/VTK-targets-release.cmake" VTK_TARGETS_CONTENT_RELEASE) string(REPLACE "bin/${TOOL_NAME}" "tools/vtk/${TOOL_NAME}" VTK_TARGETS_CONTENT_RELEASE "${VTK_TARGETS_CONTENT_RELEASE}") - file(WRITE "${CURRENT_PACKAGES_DIR}/share/vtk/VTKTargets-release.cmake" "${VTK_TARGETS_CONTENT_RELEASE}") + file(WRITE "${CURRENT_PACKAGES_DIR}/share/vtk/VTK-targets-release.cmake" "${VTK_TARGETS_CONTENT_RELEASE}") + + if("python" IN_LIST FEATURES) + endif() endfunction() +set(VTK_SHORT_VERSION 8.90) set(VTK_TOOLS vtkEncodeString-${VTK_SHORT_VERSION} vtkHashSource-${VTK_SHORT_VERSION} @@ -270,6 +268,8 @@ set(VTK_TOOLS vtkWrapHierarchy-${VTK_SHORT_VERSION} vtkParseJava-${VTK_SHORT_VERSION} vtkParseOGLExt-${VTK_SHORT_VERSION} + vtkProbeOpenGLVersion-${VTK_SHORT_VERSION} + vtkTestOpenGLVersion-${VTK_SHORT_VERSION} vtkpython pvtkpython ) @@ -279,22 +279,22 @@ foreach(TOOL_NAME IN LISTS VTK_TOOLS) _vtk_move_release_tool("${TOOL_NAME}") endforeach() -file(READ "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtkhdf5.cmake" _contents) -string(REPLACE "vtk::hdf5::hdf5_hl" "" _contents "${_contents}") -string(REPLACE "vtk::hdf5::hdf5" "" _contents "${_contents}") -file(WRITE "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtkhdf5.cmake" "${_contents}") +# file(READ "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtkhdf5.cmake" _contents) +# string(REPLACE "vtk::hdf5::hdf5_hl" "" _contents "${_contents}") +# string(REPLACE "vtk::hdf5::hdf5" "" _contents "${_contents}") +# file(WRITE "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtkhdf5.cmake" "${_contents}") # ============================================================================= # Remove other files and directories that are not valid for vcpkg -if(VTK_WITH_ALL_MODULES) - file(REMOVE ${CURRENT_PACKAGES_DIR}/XdmfConfig.cmake) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/XdmfConfig.cmake) -endif() +# if(VTK_WITH_ALL_MODULES) + # file(REMOVE ${CURRENT_PACKAGES_DIR}/XdmfConfig.cmake) + # file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/XdmfConfig.cmake) +# endif() -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) -endif() +# if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + # file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) + # file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) +# endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) From e090df34fd688de97fb15c5d01a64012cce3226c Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 6 Dec 2019 16:18:52 +0100 Subject: [PATCH 029/419] add required patches to vtk --- ports/vtk/FindHDF5.patch | 1132 +++++++++++++++++++++++++++++++++++ ports/vtk/FindLZMA.patch | 84 +++ ports/vtk/FindLibHaru.patch | 37 ++ ports/vtk/portfile.cmake | 6 + 4 files changed, 1259 insertions(+) create mode 100644 ports/vtk/FindHDF5.patch create mode 100644 ports/vtk/FindLZMA.patch create mode 100644 ports/vtk/FindLibHaru.patch diff --git a/ports/vtk/FindHDF5.patch b/ports/vtk/FindHDF5.patch new file mode 100644 index 00000000000000..33a22b556c5c03 --- /dev/null +++ b/ports/vtk/FindHDF5.patch @@ -0,0 +1,1132 @@ +diff --git a/CMake/patches/99/FindHDF5.cmake b/CMake/patches/99/FindHDF5.cmake +index 2f4709c97..52165c1ae 100644 +--- a/CMake/patches/99/FindHDF5.cmake ++++ b/CMake/patches/99/FindHDF5.cmake +@@ -1,1081 +1,22 @@ +-# Distributed under the OSI-approved BSD 3-Clause License. See accompanying +-# file Copyright.txt or https://cmake.org/licensing for details. +- +-# See https://gitlab.kitware.com/cmake/cmake/merge_requests/2575 +- +-#[=======================================================================[.rst: +-FindHDF5 +--------- +- +-Find HDF5, a library for reading and writing self describing array data. +- +- +- +-This module invokes the HDF5 wrapper compiler that should be installed +-alongside HDF5. Depending upon the HDF5 Configuration, the wrapper +-compiler is called either h5cc or h5pcc. If this succeeds, the module +-will then call the compiler with the -show argument to see what flags +-are used when compiling an HDF5 client application. +- +-The module will optionally accept the COMPONENTS argument. If no +-COMPONENTS are specified, then the find module will default to finding +-only the HDF5 C library. If one or more COMPONENTS are specified, the +-module will attempt to find the language bindings for the specified +-components. The only valid components are C, CXX, Fortran, HL, and +-Fortran_HL. If the COMPONENTS argument is not given, the module will +-attempt to find only the C bindings. +- +-This module will read the variable +-HDF5_USE_STATIC_LIBRARIES to determine whether or not to prefer a +-static link to a dynamic link for HDF5 and all of it's dependencies. +-To use this feature, make sure that the HDF5_USE_STATIC_LIBRARIES +-variable is set before the call to find_package. +- +-To provide the module with a hint about where to find your HDF5 +-installation, you can set the environment variable HDF5_ROOT. The +-Find module will then look in this path when searching for HDF5 +-executables, paths, and libraries. +- +-Both the serial and parallel HDF5 wrappers are considered and the first +-directory to contain either one will be used. In the event that both appear +-in the same directory the serial version is preferentially selected. This +-behavior can be reversed by setting the variable HDF5_PREFER_PARALLEL to +-true. +- +-In addition to finding the includes and libraries required to compile +-an HDF5 client application, this module also makes an effort to find +-tools that come with the HDF5 distribution that may be useful for +-regression testing. +- +-This module will define the following variables: +- +-:: +- +- HDF5_FOUND - true if HDF5 was found on the system +- HDF5_VERSION - HDF5 version in format Major.Minor.Release +- HDF5_INCLUDE_DIRS - Location of the hdf5 includes +- HDF5_INCLUDE_DIR - Location of the hdf5 includes (deprecated) +- HDF5_DEFINITIONS - Required compiler definitions for HDF5 +- HDF5_LIBRARIES - Required libraries for all requested bindings +- HDF5_HL_LIBRARIES - Required libraries for the HDF5 high level API for all +- bindings, if the HL component is enabled +- +-Available components are: C CXX Fortran and HL. For each enabled language +-binding, a corresponding HDF5_${LANG}_LIBRARIES variable, and potentially +-HDF5_${LANG}_DEFINITIONS, will be defined. +-If the HL component is enabled, then an HDF5_${LANG}_HL_LIBRARIES will +-also be defined. With all components enabled, the following variables will be defined: +- +-:: +- +- HDF5_C_DEFINITIONS -- Required compiler definitions for HDF5 C bindings +- HDF5_CXX_DEFINITIONS -- Required compiler definitions for HDF5 C++ bindings +- HDF5_Fortran_DEFINITIONS -- Required compiler definitions for HDF5 Fortran bindings +- HDF5_C_INCLUDE_DIRS -- Required include directories for HDF5 C bindings +- HDF5_CXX_INCLUDE_DIRS -- Required include directories for HDF5 C++ bindings +- HDF5_Fortran_INCLUDE_DIRS -- Required include directories for HDF5 Fortran bindings +- HDF5_C_LIBRARIES - Required libraries for the HDF5 C bindings +- HDF5_CXX_LIBRARIES - Required libraries for the HDF5 C++ bindings +- HDF5_Fortran_LIBRARIES - Required libraries for the HDF5 Fortran bindings +- HDF5_C_HL_LIBRARIES - Required libraries for the high level C bindings +- HDF5_CXX_HL_LIBRARIES - Required libraries for the high level C++ bindings +- HDF5_Fortran_HL_LIBRARIES - Required libraries for the high level Fortran +- bindings. +- +- HDF5_IS_PARALLEL - Whether or not HDF5 was found with parallel IO support +- HDF5_C_COMPILER_EXECUTABLE - the path to the HDF5 C wrapper compiler +- HDF5_CXX_COMPILER_EXECUTABLE - the path to the HDF5 C++ wrapper compiler +- HDF5_Fortran_COMPILER_EXECUTABLE - the path to the HDF5 Fortran wrapper compiler +- HDF5_C_COMPILER_EXECUTABLE_NO_INTERROGATE - path to the primary C compiler +- which is also the HDF5 wrapper +- HDF5_CXX_COMPILER_EXECUTABLE_NO_INTERROGATE - path to the primary C++ +- compiler which is also +- the HDF5 wrapper +- HDF5_Fortran_COMPILER_EXECUTABLE_NO_INTERROGATE - path to the primary +- Fortran compiler which +- is also the HDF5 wrapper +- HDF5_DIFF_EXECUTABLE - the path to the HDF5 dataset comparison tool +- +-With all components enabled, the following targets will be defined: +- +-:: +- +- ``hdf5::hdf5`` +- ``hdf5::hdf5_hl_cpp`` +- ``hdf5::hdf5_fortran`` +- ``hdf5::hdf5_hl`` +- ``hdf5::hdf5_hl_cpp`` +- ``hdf5::hdf5_hl_fortran`` +- ``hdf5::h5diff`` +- +-The following variable can be set to guide the search for HDF5 libraries and includes: +- +-``HDF5_ROOT`` +- Specify the path to the HDF5 installation to use. +- +-``HDF5_FIND_DEBUG`` +- Set to a true value to get some extra debugging output. +- +-``HDF5_NO_FIND_PACKAGE_CONFIG_FILE`` +- Set to a true value to skip trying to find ``hdf5-config.cmake``. +-#]=======================================================================] +- +-# This module is maintained by Will Dicharry . +- +-include(SelectLibraryConfigurations) +-include(FindPackageHandleStandardArgs) +- +-# List of the valid HDF5 components +-set(HDF5_VALID_LANGUAGE_BINDINGS C CXX Fortran) +- +-# Validate the list of find components. +-if(NOT HDF5_FIND_COMPONENTS) +- set(HDF5_LANGUAGE_BINDINGS "C") ++#The original VTK file is overdoing it and still prdouces errors that the target hdf5::hdf5_hl-shared cannot be found in dynamic builds ++find_package(hdf5 QUIET NO_MODULE) ++if(TARGET hdf5::hdf5-shared) ++ set_target_properties(hdf5::hdf5-shared PROPERTIES IMPORTED_GLOBAL TRUE) ++ add_library(hdf5::hdf5 ALIAS hdf5::hdf5-shared) ++elseif(TARGET hdf5::hdf5-static) ++ set_target_properties(hdf5::hdf5-static PROPERTIES IMPORTED_GLOBAL TRUE) ++ add_library(hdf5::hdf5 ALIAS hdf5::hdf5-static) + else() +- set(HDF5_LANGUAGE_BINDINGS) +- # add the extra specified components, ensuring that they are valid. +- set(FIND_HL OFF) +- foreach(component IN LISTS HDF5_FIND_COMPONENTS) +- list(FIND HDF5_VALID_LANGUAGE_BINDINGS ${component} component_location) +- if(NOT component_location EQUAL -1) +- list(APPEND HDF5_LANGUAGE_BINDINGS ${component}) +- elseif(component STREQUAL "HL") +- set(FIND_HL ON) +- elseif(component STREQUAL "Fortran_HL") # only for compatibility +- list(APPEND HDF5_LANGUAGE_BINDINGS Fortran) +- set(FIND_HL ON) +- set(HDF5_FIND_REQUIRED_Fortran_HL False) +- set(HDF5_FIND_REQUIRED_Fortran True) +- set(HDF5_FIND_REQUIRED_HL True) +- else() +- message(FATAL_ERROR "${component} is not a valid HDF5 component.") +- endif() +- endforeach() +- if(NOT HDF5_LANGUAGE_BINDINGS) +- get_property(__langs GLOBAL PROPERTY ENABLED_LANGUAGES) +- foreach(__lang IN LISTS __langs) +- if(__lang MATCHES "^(C|CXX|Fortran)$") +- list(APPEND HDF5_LANGUAGE_BINDINGS ${__lang}) +- endif() +- endforeach() +- endif() +- list(REMOVE_ITEM HDF5_FIND_COMPONENTS Fortran_HL) # replaced by Fortran and HL +- list(REMOVE_DUPLICATES HDF5_LANGUAGE_BINDINGS) +-endif() +- +-# Determine whether to search for serial or parallel executable first +-if(HDF5_PREFER_PARALLEL) +- set(HDF5_C_COMPILER_NAMES h5pcc h5cc) +- set(HDF5_CXX_COMPILER_NAMES h5pc++ h5c++) +- set(HDF5_Fortran_COMPILER_NAMES h5pfc h5fc) +-else() +- set(HDF5_C_COMPILER_NAMES h5cc h5pcc) +- set(HDF5_CXX_COMPILER_NAMES h5c++ h5pc++) +- set(HDF5_Fortran_COMPILER_NAMES h5fc h5pfc) +-endif() +- +-# We may have picked up some duplicates in various lists during the above +-# process for the language bindings (both the C and C++ bindings depend on +-# libz for example). Remove the duplicates. It appears that the default +-# CMake behavior is to remove duplicates from the end of a list. However, +-# for link lines, this is incorrect since unresolved symbols are searched +-# for down the link line. Therefore, we reverse the list, remove the +-# duplicates, and then reverse it again to get the duplicates removed from +-# the beginning. +-macro(_HDF5_remove_duplicates_from_beginning _list_name) +- if(${_list_name}) +- list(REVERSE ${_list_name}) +- list(REMOVE_DUPLICATES ${_list_name}) +- list(REVERSE ${_list_name}) +- endif() +-endmacro() +- +- +-# Test first if the current compilers automatically wrap HDF5 +- +-function(_HDF5_test_regular_compiler_C success version is_parallel) +- set(scratch_directory +- ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/hdf5) +- if(NOT ${success} OR +- NOT EXISTS ${scratch_directory}/compiler_has_h5_c) +- set(test_file ${scratch_directory}/cmake_hdf5_test.c) +- file(WRITE ${test_file} +- "#include \n" +- "#include \n" +- "const char* info_ver = \"INFO\" \":\" H5_VERSION;\n" +- "#ifdef H5_HAVE_PARALLEL\n" +- "const char* info_parallel = \"INFO\" \":\" \"PARALLEL\";\n" +- "#endif\n" +- "int main(int argc, char **argv) {\n" +- " int require = 0;\n" +- " require += info_ver[argc];\n" +- "#ifdef H5_HAVE_PARALLEL\n" +- " require += info_parallel[argc];\n" +- "#endif\n" +- " hid_t fid;\n" +- " fid = H5Fcreate(\"foo.h5\",H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT);\n" +- " return 0;\n" +- "}") +- try_compile(${success} ${scratch_directory} ${test_file} +- COPY_FILE ${scratch_directory}/compiler_has_h5_c +- ) +- endif() +- if(${success}) +- file(STRINGS ${scratch_directory}/compiler_has_h5_c INFO_STRINGS +- REGEX "^INFO:" +- ) +- string(REGEX MATCH "^INFO:([0-9]+\\.[0-9]+\\.[0-9]+)(-patch([0-9]+))?" +- INFO_VER "${INFO_STRINGS}" +- ) +- set(${version} ${CMAKE_MATCH_1}) +- if(CMAKE_MATCH_3) +- set(${version} ${HDF5_C_VERSION}.${CMAKE_MATCH_3}) +- endif() +- set(${version} ${${version}} PARENT_SCOPE) +- +- if(INFO_STRINGS MATCHES "INFO:PARALLEL") +- set(${is_parallel} TRUE PARENT_SCOPE) +- else() +- set(${is_parallel} FALSE PARENT_SCOPE) +- endif() +- endif() +-endfunction() +- +-function(_HDF5_test_regular_compiler_CXX success version is_parallel) +- set(scratch_directory ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/hdf5) +- if(NOT ${success} OR +- NOT EXISTS ${scratch_directory}/compiler_has_h5_cxx) +- set(test_file ${scratch_directory}/cmake_hdf5_test.cxx) +- file(WRITE ${test_file} +- "#include \n" +- "#ifndef H5_NO_NAMESPACE\n" +- "using namespace H5;\n" +- "#endif\n" +- "const char* info_ver = \"INFO\" \":\" H5_VERSION;\n" +- "#ifdef H5_HAVE_PARALLEL\n" +- "const char* info_parallel = \"INFO\" \":\" \"PARALLEL\";\n" +- "#endif\n" +- "int main(int argc, char **argv) {\n" +- " int require = 0;\n" +- " require += info_ver[argc];\n" +- "#ifdef H5_HAVE_PARALLEL\n" +- " require += info_parallel[argc];\n" +- "#endif\n" +- " H5File file(\"foo.h5\", H5F_ACC_TRUNC);\n" +- " return 0;\n" +- "}") +- try_compile(${success} ${scratch_directory} ${test_file} +- COPY_FILE ${scratch_directory}/compiler_has_h5_cxx +- ) +- endif() +- if(${success}) +- file(STRINGS ${scratch_directory}/compiler_has_h5_cxx INFO_STRINGS +- REGEX "^INFO:" +- ) +- string(REGEX MATCH "^INFO:([0-9]+\\.[0-9]+\\.[0-9]+)(-patch([0-9]+))?" +- INFO_VER "${INFO_STRINGS}" +- ) +- set(${version} ${CMAKE_MATCH_1}) +- if(CMAKE_MATCH_3) +- set(${version} ${HDF5_CXX_VERSION}.${CMAKE_MATCH_3}) +- endif() +- set(${version} ${${version}} PARENT_SCOPE) +- +- if(INFO_STRINGS MATCHES "INFO:PARALLEL") +- set(${is_parallel} TRUE PARENT_SCOPE) +- else() +- set(${is_parallel} FALSE PARENT_SCOPE) +- endif() +- endif() +-endfunction() +- +-function(_HDF5_test_regular_compiler_Fortran success is_parallel) +- if(NOT ${success}) +- set(scratch_directory +- ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/hdf5) +- set(test_file ${scratch_directory}/cmake_hdf5_test.f90) +- file(WRITE ${test_file} +- "program hdf5_hello\n" +- " use hdf5\n" +- " use h5lt\n" +- " use h5ds\n" +- " integer error\n" +- " call h5open_f(error)\n" +- " call h5close_f(error)\n" +- "end\n") +- try_compile(${success} ${scratch_directory} ${test_file}) +- if(${success}) +- execute_process(COMMAND ${CMAKE_Fortran_COMPILER} -showconfig +- OUTPUT_VARIABLE config_output +- ERROR_VARIABLE config_error +- RESULT_VARIABLE config_result +- ) +- if(config_output MATCHES "Parallel HDF5: yes") +- set(${is_parallel} TRUE PARENT_SCOPE) +- else() +- set(${is_parallel} FALSE PARENT_SCOPE) +- endif() +- endif() +- endif() +-endfunction() +- +-# Invoke the HDF5 wrapper compiler. The compiler return value is stored to the +-# return_value argument, the text output is stored to the output variable. +-macro( _HDF5_invoke_compiler language output return_value version is_parallel) +- set(${version}) +- if(HDF5_USE_STATIC_LIBRARIES) +- set(lib_type_args -noshlib) +- else() +- set(lib_type_args -shlib) +- endif() +- set(scratch_dir ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/hdf5) +- if("${language}" STREQUAL "C") +- set(test_file ${scratch_dir}/cmake_hdf5_test.c) +- elseif("${language}" STREQUAL "CXX") +- set(test_file ${scratch_dir}/cmake_hdf5_test.cxx) +- elseif("${language}" STREQUAL "Fortran") +- set(test_file ${scratch_dir}/cmake_hdf5_test.f90) +- endif() +- exec_program( ${HDF5_${language}_COMPILER_EXECUTABLE} +- ARGS -show ${lib_type_args} ${test_file} +- OUTPUT_VARIABLE ${output} +- RETURN_VALUE ${return_value} +- ) +- if(NOT ${${return_value}} EQUAL 0) +- message(STATUS +- "Unable to determine HDF5 ${language} flags from HDF5 wrapper.") +- endif() +- exec_program( ${HDF5_${language}_COMPILER_EXECUTABLE} +- ARGS -showconfig +- OUTPUT_VARIABLE config_output +- RETURN_VALUE config_return +- ) +- if(NOT ${return_value} EQUAL 0) +- message( STATUS +- "Unable to determine HDF5 ${language} version from HDF5 wrapper.") +- endif() +- string(REGEX MATCH "HDF5 Version: ([a-zA-Z0-9\\.\\-]*)" version_match "${config_output}") +- if(version_match) +- string(REPLACE "HDF5 Version: " "" ${version} "${version_match}") +- string(REPLACE "-patch" "." ${version} "${${version}}") +- endif() +- if(config_output MATCHES "Parallel HDF5: yes") +- set(${is_parallel} TRUE) +- else() +- set(${is_parallel} FALSE) +- endif() +-endmacro() +- +-# Parse a compile line for definitions, includes, library paths, and libraries. +-macro( _HDF5_parse_compile_line +- compile_line_var +- include_paths +- definitions +- library_paths +- libraries +- libraries_hl) +- +- separate_arguments(_HDF5_COMPILE_ARGS NATIVE_COMMAND "${${compile_line_var}}") +- +- foreach(arg IN LISTS _HDF5_COMPILE_ARGS) +- if("${arg}" MATCHES "^-I(.*)$") +- # include directory +- list(APPEND ${include_paths} "${CMAKE_MATCH_1}") +- elseif("${arg}" MATCHES "^-D(.*)$") +- # compile definition +- list(APPEND ${definitions} "-D${CMAKE_MATCH_1}") +- elseif("${arg}" MATCHES "^-L(.*)$") +- # library search path +- list(APPEND ${library_paths} "${CMAKE_MATCH_1}") +- elseif("${arg}" MATCHES "^-l(hdf5.*hl.*)$") +- # library name (hl) +- list(APPEND ${libraries_hl} "${CMAKE_MATCH_1}") +- elseif("${arg}" MATCHES "^-l(.*)$") +- # library name +- list(APPEND ${libraries} "${CMAKE_MATCH_1}") +- elseif("${arg}" MATCHES "^(.:)?[/\\].*\\.(a|so|dylib|sl|lib)$") +- # library file +- if(NOT EXISTS "${arg}") +- continue() +- endif() +- get_filename_component(_HDF5_LPATH "${arg}" DIRECTORY) +- get_filename_component(_HDF5_LNAME "${arg}" NAME_WE) +- string(REGEX REPLACE "^lib" "" _HDF5_LNAME "${_HDF5_LNAME}") +- list(APPEND ${library_paths} "${_HDF5_LPATH}") +- if(_HDF5_LNAME MATCHES "hdf5.*hl") +- list(APPEND ${libraries_hl} "${_HDF5_LNAME}") +- else() +- list(APPEND ${libraries} "${_HDF5_LNAME}") +- endif() +- endif() +- endforeach() +-endmacro() +- +-# Select a preferred imported configuration from a target +-function(_HDF5_select_imported_config target imported_conf) +- # We will first assign the value to a local variable _imported_conf, then assign +- # it to the function argument at the end. +- get_target_property(_imported_conf ${target} MAP_IMPORTED_CONFIG_${CMAKE_BUILD_TYPE}) +- if (NOT _imported_conf) +- # Get available imported configurations by examining target properties +- get_target_property(_imported_conf ${target} IMPORTED_CONFIGURATIONS) +- if(HDF5_FIND_DEBUG) +- message(STATUS "Found imported configurations: ${_imported_conf}") +- endif() +- # Find the imported configuration that we prefer. +- # We do this by making list of configurations in order of preference, +- # starting with ${CMAKE_BUILD_TYPE} and ending with the first imported_conf +- set(_preferred_confs ${CMAKE_BUILD_TYPE}) +- list(GET _imported_conf 0 _fallback_conf) +- list(APPEND _preferred_confs RELWITHDEBINFO RELEASE DEBUG ${_fallback_conf}) +- if(HDF5_FIND_DEBUG) +- message(STATUS "Start search through imported configurations in the following order: ${_preferred_confs}") +- endif() +- # Now find the first of these that is present in imported_conf +- cmake_policy(PUSH) +- cmake_policy(SET CMP0057 NEW) # support IN_LISTS +- foreach (_conf IN LISTS _preferred_confs) +- if (${_conf} IN_LIST _imported_conf) +- set(_imported_conf ${_conf}) +- break() +- endif() +- endforeach() +- cmake_policy(POP) +- endif() +- if(HDF5_FIND_DEBUG) +- message(STATUS "Selected imported configuration: ${_imported_conf}") +- endif() +- # assign value to function argument +- set(${imported_conf} ${_imported_conf} PARENT_SCOPE) +-endfunction() +- +- +-if(NOT HDF5_ROOT) +- set(HDF5_ROOT $ENV{HDF5_ROOT}) +-endif() +-if(HDF5_ROOT) +- set(_HDF5_SEARCH_OPTS NO_DEFAULT_PATH) +-else() +- set(_HDF5_SEARCH_OPTS) +-endif() +- +-# Try to find HDF5 using an installed hdf5-config.cmake +-if(NOT HDF5_FOUND AND NOT HDF5_NO_FIND_PACKAGE_CONFIG_FILE) +- find_package(HDF5 QUIET NO_MODULE +- HINTS ${HDF5_ROOT} +- ${_HDF5_SEARCH_OPTS} +- ) +- if( HDF5_FOUND) +- if(HDF5_FIND_DEBUG) +- message(STATUS "Found HDF5 at ${HDF5_DIR} via NO_MODULE. Now trying to extract locations etc.") +- endif() +- set(HDF5_IS_PARALLEL ${HDF5_ENABLE_PARALLEL}) +- set(HDF5_INCLUDE_DIRS ${HDF5_INCLUDE_DIR}) +- set(HDF5_LIBRARIES) +- if (NOT TARGET hdf5 AND NOT TARGET hdf5-static AND NOT TARGET hdf5-shared) +- # Some HDF5 versions (e.g. 1.8.18) used hdf5::hdf5 etc +- set(_target_prefix "hdf5::") +- endif() +- set(HDF5_C_TARGET ${_target_prefix}hdf5) +- set(HDF5_C_HL_TARGET ${_target_prefix}hdf5_hl) +- set(HDF5_CXX_TARGET ${_target_prefix}hdf5_cpp) +- set(HDF5_CXX_HL_TARGET ${_target_prefix}hdf5_hl_cpp) +- set(HDF5_Fortran_TARGET ${_target_prefix}hdf5_fortran) +- set(HDF5_Fortran_HL_TARGET ${_target_prefix}hdf5_hl_fortran) +- set(HDF5_DEFINITIONS "") +- if(HDF5_USE_STATIC_LIBRARIES) +- set(_suffix "-static") +- else() +- set(_suffix "-shared") +- endif() +- foreach(_lang ${HDF5_LANGUAGE_BINDINGS}) +- +- #Older versions of hdf5 don't have a static/shared suffix so +- #if we detect that occurrence clear the suffix +- if(_suffix AND NOT TARGET ${HDF5_${_lang}_TARGET}${_suffix}) +- if(NOT TARGET ${HDF5_${_lang}_TARGET}) +- #can't find this component with or without the suffix +- #so bail out, and let the following locate HDF5 +- set(HDF5_FOUND FALSE) +- break() +- endif() +- set(_suffix "") +- endif() +- +- if(HDF5_FIND_DEBUG) +- message(STATUS "Trying to get properties of target ${HDF5_${_lang}_TARGET}${_suffix}") +- endif() +- # Find library for this target. Complicated as on Windows with a DLL, we need to search for the import-lib. +- _HDF5_select_imported_config(${HDF5_${_lang}_TARGET}${_suffix} _hdf5_imported_conf) +- get_target_property(_hdf5_lang_location ${HDF5_${_lang}_TARGET}${_suffix} IMPORTED_IMPLIB_${_hdf5_imported_conf} ) +- if (NOT _hdf5_lang_location) +- # no import lib, just try LOCATION +- get_target_property(_hdf5_lang_location ${HDF5_${_lang}_TARGET}${_suffix} LOCATION_${_hdf5_imported_conf}) +- if (NOT _hdf5_lang_location) +- get_target_property(_hdf5_lang_location ${HDF5_${_lang}_TARGET}${_suffix} LOCATION) +- endif() +- endif() +- if( _hdf5_lang_location ) +- set(HDF5_${_lang}_LIBRARY ${_hdf5_lang_location}) +- list(APPEND HDF5_LIBRARIES ${HDF5_${_lang}_TARGET}${_suffix}) +- set(HDF5_${_lang}_LIBRARIES ${HDF5_${_lang}_TARGET}${_suffix}) +- set(HDF5_${_lang}_FOUND True) +- endif() +- if(FIND_HL) +- get_target_property(__lang_hl_location ${HDF5_${_lang}_HL_TARGET}${_suffix} IMPORTED_IMPLIB_${_hdf5_imported_conf} ) +- if (NOT _hdf5_lang_hl_location) +- get_target_property(_hdf5_lang_hl_location ${HDF5_${_lang}_HL_TARGET}${_suffix} LOCATION_${_hdf5_imported_conf}) +- if (NOT _hdf5_hl_lang_location) +- get_target_property(_hdf5_hl_lang_location ${HDF5_${_lang}_HL_TARGET}${_suffix} LOCATION) +- endif() +- endif() +- if( _hdf5_lang_hl_location ) +- set(HDF5_${_lang}_HL_LIBRARY ${_hdf5_lang_hl_location}) +- list(APPEND HDF5_HL_LIBRARIES ${HDF5_${_lang}_HL_TARGET}${_suffix}) +- set(HDF5_${_lang}_HL_LIBRARIES ${HDF5_${_lang}_HL_TARGET}${_suffix}) +- set(HDF5_HL_FOUND True) +- endif() +- unset(_hdf5_lang_hl_location) +- endif() +- unset(_hdf5_imported_conf) +- unset(_hdf5_lang_location) +- endforeach() +- endif() +-endif() +- +-if(NOT HDF5_FOUND) +- set(_HDF5_NEED_TO_SEARCH False) +- set(HDF5_COMPILER_NO_INTERROGATE True) +- # Only search for languages we've enabled +- foreach(__lang IN LISTS HDF5_LANGUAGE_BINDINGS) +- # First check to see if our regular compiler is one of wrappers +- if(__lang STREQUAL "C") +- _HDF5_test_regular_compiler_C( +- HDF5_${__lang}_COMPILER_NO_INTERROGATE +- HDF5_${__lang}_VERSION +- HDF5_${__lang}_IS_PARALLEL) +- elseif(__lang STREQUAL "CXX") +- _HDF5_test_regular_compiler_CXX( +- HDF5_${__lang}_COMPILER_NO_INTERROGATE +- HDF5_${__lang}_VERSION +- HDF5_${__lang}_IS_PARALLEL) +- elseif(__lang STREQUAL "Fortran") +- _HDF5_test_regular_compiler_Fortran( +- HDF5_${__lang}_COMPILER_NO_INTERROGATE +- HDF5_${__lang}_IS_PARALLEL) +- else() +- continue() +- endif() +- if(HDF5_${__lang}_COMPILER_NO_INTERROGATE) +- message(STATUS "HDF5: Using hdf5 compiler wrapper for all ${__lang} compiling") +- set(HDF5_${__lang}_FOUND True) +- set(HDF5_${__lang}_COMPILER_EXECUTABLE_NO_INTERROGATE +- "${CMAKE_${__lang}_COMPILER}" +- CACHE FILEPATH "HDF5 ${__lang} compiler wrapper") +- set(HDF5_${__lang}_DEFINITIONS) +- set(HDF5_${__lang}_INCLUDE_DIRS) +- set(HDF5_${__lang}_LIBRARIES) +- set(HDF5_${__lang}_HL_LIBRARIES) +- +- mark_as_advanced(HDF5_${__lang}_COMPILER_EXECUTABLE_NO_INTERROGATE) +- +- set(HDF5_${__lang}_FOUND True) +- set(HDF5_HL_FOUND True) +- else() +- set(HDF5_COMPILER_NO_INTERROGATE False) +- # If this language isn't using the wrapper, then try to seed the +- # search options with the wrapper +- find_program(HDF5_${__lang}_COMPILER_EXECUTABLE +- NAMES ${HDF5_${__lang}_COMPILER_NAMES} NAMES_PER_DIR +- HINTS ${HDF5_ROOT} +- PATH_SUFFIXES bin Bin +- DOC "HDF5 ${__lang} Wrapper compiler. Used only to detect HDF5 compile flags." +- ${_HDF5_SEARCH_OPTS} +- ) +- mark_as_advanced( HDF5_${__lang}_COMPILER_EXECUTABLE ) +- unset(HDF5_${__lang}_COMPILER_NAMES) +- +- if(HDF5_${__lang}_COMPILER_EXECUTABLE) +- _HDF5_invoke_compiler(${__lang} HDF5_${__lang}_COMPILE_LINE +- HDF5_${__lang}_RETURN_VALUE HDF5_${__lang}_VERSION HDF5_${__lang}_IS_PARALLEL) +- if(HDF5_${__lang}_RETURN_VALUE EQUAL 0) +- message(STATUS "HDF5: Using hdf5 compiler wrapper to determine ${__lang} configuration") +- _HDF5_parse_compile_line( HDF5_${__lang}_COMPILE_LINE +- HDF5_${__lang}_INCLUDE_DIRS +- HDF5_${__lang}_DEFINITIONS +- HDF5_${__lang}_LIBRARY_DIRS +- HDF5_${__lang}_LIBRARY_NAMES +- HDF5_${__lang}_HL_LIBRARY_NAMES +- ) +- set(HDF5_${__lang}_LIBRARIES) +- +- foreach(L IN LISTS HDF5_${__lang}_LIBRARY_NAMES) +- set(_HDF5_SEARCH_NAMES_LOCAL) +- if("x${L}" MATCHES "hdf5") +- # hdf5 library +- set(_HDF5_SEARCH_OPTS_LOCAL ${_HDF5_SEARCH_OPTS}) +- if(HDF5_USE_STATIC_LIBRARIES) +- if(WIN32) +- set(_HDF5_SEARCH_NAMES_LOCAL lib${L}) +- else() +- set(_HDF5_SEARCH_NAMES_LOCAL lib${L}.a) +- endif() +- endif() +- else() +- # external library +- set(_HDF5_SEARCH_OPTS_LOCAL) +- endif() +- find_library(HDF5_${__lang}_LIBRARY_${L} +- NAMES ${_HDF5_SEARCH_NAMES_LOCAL} ${L} NAMES_PER_DIR +- HINTS ${HDF5_${__lang}_LIBRARY_DIRS} +- ${HDF5_ROOT} +- ${_HDF5_SEARCH_OPTS_LOCAL} +- ) +- unset(_HDF5_SEARCH_OPTS_LOCAL) +- unset(_HDF5_SEARCH_NAMES_LOCAL) +- if(HDF5_${__lang}_LIBRARY_${L}) +- list(APPEND HDF5_${__lang}_LIBRARIES ${HDF5_${__lang}_LIBRARY_${L}}) +- else() +- list(APPEND HDF5_${__lang}_LIBRARIES ${L}) +- endif() +- endforeach() +- if(FIND_HL) +- set(HDF5_${__lang}_HL_LIBRARIES) +- foreach(L IN LISTS HDF5_${__lang}_HL_LIBRARY_NAMES) +- set(_HDF5_SEARCH_NAMES_LOCAL) +- if("x${L}" MATCHES "hdf5") +- # hdf5 library +- set(_HDF5_SEARCH_OPTS_LOCAL ${_HDF5_SEARCH_OPTS}) +- if(HDF5_USE_STATIC_LIBRARIES) +- if(WIN32) +- set(_HDF5_SEARCH_NAMES_LOCAL lib${L}) +- else() +- set(_HDF5_SEARCH_NAMES_LOCAL lib${L}.a) +- endif() +- endif() +- else() +- # external library +- set(_HDF5_SEARCH_OPTS_LOCAL) +- endif() +- find_library(HDF5_${__lang}_LIBRARY_${L} +- NAMES ${_HDF5_SEARCH_NAMES_LOCAL} ${L} NAMES_PER_DIR +- HINTS ${HDF5_${__lang}_LIBRARY_DIRS} +- ${HDF5_ROOT} +- ${_HDF5_SEARCH_OPTS_LOCAL} +- ) +- unset(_HDF5_SEARCH_OPTS_LOCAL) +- unset(_HDF5_SEARCH_NAMES_LOCAL) +- if(HDF5_${__lang}_LIBRARY_${L}) +- list(APPEND HDF5_${__lang}_HL_LIBRARIES ${HDF5_${__lang}_LIBRARY_${L}}) +- else() +- list(APPEND HDF5_${__lang}_HL_LIBRARIES ${L}) +- endif() +- endforeach() +- set(HDF5_HL_FOUND True) +- endif() +- +- set(HDF5_${__lang}_FOUND True) +- _HDF5_remove_duplicates_from_beginning(HDF5_${__lang}_DEFINITIONS) +- _HDF5_remove_duplicates_from_beginning(HDF5_${__lang}_INCLUDE_DIRS) +- _HDF5_remove_duplicates_from_beginning(HDF5_${__lang}_LIBRARIES) +- _HDF5_remove_duplicates_from_beginning(HDF5_${__lang}_HL_LIBRARIES) +- else() +- set(_HDF5_NEED_TO_SEARCH True) +- endif() +- else() +- set(_HDF5_NEED_TO_SEARCH True) +- endif() +- endif() +- if(HDF5_${__lang}_VERSION) +- if(NOT HDF5_VERSION) +- set(HDF5_VERSION ${HDF5_${__lang}_VERSION}) +- elseif(NOT HDF5_VERSION VERSION_EQUAL HDF5_${__lang}_VERSION) +- message(WARNING "HDF5 Version found for language ${__lang}, ${HDF5_${__lang}_VERSION} is different than previously found version ${HDF5_VERSION}") +- endif() +- endif() +- if(DEFINED HDF5_${__lang}_IS_PARALLEL) +- if(NOT DEFINED HDF5_IS_PARALLEL) +- set(HDF5_IS_PARALLEL ${HDF5_${__lang}_IS_PARALLEL}) +- elseif(NOT HDF5_IS_PARALLEL AND HDF5_${__lang}_IS_PARALLEL) +- message(WARNING "HDF5 found for language ${__lang} is parallel but previously found language is not parallel.") +- elseif(HDF5_IS_PARALLEL AND NOT HDF5_${__lang}_IS_PARALLEL) +- message(WARNING "HDF5 found for language ${__lang} is not parallel but previously found language is parallel.") +- endif() +- endif() +- endforeach() ++ message(FATAL_ERROR "HDF5 target not found") ++endif() ++if(TARGET hdf5::hdf5_hl-shared) ++ set_target_properties(hdf5::hdf5_hl-shared PROPERTIES IMPORTED_GLOBAL TRUE) ++ add_library(hdf5::hdf5_hl ALIAS hdf5::hdf5_hl-shared) ++elseif(TARGET hdf5::hdf5_hl-static) ++ set_target_properties(hdf5::hdf5_hl-static PROPERTIES IMPORTED_GLOBAL TRUE) ++ add_library(hdf5::hdf5_hl ALIAS hdf5::hdf5_hl-static) + else() +- set(_HDF5_NEED_TO_SEARCH True) +-endif() +- +-if(NOT HDF5_FOUND AND HDF5_COMPILER_NO_INTERROGATE) +- # No arguments necessary, all languages can use the compiler wrappers +- set(HDF5_FOUND True) +- set(HDF5_METHOD "Included by compiler wrappers") +- set(HDF5_REQUIRED_VARS HDF5_METHOD) +-elseif(NOT HDF5_FOUND AND NOT _HDF5_NEED_TO_SEARCH) +- # Compiler wrappers aren't being used by the build but were found and used +- # to determine necessary include and library flags +- set(HDF5_INCLUDE_DIRS) +- set(HDF5_LIBRARIES) +- set(HDF5_HL_LIBRARIES) +- foreach(__lang IN LISTS HDF5_LANGUAGE_BINDINGS) +- if(HDF5_${__lang}_FOUND) +- if(NOT HDF5_${__lang}_COMPILER_NO_INTERROGATE) +- list(APPEND HDF5_DEFINITIONS ${HDF5_${__lang}_DEFINITIONS}) +- list(APPEND HDF5_INCLUDE_DIRS ${HDF5_${__lang}_INCLUDE_DIRS}) +- list(APPEND HDF5_LIBRARIES ${HDF5_${__lang}_LIBRARIES}) +- if(FIND_HL) +- list(APPEND HDF5_HL_LIBRARIES ${HDF5_${__lang}_HL_LIBRARIES}) +- endif() +- endif() +- endif() +- endforeach() +- _HDF5_remove_duplicates_from_beginning(HDF5_DEFINITIONS) +- _HDF5_remove_duplicates_from_beginning(HDF5_INCLUDE_DIRS) +- _HDF5_remove_duplicates_from_beginning(HDF5_LIBRARIES) +- _HDF5_remove_duplicates_from_beginning(HDF5_HL_LIBRARIES) +- set(HDF5_FOUND True) +- set(HDF5_REQUIRED_VARS HDF5_LIBRARIES) +- if(FIND_HL) +- list(APPEND HDF5_REQUIRED_VARS HDF5_HL_LIBRARIES) +- endif() +-endif() +- +-find_program( HDF5_DIFF_EXECUTABLE +- NAMES h5diff +- HINTS ${HDF5_ROOT} +- PATH_SUFFIXES bin Bin +- ${_HDF5_SEARCH_OPTS} +- DOC "HDF5 file differencing tool." ) +-mark_as_advanced( HDF5_DIFF_EXECUTABLE ) +- +-if( NOT HDF5_FOUND ) +- # seed the initial lists of libraries to find with items we know we need +- set(HDF5_C_LIBRARY_NAMES hdf5) +- set(HDF5_C_HL_LIBRARY_NAMES hdf5_hl) +- +- set(HDF5_CXX_LIBRARY_NAMES hdf5_cpp ${HDF5_C_LIBRARY_NAMES}) +- set(HDF5_CXX_HL_LIBRARY_NAMES hdf5_hl_cpp ${HDF5_C_HL_LIBRARY_NAMES} ${HDF5_CXX_LIBRARY_NAMES}) +- +- set(HDF5_Fortran_LIBRARY_NAMES hdf5_fortran ${HDF5_C_LIBRARY_NAMES}) +- set(HDF5_Fortran_HL_LIBRARY_NAMES hdf5hl_fortran ${HDF5_C_HL_LIBRARY_NAMES} ${HDF5_Fortran_LIBRARY_NAMES}) +- +- foreach(__lang IN LISTS HDF5_LANGUAGE_BINDINGS) +- # find the HDF5 include directories +- if("${__lang}" STREQUAL "Fortran") +- set(HDF5_INCLUDE_FILENAME hdf5.mod) +- elseif("${__lang}" STREQUAL "CXX") +- set(HDF5_INCLUDE_FILENAME H5Cpp.h) +- else() +- set(HDF5_INCLUDE_FILENAME hdf5.h) +- endif() +- +- find_path(HDF5_${__lang}_INCLUDE_DIR ${HDF5_INCLUDE_FILENAME} +- HINTS ${HDF5_ROOT} +- PATHS $ENV{HOME}/.local/include +- PATH_SUFFIXES include Include +- ${_HDF5_SEARCH_OPTS} +- ) +- mark_as_advanced(HDF5_${__lang}_INCLUDE_DIR) +- # set the _DIRS variable as this is what the user will normally use +- set(HDF5_${__lang}_INCLUDE_DIRS ${HDF5_${__lang}_INCLUDE_DIR}) +- list(APPEND HDF5_INCLUDE_DIRS ${HDF5_${__lang}_INCLUDE_DIR}) +- +- # find the HDF5 libraries +- foreach(LIB IN LISTS HDF5_${__lang}_LIBRARY_NAMES) +- if(HDF5_USE_STATIC_LIBRARIES) +- # According to bug 1643 on the CMake bug tracker, this is the +- # preferred method for searching for a static library. +- # See https://gitlab.kitware.com/cmake/cmake/issues/1643. We search +- # first for the full static library name, but fall back to a +- # generic search on the name if the static search fails. +- set( THIS_LIBRARY_SEARCH_DEBUG +- lib${LIB}d.a lib${LIB}_debug.a lib${LIB}d lib${LIB}_D lib${LIB}_debug +- lib${LIB}d-static.a lib${LIB}_debug-static.a ${LIB}d-static ${LIB}_D-static ${LIB}_debug-static ) +- set( THIS_LIBRARY_SEARCH_RELEASE lib${LIB}.a lib${LIB} lib${LIB}-static.a ${LIB}-static) +- else() +- set( THIS_LIBRARY_SEARCH_DEBUG ${LIB}d ${LIB}_D ${LIB}_debug ${LIB}d-shared ${LIB}_D-shared ${LIB}_debug-shared) +- set( THIS_LIBRARY_SEARCH_RELEASE ${LIB} ${LIB}-shared) +- if(WIN32) +- list(APPEND HDF5_DEFINITIONS "-DH5_BUILT_AS_DYNAMIC_LIB") +- endif() +- endif() +- find_library(HDF5_${LIB}_LIBRARY_DEBUG +- NAMES ${THIS_LIBRARY_SEARCH_DEBUG} +- HINTS ${HDF5_ROOT} PATH_SUFFIXES lib Lib +- ${_HDF5_SEARCH_OPTS} +- ) +- find_library( HDF5_${LIB}_LIBRARY_RELEASE +- NAMES ${THIS_LIBRARY_SEARCH_RELEASE} +- HINTS ${HDF5_ROOT} PATH_SUFFIXES lib Lib +- ${_HDF5_SEARCH_OPTS} +- ) +- select_library_configurations( HDF5_${LIB} ) +- list(APPEND HDF5_${__lang}_LIBRARIES ${HDF5_${LIB}_LIBRARY}) +- endforeach() +- if(HDF5_${__lang}_LIBRARIES) +- set(HDF5_${__lang}_FOUND True) +- endif() +- +- # Append the libraries for this language binding to the list of all +- # required libraries. +- list(APPEND HDF5_LIBRARIES ${HDF5_${__lang}_LIBRARIES}) +- +- if(FIND_HL) +- foreach(LIB IN LISTS HDF5_${__lang}_HL_LIBRARY_NAMES) +- if(HDF5_USE_STATIC_LIBRARIES) +- # According to bug 1643 on the CMake bug tracker, this is the +- # preferred method for searching for a static library. +- # See https://gitlab.kitware.com/cmake/cmake/issues/1643. We search +- # first for the full static library name, but fall back to a +- # generic search on the name if the static search fails. +- set( THIS_LIBRARY_SEARCH_DEBUG +- lib${LIB}d.a lib${LIB}_debug.a lib${LIB}d lib${LIB}_D lib${LIB}_debug +- lib${LIB}d-static.a lib${LIB}_debug-static.a lib${LIB}d-static lib${LIB}_D-static lib${LIB}_debug-static ) +- set( THIS_LIBRARY_SEARCH_RELEASE lib${LIB}.a ${LIB} lib${LIB}-static.a lib${LIB}-static) +- else() +- set( THIS_LIBRARY_SEARCH_DEBUG ${LIB}d ${LIB}_D ${LIB}_debug ${LIB}d-shared ${LIB}_D-shared ${LIB}_debug-shared) +- set( THIS_LIBRARY_SEARCH_RELEASE ${LIB} ${LIB}-shared) +- endif() +- find_library(HDF5_${LIB}_LIBRARY_DEBUG +- NAMES ${THIS_LIBRARY_SEARCH_DEBUG} +- HINTS ${HDF5_ROOT} PATH_SUFFIXES lib Lib +- ${_HDF5_SEARCH_OPTS} +- ) +- find_library( HDF5_${LIB}_LIBRARY_RELEASE +- NAMES ${THIS_LIBRARY_SEARCH_RELEASE} +- HINTS ${HDF5_ROOT} PATH_SUFFIXES lib Lib +- ${_HDF5_SEARCH_OPTS} +- ) +- select_library_configurations( HDF5_${LIB} ) +- list(APPEND HDF5_${__lang}_HL_LIBRARIES ${HDF5_${LIB}_LIBRARY}) +- endforeach() +- +- # Append the libraries for this language binding to the list of all +- # required libraries. +- list(APPEND HDF5_HL_LIBRARIES ${HDF5_${__lang}_HL_LIBRARIES}) +- endif() +- endforeach() +- if(FIND_HL AND HDF5_HL_LIBRARIES) +- set(HDF5_HL_FOUND True) +- endif() +- +- _HDF5_remove_duplicates_from_beginning(HDF5_DEFINITIONS) +- _HDF5_remove_duplicates_from_beginning(HDF5_INCLUDE_DIRS) +- _HDF5_remove_duplicates_from_beginning(HDF5_LIBRARIES) +- _HDF5_remove_duplicates_from_beginning(HDF5_HL_LIBRARIES) +- +- # If the HDF5 include directory was found, open H5pubconf.h to determine if +- # HDF5 was compiled with parallel IO support +- set( HDF5_IS_PARALLEL FALSE ) +- set( HDF5_VERSION "" ) +- foreach( _dir IN LISTS HDF5_INCLUDE_DIRS ) +- foreach(_hdr "${_dir}/H5pubconf.h" "${_dir}/H5pubconf-64.h" "${_dir}/H5pubconf-32.h") +- if( EXISTS "${_hdr}" ) +- file( STRINGS "${_hdr}" +- HDF5_HAVE_PARALLEL_DEFINE +- REGEX "HAVE_PARALLEL 1" ) +- if( HDF5_HAVE_PARALLEL_DEFINE ) +- set( HDF5_IS_PARALLEL TRUE ) +- endif() +- unset(HDF5_HAVE_PARALLEL_DEFINE) +- +- file( STRINGS "${_hdr}" +- HDF5_VERSION_DEFINE +- REGEX "^[ \t]*#[ \t]*define[ \t]+H5_VERSION[ \t]+" ) +- if( "${HDF5_VERSION_DEFINE}" MATCHES +- "H5_VERSION[ \t]+\"([0-9]+\\.[0-9]+\\.[0-9]+)(-patch([0-9]+))?\"" ) +- set( HDF5_VERSION "${CMAKE_MATCH_1}" ) +- if( CMAKE_MATCH_3 ) +- set( HDF5_VERSION ${HDF5_VERSION}.${CMAKE_MATCH_3}) +- endif() +- endif() +- unset(HDF5_VERSION_DEFINE) +- endif() +- endforeach() +- endforeach() +- set( HDF5_IS_PARALLEL ${HDF5_IS_PARALLEL} CACHE BOOL +- "HDF5 library compiled with parallel IO support" ) +- mark_as_advanced( HDF5_IS_PARALLEL ) +- +- set(HDF5_REQUIRED_VARS HDF5_LIBRARIES HDF5_INCLUDE_DIRS) +- if(FIND_HL) +- list(APPEND HDF5_REQUIRED_VARS HDF5_HL_LIBRARIES) +- endif() +-endif() +- +-# For backwards compatibility we set HDF5_INCLUDE_DIR to the value of +-# HDF5_INCLUDE_DIRS +-if( HDF5_INCLUDE_DIRS ) +- set( HDF5_INCLUDE_DIR "${HDF5_INCLUDE_DIRS}" ) +-endif() +- +-# If HDF5_REQUIRED_VARS is empty at this point, then it's likely that +-# something external is trying to explicitly pass already found +-# locations +-if(NOT HDF5_REQUIRED_VARS) +- set(HDF5_REQUIRED_VARS HDF5_LIBRARIES HDF5_INCLUDE_DIRS) +-endif() +- +-find_package_handle_standard_args(HDF5 +- REQUIRED_VARS ${HDF5_REQUIRED_VARS} +- VERSION_VAR HDF5_VERSION +- HANDLE_COMPONENTS +-) +- +-unset(_HDF5_SEARCH_OPTS) +- +-if( HDF5_FOUND AND NOT HDF5_DIR) +- # hide HDF5_DIR for the non-advanced user to avoid confusion with +- # HDF5_DIR-NOT_FOUND while HDF5 was found. +- mark_as_advanced(HDF5_DIR) +-endif() +- +-if (HDF5_FOUND) +- if (NOT TARGET HDF5::HDF5) +- add_library(HDF5::HDF5 INTERFACE IMPORTED) +- string(REPLACE "-D" "" _hdf5_definitions "${HDF5_DEFINITIONS}") +- set_target_properties(HDF5::HDF5 PROPERTIES +- INTERFACE_LINK_LIBRARIES "${HDF5_LIBRARIES}" +- INTERFACE_INCLUDE_DIRECTORIES "${HDF5_INCLUDE_DIRS}" +- INTERFACE_COMPILE_DEFINITIONS "${_hdf5_definitions}") +- unset(_hdf5_definitions) +- endif () +- +- include(vtkDetectLibraryType) +- foreach (hdf5_lang IN LISTS HDF5_LANGUAGE_BINDINGS) +- if (hdf5_lang STREQUAL "C") +- set(hdf5_target_name "hdf5") +- elseif (hdf5_lang STREQUAL "CXX") +- set(hdf5_target_name "hdf5_cpp") +- elseif (hdf5_lang STREQUAL "Fortran") +- set(hdf5_target_name "hdf5_fortran") +- else () +- continue () +- endif () +- +- if (NOT TARGET "hdf5::${hdf5_target_name}") +- if (HDF5_COMPILER_NO_INTERROGATE) +- add_library("hdf5::${hdf5_target_name}" INTERFACE IMPORTED) +- string(REPLACE "-D" "" _hdf5_definitions "${HDF5_${hdf5_lang}_DEFINITIONS}") +- set_target_properties("hdf5::${hdf5_target_name}" PROPERTIES +- INTERFACE_INCLUDE_DIRECTORIES "${HDF5_${hdf5_lang}_INCLUDE_DIRS}" +- INTERFACE_COMPILE_DEFINITIONS "${_hdf5_definitions}") +- else() +- if (DEFINED "HDF5_${hdf5_lang}_LIBRARY_${hdf5_target_name}") +- set(_hdf5_location "${HDF5_${hdf5_lang}_LIBRARY_${hdf5_target_name}}") +- elseif (DEFINED "HDF5_${hdf5_target_name}_LIBRARY") +- set(_hdf5_location "${HDF5_${hdf5_target_name}_LIBRARY}") +- elseif (DEFINED "HDF5_${hdf5_lang}_LIBRARY") +- set(_hdf5_location "${HDF5_${hdf5_lang}_LIBRARY}") +- else () +- # Error if we still don't have the location. +- message(SEND_ERROR +- "HDF5 was found, but a different variable was set which contains " +- "its location.") +- endif () +- vtk_detect_library_type(_hdf5_libtype PATH "${_hdf5_location}") +- add_library("hdf5::${hdf5_target_name}" "${_hdf5_libtype}" IMPORTED) +- string(REPLACE "-D" "" _hdf5_definitions "${HDF5_${hdf5_lang}_DEFINITIONS}") +- set_target_properties("hdf5::${hdf5_target_name}" PROPERTIES +- IMPORTED_LOCATION "${_hdf5_location}" +- IMPORTED_IMPLIB "${_hdf5_location}" +- INTERFACE_INCLUDE_DIRECTORIES "${HDF5_${hdf5_lang}_INCLUDE_DIRS}" +- INTERFACE_COMPILE_DEFINITIONS "${_hdf5_definitions}") +- if (_hdf5_libtype STREQUAL "SHARED") +- set_property(TARGET "hdf5::${hdf5_target_name}" APPEND +- PROPERTY +- INTERFACE_COMPILE_DEFINITIONS H5_BUILT_AS_DYNAMIC_LIB) +- elseif (_hdf5_libtype STREQUAL "STATIC") +- set_property(TARGET "hdf5::${hdf5_target_name}" APPEND +- PROPERTY +- INTERFACE_COMPILE_DEFINITIONS H5_BUILT_AS_STATIC_LIB) +- endif () +- unset(_hdf5_definitions) +- unset(_hdf5_libtype) +- unset(_hdf5_location) +- endif () +- endif () +- +- if (NOT FIND_HL) +- continue () +- endif () +- +- if (hdf5_lang STREQUAL "C") +- set(hdf5_target_name "hdf5_hl") +- elseif (hdf5_lang STREQUAL "CXX") +- set(hdf5_target_name "hdf5_hl_cpp") +- elseif (hdf5_lang STREQUAL "Fortran") +- set(hdf5_target_name "hdf5_hl_fortran") +- else () +- continue () +- endif () +- +- if (NOT TARGET "hdf5::${hdf5_target_name}") +- if (HDF5_COMPILER_NO_INTERROGATE) +- add_library("hdf5::${hdf5_target_name}" INTERFACE IMPORTED) +- string(REPLACE "-D" "" _hdf5_definitions "${HDF5_${hdf5_lang}_HL_DEFINITIONS}") +- set_target_properties("hdf5::${hdf5_target_name}" PROPERTIES +- INTERFACE_INCLUDE_DIRECTORIES "${HDF5_${hdf5_lang}_HL_INCLUDE_DIRS}" +- INTERFACE_COMPILE_DEFINITIONS "${_hdf5_definitions}") +- else() +- if (DEFINED "HDF5_${hdf5_lang}_LIBRARY_${hdf5_target_name}") +- set(_hdf5_location "${HDF5_${hdf5_lang}_LIBRARY_${hdf5_target_name}}") +- elseif (DEFINED "HDF5_${hdf5_target_name}_LIBRARY") +- set(_hdf5_location "${HDF5_${hdf5_target_name}_LIBRARY}") +- elseif (DEFINED "HDF5_${hdf5_lang}_LIBRARY") +- set(_hdf5_location "${HDF5_${hdf5_lang}_LIBRARY}") +- else () +- # Error if we still don't have the location. +- message(SEND_ERROR +- "HDF5 was found, but a different variable was set which contains " +- "its location.") +- endif () +- vtk_detect_library_type(_hdf5_libtype PATH "${_hdf5_location}") +- add_library("hdf5::${hdf5_target_name}" "${_hdf5_libtype}" IMPORTED) +- string(REPLACE "-D" "" _hdf5_definitions "${HDF5_${hdf5_lang}_HL_DEFINITIONS}") +- set_target_properties("hdf5::${hdf5_target_name}" PROPERTIES +- IMPORTED_LOCATION "${_hdf5_location}" +- IMPORTED_IMPLIB "${_hdf5_location}" +- INTERFACE_INCLUDE_DIRECTORIES "${HDF5_${hdf5_lang}_HL_INCLUDE_DIRS}" +- INTERFACE_COMPILE_DEFINITIONS "${_hdf5_definitions}") +- if (_hdf5_libtype STREQUAL "SHARED") +- set_property(TARGET "hdf5::${hdf5_target_name}" APPEND +- PROPERTY +- INTERFACE_COMPILE_DEFINITIONS H5_BUILT_AS_DYNAMIC_LIB) +- elseif (_hdf5_libtype STREQUAL "STATIC") +- set_property(TARGET "hdf5::${hdf5_target_name}" APPEND +- PROPERTY +- INTERFACE_COMPILE_DEFINITIONS H5_BUILT_AS_STATIC_LIB) +- endif () +- unset(_hdf5_definitions) +- unset(_hdf5_libtype) +- unset(_hdf5_location) +- endif () +- endif () +- endforeach () +- unset(hdf5_lang) +- +- if (HDF5_DIFF_EXECUTABLE AND NOT TARGET hdf5::h5diff) +- add_executable(hdf5::h5diff IMPORTED) +- set_target_properties(hdf5::h5diff PROPERTIES +- IMPORTED_LOCATION "${HDF5_DIFF_EXECUTABLE}") +- endif () +-endif () +- +-if (HDF5_FIND_DEBUG) +- message(STATUS "HDF5_DIR: ${HDF5_DIR}") +- message(STATUS "HDF5_DEFINITIONS: ${HDF5_DEFINITIONS}") +- message(STATUS "HDF5_INCLUDE_DIRS: ${HDF5_INCLUDE_DIRS}") +- message(STATUS "HDF5_LIBRARIES: ${HDF5_LIBRARIES}") +- message(STATUS "HDF5_HL_LIBRARIES: ${HDF5_HL_LIBRARIES}") +- foreach(__lang IN LISTS HDF5_LANGUAGE_BINDINGS) +- message(STATUS "HDF5_${__lang}_DEFINITIONS: ${HDF5_${__lang}_DEFINITIONS}") +- message(STATUS "HDF5_${__lang}_INCLUDE_DIR: ${HDF5_${__lang}_INCLUDE_DIR}") +- message(STATUS "HDF5_${__lang}_INCLUDE_DIRS: ${HDF5_${__lang}_INCLUDE_DIRS}") +- message(STATUS "HDF5_${__lang}_LIBRARY: ${HDF5_${__lang}_LIBRARY}") +- message(STATUS "HDF5_${__lang}_LIBRARIES: ${HDF5_${__lang}_LIBRARIES}") +- message(STATUS "HDF5_${__lang}_HL_LIBRARY: ${HDF5_${__lang}_HL_LIBRARY}") +- message(STATUS "HDF5_${__lang}_HL_LIBRARIES: ${HDF5_${__lang}_HL_LIBRARIES}") +- endforeach() ++ message(FATAL_ERROR "HDF5 HL target not found") + endif() ++set(HDF5_FOUND ON CACHE BOOL "" FORCE) ++set(hdf5_FOUND ON CACHE BOOL "" FORCE) +\ No newline at end of file +diff --git a/5177cbfe68-32836f596b/ThirdParty/hdf5/CMakeLists.txt b/5177cbfe68-40a31268e5/ThirdParty/hdf5/CMakeLists.txt +index 79027198b..b9fb556ac 100644 +--- a/5177cbfe68-32836f596b/ThirdParty/hdf5/CMakeLists.txt ++++ b/5177cbfe68-40a31268e5/ThirdParty/hdf5/CMakeLists.txt +@@ -1,5 +1,9 @@ + set(HDF5_EXTERNALLY_CONFIGURED 1) + ++#if(VTK_MODULE_USE_EXTERNAL_VTK_hdf5) ++# find_package(hdf5 CONFIG REQUIRED) ++#endif() ++ + vtk_module_third_party( + INTERNAL + LICENSE_FILES "vtkhdf5/COPYING" + +index a7ab1dc23..789759f60 100644 +diff --git a/5177cbfe68-32836f596b/Wrapping/PythonCore/vtk.module b/5177cbfe68-40a31268e5/Wrapping/PythonCore/vtk.module +index 03b787cc2..49cefc464 100644 +--- a/5177cbfe68-32836f596b/Wrapping/PythonCore/vtk.module ++++ b/5177cbfe68-40a31268e5/Wrapping/PythonCore/vtk.module +@@ -6,4 +6,5 @@ DEPENDS + VTK::CommonCore + VTK::Python + VTK::vtksys ++ #VTK::hdf5 + EXCLUDE_WRAP diff --git a/ports/vtk/FindLZMA.patch b/ports/vtk/FindLZMA.patch new file mode 100644 index 00000000000000..df9414421a6692 --- /dev/null +++ b/ports/vtk/FindLZMA.patch @@ -0,0 +1,84 @@ +diff --git a/CMake/FindLZMA.cmake b/CMake/FindLZMA.cmake +index 0c8c7943c..d60669484 100644 +--- a/CMake/FindLZMA.cmake ++++ b/CMake/FindLZMA.cmake +@@ -1,9 +1,15 @@ + find_path(LZMA_INCLUDE_DIR + NAMES lzma.h + DOC "lzma include directory") +-find_library(LZMA_LIBRARY ++# Note LZMA_LIBRARY is set somewhere else. Maybe one of the configs/wrappers installed by VCPKG defines it. ++# The original FindLZMA chokes on it since it contains optimized/debug keywords ++# VTK should probably switch to FindLibLZMA from CMake ++find_library(LZMA_LIBRARY_RELEASE + NAMES lzma + DOC "lzma library") ++find_library(LZMA_LIBRARY_DEBUG ++ NAMES lzmad lzma NAMES_PER_DIR ++ DOC "lzma library") + + if (LZMA_INCLUDE_DIR) + file(STRINGS "${LZMA_INCLUDE_DIR}/lzma/version.h" _lzma_version_lines +@@ -20,22 +26,50 @@ endif () + + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(LZMA +- REQUIRED_VARS LZMA_LIBRARY LZMA_INCLUDE_DIR ++ REQUIRED_VARS LZMA_LIBRARY LZMA_LIBRARY_RELEASE LZMA_LIBRARY_DEBUG LZMA_INCLUDE_DIR + VERSION_VAR LZMA_VERSION) + + if (LZMA_FOUND) + set(LZMA_LIBRARIES "${LZMA_LIBRARY}") + set(LZMA_INCLUDE_DIRS "${LZMA_INCLUDE_DIR}") +- ++ + if (NOT TARGET LZMA::LZMA) + include(vtkDetectLibraryType) +- vtk_detect_library_type(lzma_library_type +- PATH "${LZMA_LIBRARY}") +- add_library(LZMA::LZMA "${lzma_library_type}" IMPORTED) +- unset(lzma_library_type) +- set_target_properties(LZMA::LZMA PROPERTIES +- IMPORTED_LOCATION "${LZMA_LIBRARY}" +- IMPORTED_IMPLIB "${LZMA_LIBRARY}" +- INTERFACE_INCLUDE_DIRECTORIES "${LZMA_INCLUDE_DIR}") +- endif () ++ if(LZMA_LIBRARY_RELEASE) ++ vtk_detect_library_type(lzma_library_type ++ PATH "${LZMA_LIBRARY_RELEASE}") ++ elseif(LZMA_LIBRARY_DEBUG) ++ vtk_detect_library_type(lzma_library_type ++ PATH "${LZMA_LIBRARY_DEBUG}") ++ else() ++ vtk_detect_library_type(lzma_library_type ++ PATH "${LZMA_LIBRARY}") ++ endif() ++ ++ add_library(LZMA::LZMA "${lzma_library_type}" IMPORTED) ++ set_target_properties(LZMA::LZMA PROPERTIES ++ INTERFACE_INCLUDE_DIRECTORIES "${LZMA_INCLUDE_DIR}") ++ if(LZMA_LIBRARY_RELEASE) ++ set_target_properties(LZMA::LZMA PROPERTIES ++ IMPORTED_LOCATION_RELEASE "${LZMA_LIBRARY_RELEASE}" ++ IMPORTED_IMPLIB_RELEASE "${LZMA_LIBRARY_RELEASE}") ++ endif() ++ if(LZMA_LIBRARY_DEBUG) ++ set_target_properties(LZMA::LZMA PROPERTIES ++ IMPORTED_LOCATION_DEBUG "${LZMA_LIBRARY_DEBUG}" ++ IMPORTED_IMPLIB_DEBUG "${LZMA_LIBRARY_DEBUG}") ++ endif() ++ ++ # Guard against possible stupidity of VTK reading only LOCATION without configuration ++ if(CMAKE_BUILD_TYPE MATCHES "Debug") ++ set_target_properties(LZMA::LZMA PROPERTIES ++ IMPORTED_LOCATION "${LZMA_LIBRARY_DEBUG}" ++ IMPORTED_IMPLIB "${LZMA_LIBRARY_DEBUG}") ++ else() ++ set_target_properties(LZMA::LZMA PROPERTIES ++ IMPORTED_LOCATION "${LZMA_LIBRARY_RELEASE}" ++ IMPORTED_IMPLIB "${LZMA_LIBRARY_RELEASE}") ++ endif() ++ endif() ++ #set_target_properties(LZMA::LZMA PROPERTIES IMPORTED_GLOBAL TRUE) + endif () + \ No newline at end of file diff --git a/ports/vtk/FindLibHaru.patch b/ports/vtk/FindLibHaru.patch new file mode 100644 index 00000000000000..1b47a14b7afbf5 --- /dev/null +++ b/ports/vtk/FindLibHaru.patch @@ -0,0 +1,37 @@ +diff --git a/CMake/FindLibHaru.cmake b/CMake/FindLibHaru.cmake +index 7ef877a49..2a18e0694 100644 +--- a/CMake/FindLibHaru.cmake ++++ b/CMake/FindLibHaru.cmake +@@ -43,6 +43,31 @@ if (LibHaru_FOUND) + set(LibHaru_INCLUDE_DIRS "${LibHaru_INCLUDE_DIR}") + set(LibHaru_LIBRARIES "${LibHaru_LIBRARY}") + ++ add_library(LibHaru::LibHaru UNKNOWN IMPORTED) ++ set_target_properties(LibHaru::LibHaru PROPERTIES ++ INTERFACE_INCLUDE_DIRECTORIES "${LibHaru_INCLUDE_DIR}") ++ if(LZMA_LIBRARY_RELEASE) ++ set_target_properties(LibHaru::LibHaru PROPERTIES ++ IMPORTED_LOCATION_RELEASE "${LibHaru_LIBRARY_RELEASE}" ++ IMPORTED_IMPLIB_RELEASE "${LibHaru_LIBRARY_RELEASE}") ++ endif() ++ if(LZMA_LIBRARY_DEBUG) ++ set_target_properties(LibHaru::LibHaru PROPERTIES ++ IMPORTED_LOCATION_DEBUG "${LibHaru_LIBRARY_DEBUG}" ++ IMPORTED_IMPLIB_DEBUG "${LibHaru_LIBRARY_DEBUG}") ++ endif() ++ ++ # Guard against possible stupidity of VTK reading only LOCATION without configuration ++ if(CMAKE_BUILD_TYPE MATCHES "Debug") ++ set_target_properties(LibHaru::LibHaru PROPERTIES ++ IMPORTED_LOCATION "${LibHaru_LIBRARY_DEBUG}" ++ IMPORTED_IMPLIB "${LibHaru_LIBRARY_DEBUG}") ++ else() ++ set_target_properties(LibHaru::LibHaru PROPERTIES ++ IMPORTED_LOCATION "${LibHaru_LIBRARY_RELEASE}" ++ IMPORTED_IMPLIB "${LibHaru_LIBRARY_RELEASE}") ++ endif() ++ + if (NOT TARGET LibHaru::LibHaru) + include(vtkDetectLibraryType) + vtk_detect_library_type(libharu_library_type + \ No newline at end of file diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 1ba6318f2ea842..2fa7a1a1b95edd 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -2,6 +2,9 @@ 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() +# TODO: +# - add loguru as a dependency requires #8682 + # ============================================================================= # Options: # Collect CMake options for optional components @@ -41,6 +44,9 @@ vcpkg_from_github( HEAD_REF master PATCHES MR6108.patch # Fixes usage of system pugixml! (Already merged in master) + FindHDF5.patch # completly replaces FindHDF5 + FindLibHaru.patch + FindLZMA.patch ) # Remove the FindGLEW.cmake and FindPythonLibs.cmake that are distributed with VTK, From f3e7e62f5aeb3c4f15fdacd2ee9c00521b199497 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 6 Dec 2019 16:19:09 +0100 Subject: [PATCH 030/419] use VTK version from config file --- ports/vtk/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL index c8597728d036fb..2299fbc4ba5f57 100644 --- a/ports/vtk/CONTROL +++ b/ports/vtk/CONTROL @@ -1,5 +1,5 @@ Source: vtk -Version: 8.2-PV-v5.7 +Version: 8.90-PV-v5.7 Description: Software system for 3D computer graphics, image processing, and visualization Homepage: https://github.com/Kitware/VTK Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, liblzma, libtheora, eigen3, double-conversion, pugixml, libharu, sqlite3, netcdf-c, utfcpp, libogg From 52a821ea9ea6feb2d0a2505ab55fb2f16d64ba97 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 6 Dec 2019 16:19:16 +0100 Subject: [PATCH 031/419] fix hash --- ports/paraview/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/paraview/portfile.cmake b/ports/paraview/portfile.cmake index 586ac1c3dc9a26..fd965191cf5b0e 100644 --- a/ports/paraview/portfile.cmake +++ b/ports/paraview/portfile.cmake @@ -35,7 +35,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Kitware/ParaView REF 0d5c94ac254a1eb1e55b3a0db291d97acd25790d # v5.7.0 - SHA512 1a693074830c5ca0e95a628f7c55ca93ddc03ff832715e893e5cf69a1097c1e3afe794d264f9bcb36632ca487d78fd2961a3eb5358b5c2601387d75befbb8138 + SHA512 df3490c463c96e2b7445e416067f0be469eca86ee655690fd8acdbcda8189c192909981dbb36b043d0e7ccd06f9eb6cf0a2c25a48d23d92c47b061a6ee39b2db HEAD_REF master PATCHES FindPythonModule.patch From fdb0af668f9e134218c55b761e255ed914e61d97 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 6 Dec 2019 16:20:15 +0100 Subject: [PATCH 032/419] deactivate patch --- ports/paraview/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/paraview/portfile.cmake b/ports/paraview/portfile.cmake index fd965191cf5b0e..fe68d558ec716c 100644 --- a/ports/paraview/portfile.cmake +++ b/ports/paraview/portfile.cmake @@ -38,7 +38,7 @@ vcpkg_from_github( SHA512 df3490c463c96e2b7445e416067f0be469eca86ee655690fd8acdbcda8189c192909981dbb36b043d0e7ccd06f9eb6cf0a2c25a48d23d92c47b061a6ee39b2db HEAD_REF master PATCHES - FindPythonModule.patch + #FindPythonModule.patch ) #file(REMOVE_RECURSE ${SOURCE_PATH}/ThirdPary/protobuf/vtkprotobuf) From 1afbce32a5d50fef78bffcdcb8a67b2cac986983 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 6 Dec 2019 16:51:55 +0100 Subject: [PATCH 033/419] add required install for paraview --- ports/vtk/portfile.cmake | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 2fa7a1a1b95edd..f991f723a33614 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -312,6 +312,15 @@ file(RENAME ${CURRENT_PACKAGES_DIR}/share/vtk/Copyright.txt ${CURRENT_PACKAGES_D vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/vtk) +## Files Modules needed by ParaView +if("paraview" IN_LIST FEATURES) + set(VTK_CMAKE_NEEDED vtkCompilerChecks vtkCompilerPlatformFlags vtkCompilerExtraFlags vtkInitializeBuildType vtkSupportMacros vtkDirectories vtkVersion) + foreach(module ${VTK_CMAKE_NEEDED}) + file(INSTALL "${SOURCE_PATH}/CMake/${module}.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/vtk) + endforeach() + file(INSTALL "${SOURCE_PATH}/CMake/vtkRequireLarfeFilesSupport.cxx" DESTINATION ${CURRENT_PACKAGES_DIR}/share/vtk) +endif() + # file(INSTALL "${SOURCE_PATH}/CMake/FindPythonModules.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/vtk/CMake) # file(INSTALL "${SOURCE_PATH}/CMake/vtkCompilerPlatformFlags.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/vtk) # file(INSTALL "${SOURCE_PATH}/CMake/vtkEncodeString.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/vtk) From 39a9b7a7844edcc8236b27ce475d9594a6dff2aa Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 6 Dec 2019 16:52:15 +0100 Subject: [PATCH 034/419] playing with option. Have to add VisItLib to the source tree --- ports/paraview/CMakeLists.txt | 1116 +++++++++++++++++++++++++++++++++ ports/paraview/portfile.cmake | 5 +- 2 files changed, 1118 insertions(+), 3 deletions(-) create mode 100644 ports/paraview/CMakeLists.txt diff --git a/ports/paraview/CMakeLists.txt b/ports/paraview/CMakeLists.txt new file mode 100644 index 00000000000000..d3a989d467e873 --- /dev/null +++ b/ports/paraview/CMakeLists.txt @@ -0,0 +1,1116 @@ +#========================================================================== +# +# Program: ParaView +# +# Copyright (c) 2005-2008 Sandia Corporation, Kitware Inc. +# All rights reserved. +# +# ParaView is a free software; you can redistribute it and/or modify it +# under the terms of the ParaView license version 1.2. +# +# See License_v1.2.txt for the full ParaView license. +# A copy of this license can be obtained by contacting +# Kitware Inc. +# 28 Corporate Drive +# Clifton Park, NY 12065 +# USA +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +#========================================================================== +cmake_minimum_required(VERSION 3.10 FATAL_ERROR) +project(ParaView) + +foreach (policy IN ITEMS + CMP0083 # CMake 3.14 + ) + if (POLICY ${policy}) + cmake_policy(SET ${policy} NEW) + endif () +endforeach () + +# Disallow in-source build +if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR) + message(FATAL_ERROR + "ParaView requires an out-of-source build. Please create a separate " + "binary directory and run CMake there.") +endif () + +#------------------------------------------------------------------------------ +# Set a default build type if none was specified +get_property(generator_is_multi_config GLOBAL + PROPERTY GENERATOR_IS_MULTI_CONFIG) +if (NOT CMAKE_BUILD_TYPE AND NOT generator_is_multi_config) + message(STATUS "Setting build type to 'Debug' as none was specified.") + set(CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build." FORCE) + # Set the possible values of build type for cmake-gui + set_property(CACHE CMAKE_BUILD_TYPE + PROPERTY + STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo") +endif () + +# Set up our directory structure for output libraries and binaries +include(GNUInstallDirs) +if (NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}") +endif () +if (NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY) + set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}") +endif () +if (NOT CMAKE_ARCHIVE_OUTPUT_DIRECTORY) + set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}") +endif () + +set(paraview_cmake_dir "${CMAKE_CURRENT_SOURCE_DIR}/CMake") +set(vtk_cmake_dir "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/share/vtk") +string(REPLACE "/debug" "" vtk_cmake_dir "${vtk_cmake_dir}") +message(STATUS "${vtk_cmake_dir}") +list(APPEND CMAKE_MODULE_PATH + "${paraview_cmake_dir}" + "${vtk_cmake_dir}") +include(ParaViewServerManager) +include(ParaViewTesting) +include(ParaViewClient) +include(ParaViewPlugin) +include(vtkModuleWrapClientServer) +include(CTest) +set_property(CACHE BUILD_TESTING + PROPERTY + TYPE INTERNAL) + +include(vtkCompilerChecks) +include(vtkCompilerPlatformFlags) +include(vtkCompilerExtraFlags) +include(vtkInitializeBuildType) +include(vtkSupportMacros) +include(vtkDirectories) + +#------------------------------------------------------------------------------ +# Choose static or shared libraries. +vtk_deprecated_setting(shared_default PARAVIEW_BUILD_SHARED_LIBS BUILD_SHARED_LIBS "ON") +option(PARAVIEW_BUILD_SHARED_LIBS "Build ParaView with shared libraries" "${shared_default}") +set(BUILD_SHARED_LIBS "${PARAVIEW_BUILD_SHARED_LIBS}") +set(CMAKE_CXX_VISIBILITY_PRESET "hidden") +set(CMAKE_VISIBILITY_INLINES_HIDDEN 1) + +#------------------------------------------------------------------------------ +# Protect against a stampede of static links at the same time. +if (NOT PARAVIEW_BUILD_SHARED_LIBS) + set(pv_exe_job_link_pool static_exe_link) + set_property(GLOBAL APPEND PROPERTY + JOB_POOLS static_exe_link=1) +endif () + +#----------------------------------------------------------------------------- +# Does VTK require support for 64 bit file systems +include(CheckCXXSourceRuns) +file(READ "${vtk_cmake_dir}/vtkRequireLargeFilesSupport.cxx" + VTK_REQUIRE_LARGE_FILE_SUPPORT_FILE) +check_cxx_source_runs("${VTK_REQUIRE_LARGE_FILE_SUPPORT_FILE}" + CMAKE_REQUIRE_LARGE_FILE_SUPPORT "Support for 64 bit file systems") +set(VTK_REQUIRE_LARGE_FILE_SUPPORT ${CMAKE_REQUIRE_LARGE_FILE_SUPPORT}) + +#----------------------------------------------------------------------------- +# Provide compatibility options. +option(VTK_LEGACY_REMOVE "Remove all legacy code completely." OFF) +option(VTK_LEGACY_SILENT "Silence all legacy code messages." OFF) +mark_as_advanced(VTK_LEGACY_REMOVE VTK_LEGACY_SILENT) + +# Setup external data. this will automatically download the test data and +# baseline files to the build tree and set PARAVIEW_DATA_ROOT. +include(ParaViewExternalData) + +find_package(Git QUIET) +include(ParaViewDetermineVersion) + +#------------------------------------------------------------------------------ +# Setup ParaView Environment +#------------------------------------------------------------------------------ +# Determine ParaView Source Version +# Hardcoded version variables are readin from a separate file. This makes it +# easier to have a script to update version numbers automatically. +file(STRINGS version.txt version_txt) +extract_version_components("${version_txt}" "PARAVIEW") +determine_version("${CMAKE_CURRENT_SOURCE_DIR}" "${GIT_EXECUTABLE}" "PARAVIEW") + +# Setting this ensures that "make install" will leave rpaths to external +# libraries (not part of the build-tree e.g. Qt, ffmpeg, etc.) intact on +# "make install". This ensures that one can install a version of ParaView on the +# build machine without any issues. If this not desired, simply specify +# CMAKE_INSTALL_RPATH_USE_LINK_PATH when configuring Paraview and +# "make install" will strip all rpaths, which is default behavior. +if (NOT DEFINED CMAKE_INSTALL_RPATH_USE_LINK_PATH) + set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) +endif () + +include(CMakeDependentOption) +set(examples_default OFF) +if (DEFINED PARAVIEW_BUILD_EXAMPLES) + message(DEPRECATION + "PARAVIEW_BUILD_EXAMPLES has been renamed to PARAVIEW_ENABLE_EXAMPLES.") + # Use the old variable as the default for the new variable if present. + set(examples_default "${PARAVIEW_BUILD_EXAMPLES}") + # Remove the old setting from the cache and local scope. + unset(PARAVIEW_BUILD_EXAMPLES) + unset(PARAVIEW_BUILD_EXAMPLES CACHE) +endif () +option(PARAVIEW_ENABLE_EXAMPLES "Enable ParaView examples" "${examples_default}") +option(PARAVIEW_BUILD_DEVELOPER_DOCUMENTATION "Build ParaView C++/Python docs" OFF) +option(PARAVIEW_BUILD_QT_GUI "Enable ParaView Qt-based client" ON) +option(PARAVIEW_USE_MPI "Enable MPI support for parallel computing" OFF) +option(PARAVIEW_USE_VTKM "Enable VTK-m accelerated algorithms" ON) +set(raytracing_default OFF) +if (DEFINED PARAVIEW_USE_OSPRAY) + message(DEPRECATION + "PARAVIEW_USE_OSPRAY has been renamed to PARAVIEW_USE_RAYTRACING.") + set(raytracing_default "${PARAVIEW_USE_OSPRAY}") + unset(PARAVIEW_USE_OSPRAY) + unset(PARAVIEW_USE_OSPRAY CACHE) +endif () +option(PARAVIEW_USE_RAYTRACING "Build ParaView with OSPRay and/or OptiX ray Traced rendering" ${raytracing_default}) +option(PARAVIEW_ENABLE_LOGGING "Enable logging support." ON) +mark_as_advanced(PARAVIEW_ENABLE_LOGGING) +option(PARAVIEW_INSTALL_DEVELOPMENT_FILES "Install development files to the install tree" ON) +mark_as_advanced(PARAVIEW_INSTALL_DEVELOPMENT_FILES) +option(PARAVIEW_RELOCATABLE_INSTALL "Do not embed hard-coded paths into the install" ON) +mark_as_advanced(PARAVIEW_RELOCATABLE_INSTALL) + +option(PARAVIEW_ENABLE_PYTHON "Enable/Disable Python scripting support" OFF) + +set(paraview_web_default ON) +if (PARAVIEW_ENABLE_PYTHON AND WIN32) + include("${CMAKE_CURRENT_SOURCE_DIR}/VTK/CMake/FindPythonModules.cmake") + find_python_module(win32api have_pywin32) + set(paraview_web_default "${have_pywin32}") +endif () +# Add ability to freeze Python modules. +cmake_dependent_option(PARAVIEW_FREEZE_PYTHON + "Freeze Python packages/modules into the application." OFF + # FIXME(python): Freezing is not yet supported. + "PARAVIEW_ENABLE_PYTHON;NOT WIN32;NOT APPLE;FALSE" OFF) +mark_as_advanced(PARAVIEW_FREEZE_PYTHON) +cmake_dependent_option(PARAVIEW_ENABLE_WEB "Enable/Disable web support" "${paraview_web_default}" + "PARAVIEW_ENABLE_PYTHON" OFF) +mark_as_advanced(PARAVIEW_ENABLE_WEB) + +# NvPipe requires an NVIDIA GPU. +option(PARAVIEW_ENABLE_NVPIPE "Build ParaView with NvPipe remoting. Requires CUDA and an NVIDIA GPU" OFF) + +option(PARAVIEW_ENABLE_GDAL "Enable GDAL support." OFF) +mark_as_advanced(PARAVIEW_ENABLE_GDAL) +option(PARAVIEW_ENABLE_LAS "Enable LAS support." OFF) +mark_as_advanced(PARAVIEW_ENABLE_LAS) +option(PARAVIEW_ENABLE_OPENTURNS "Enable OpenTURNS support." OFF) +option(PARAVIEW_ENABLE_PDAL "Enable PDAL support." OFF) +mark_as_advanced(PARAVIEW_ENABLE_PDAL) +option(PARAVIEW_ENABLE_MOTIONFX "Enable MotionFX support." OFF) +mark_as_advanced(PARAVIEW_ENABLE_MOTIONFX) +option(PARAVIEW_ENABLE_MOMENTINVARIANTS "Enable MomentInvariants filters" OFF) +mark_as_advanced(PARAVIEW_ENABLE_MOMENTINVARIANTS) +option(PARAVIEW_ENABLE_VISITBRIDGE "Enable VisIt readers." OFF) +option(PARAVIEW_ENABLE_XDMF2 "Enable Xdmf2 support." ON) +mark_as_advanced(PARAVIEW_ENABLE_XDMF2) +option(PARAVIEW_ENABLE_XDMF3 "Enable Xdmf3 support." OFF) + +set(PARAVIEW_BUILD_TESTING "OFF" + CACHE STRING "Build module testing directories") +set_property(CACHE PARAVIEW_BUILD_TESTING + PROPERTY + STRINGS "ON;OFF;WANT") +set(BUILD_TESTING OFF) +if (PARAVIEW_BUILD_TESTING) + set(BUILD_TESTING ON) +endif () + +cmake_dependent_option(PARAVIEW_ENABLE_FFMPEG "Enable FFMPEG Support." OFF + "UNIX" OFF) + +cmake_dependent_option(PARAVIEW_USE_MPI_SSEND + "Use MPI synchronous-send commands for communication" OFF + "PARAVIEW_USE_MPI" OFF) +cmake_dependent_option(PARAVIEW_USE_ICE_T + "Enable IceT (needed for parallel rendering)" ON + "PARAVIEW_USE_MPI" OFF) +cmake_dependent_option(PARAVIEW_INITIALIZE_MPI_ON_CLIENT + "Initialize MPI on client-processes by default. Can be overridden using command line arguments" ON + "PARAVIEW_USE_MPI" OFF) +mark_as_advanced( + PARAVIEW_USE_ICE_T + PARAVIEW_USE_MPI_SSEND + PARAVIEW_INITIALIZE_MPI_ON_CLIENT) + +cmake_dependent_option(PARAVIEW_ENABLE_QT_SUPPORT + "Build ParaView with Qt support (without GUI)" OFF + "NOT PARAVIEW_BUILD_QT_GUI" ON) + +# Add an option to enable using Qt Webkit for widgets, as needed. +# Default is OFF. We don't want to depend on WebKit unless absolutely needed. +# FIXME: Move this to the module which cares. +cmake_dependent_option(PARAVIEW_USE_QTWEBENGINE + "Use Qt WebKit components as needed." OFF + "PARAVIEW_ENABLE_QT_SUPPORT" OFF) +mark_as_advanced(PARAVIEW_USE_QTWEBENGINE) + +# Add an option to enable using Qt Help, as needed. +# Default is ON to enable integrated help/documentation. +cmake_dependent_option(PARAVIEW_USE_QTHELP + "Use Qt Help infrastructure as needed." ON + "PARAVIEW_ENABLE_QT_SUPPORT" OFF) +mark_as_advanced(PARAVIEW_USE_QTHELP) + +# If PARAVIEW_BUILD_QT_GUI is OFF, provide an option to the user to turn other +# command line executables ON/OFF. +cmake_dependent_option(PARAVIEW_ENABLE_COMMANDLINE_TOOLS + "Build ParaView command-line tools" ON + "NOT PARAVIEW_BUILD_QT_GUI" ON) + +# If building on Unix with MPI enabled, we will present another option to +# enable building of CosmoTools VTK extensions. This option is by default +# OFF and set to OFF if ParaView is not built with MPI. +cmake_dependent_option(PARAVIEW_ENABLE_COSMOTOOLS + "Build ParaView with CosmoTools VTK Extensions" OFF + "UNIX;PARAVIEW_USE_MPI" OFF) +mark_as_advanced(PARAVIEW_ENABLE_COSMOTOOLS) + +option(PARAVIEW_ENABLE_CATALYST "Enable Catalyst CoProcessing modules" ON) +cmake_dependent_option(PARAVIEW_BUILD_CATALYST_ADAPTORS + "Build Adaptors for various simulation codes" OFF + # XXX: Adaptors need some work yet. + "FALSE;PARAVIEW_ENABLE_CATALYST;NOT WIN32" OFF) +mark_as_advanced(PARAVIEW_BUILD_CATALYST_ADAPTORS) + +# XXX(VTK): External VTK is not yet actually supported. +if (FALSE) +option(PARAVIEW_USE_EXTERNAL_VTK "Use an external VTK." OFF) +mark_as_advanced(PARAVIEW_USE_EXTERNAL_VTK) +else () +set(PARAVIEW_USE_EXTERNAL_VTK OFF) +endif () + +# Kits bundle multiple modules together into a single library, this +# is used to dramatically reduce the number of generated libraries. +option(PARAVIEW_ENABLE_KITS "Build ParaView using kits instead of modules." OFF) +mark_as_advanced(PARAVIEW_ENABLE_KITS) + +option(PARAVIEW_USE_EXTERNAL "Use external copies of third party libraries by default" OFF) +mark_as_advanced(PARAVIEW_USE_EXTERNAL) + +set(paraview_requested_modules) +set(paraview_rejected_modules) + +if (PARAVIEW_ENABLE_COMMANDLINE_TOOLS AND PARAVIEW_ENABLE_PYTHON) + list(APPEND paraview_requested_modules + VTK::PythonInterpreter) +endif () + +if (PARAVIEW_ENABLE_PYTHON) + set(PARAVIEW_PYTHON_VERSION "3" + CACHE STRING "") + set_property(CACHE PARAVIEW_PYTHON_VERSION + PROPERTY + STRINGS "2;3") + if (NOT PARAVIEW_PYTHON_VERSION STREQUAL "2" AND + NOT PARAVIEW_PYTHON_VERSION STREQUAL "3") + message(FATAL_ERROR + "`PARAVIEW_PYTHON_VERSION` must either be 2 or 3.") + endif () + set(VTK_PYTHON_VERSION "${PARAVIEW_PYTHON_VERSION}") + + list(APPEND paraview_requested_modules + ParaView::PythonAlgorithm + ParaView::PythonInitializer + ParaView::ClientServerCorePythonRendering + VTK::RenderingMatplotlib) +else () + list(APPEND paraview_rejected_modules + ParaView::PythonAlgorithm + ParaView::PythonInitializer + ParaView::ClientServerCorePythonRendering + VTK::RenderingMatplotlib) +endif () + +if (PARAVIEW_ENABLE_PYTHON) + list(APPEND paraview_requested_modules + ParaView::CinemaPython + ParaView::CinemaReader) +else () + list(APPEND paraview_rejected_modules + ParaView::CinemaPython + ParaView::CinemaReader) +endif() + +if (PARAVIEW_ENABLE_PYTHON AND PARAVIEW_BUILD_TESTING) + # testing needs Python interpreter i.e. `PYTHON_EXECUTABLE` without which + # our `find_python_module` checks to determine which tests to add or exclude + # will fail. We find it here. + find_package(PythonInterp "${PARAVIEW_PYTHON_VERSION}" QUIET) + mark_as_advanced(PYTHON_EXECUTABLE) +endif() + +if (PARAVIEW_BUILD_QT_GUI) + list(APPEND paraview_requested_modules + ParaView::pqApplicationComponents + ParaView::pqComponents + ParaView::pqCore) + if (PARAVIEW_ENABLE_PYTHON) + list(APPEND paraview_requested_modules + ParaView::pqPython) + endif () +else () + list(APPEND paraview_rejected_modules + ParaView::pqApplicationComponents + ParaView::pqComponents + ParaView::pqCore + ParaView::pqWidgets + ParaView::qttesting + VTK::GUISupportQt) +endif () + +if (PARAVIEW_USE_MPI) + list(APPEND paraview_requested_modules + VTK::FiltersParallelFlowPaths + VTK::FiltersParallelGeometry + VTK::FiltersParallelMPI + # Required because of ParaView::VTKExtensionsDefault having an optional dependency. + VTK::IOMPIImage + VTK::IOParallelLSDyna + VTK::IOParallelNetCDF + VTK::ParallelMPI + ParaView::VTKExtensionsDefaultParallel + ParaView::icet) + if (NOT WIN32) + list(APPEND paraview_requested_modules + VTK::FiltersParallelDIY2) + endif() +else () + list(APPEND paraview_rejected_modules + VTK::mpi) +endif () + +if (PARAVIEW_USE_MPI AND PARAVIEW_ENABLE_PYTHON) + list(APPEND paraview_requested_modules + VTK::ParallelMPI4Py) +else () + list(APPEND paraview_rejected_modules + VTK::ParallelMPI4Py) +endif() + +if (PARAVIEW_USE_VTKM) + list(APPEND paraview_requested_modules + VTK::AcceleratorsVTKm) +endif () + +if (PARAVIEW_USE_RAYTRACING) + list(APPEND paraview_requested_modules + VTK::RenderingRayTracing) +endif () + +if (PARAVIEW_ENABLE_NVPIPE) + list(APPEND paraview_requested_modules + ParaView::nvpipe) +else () + list(APPEND paraview_rejected_modules + ParaView::nvpipe) +endif () + +if (PARAVIEW_ENABLE_GDAL) + list(APPEND paraview_requested_modules + VTK::IOGDAL) +endif () + +if (PARAVIEW_ENABLE_LAS) + list(APPEND paraview_requested_modules + VTK::IOLAS) +endif () + +if (PARAVIEW_ENABLE_OPENTURNS) + list(APPEND paraview_requested_modules + VTK::FiltersOpenTURNS) +endif () + +if (PARAVIEW_ENABLE_PDAL) + list(APPEND paraview_requested_modules + VTK::IOPDAL) +endif () + +if (PARAVIEW_ENABLE_MOTIONFX) + list(APPEND paraview_requested_modules + VTK::IOMotionFX) +endif () + +set(use_vtk_remote_modules OFF) +if (PARAVIEW_ENABLE_MOMENTINVARIANTS) + list(APPEND paraview_requested_modules + VTK::MomentInvariants) + if (PARAVIEW_USE_MPI) + list(APPEND paraview_requested_modules + VTK::ParallelMomentInvariants) + endif() + set(use_vtk_remote_modules ON) +endif () + +if (PARAVIEW_ENABLE_VISITBRIDGE) + list(APPEND paraview_requested_modules + ParaView::IOVisItBridge + ParaView::VisItLib) +else () + list(APPEND paraview_rejected_modules + ParaView::IOVisItBridge + ParaView::VisItLib) +endif () + +if (PARAVIEW_ENABLE_XDMF2) + list(APPEND paraview_requested_modules + VTK::IOXdmf2) +endif () + +if (PARAVIEW_ENABLE_XDMF3) + list(APPEND paraview_requested_modules + VTK::IOXdmf3) +endif () + +if (PARAVIEW_ENABLE_FFMPEG) + list(APPEND paraview_requested_modules + VTK::IOFFMPEG) +endif () + +if (PARAVIEW_USE_ICE_T) + list(APPEND paraview_requested_modules + ParaView::icet) +endif () + +if (PARAVIEW_ENABLE_COSMOTOOLS) + list(APPEND paraview_requested_modules + ParaView::VTKExtensionsCosmoTools) +else () + list(APPEND paraview_rejected_modules + ParaView::VTKExtensionsCosmoTools) +endif () + +if (PARAVIEW_ENABLE_CATALYST) + list(APPEND paraview_requested_modules + ParaView::Catalyst) + + if (PARAVIEW_ENABLE_PYTHON) + list(APPEND paraview_requested_modules + ParaView::PythonCatalyst) + endif () + + if (BUILD_TESTING) + list(APPEND paraview_requested_modules + ParaView::CatalystTestDriver) + endif () + + # When Catalyst is enabled, Fortran is optionally needed. Hence we enable + # Fortran at the top level itself. When individual module called + # enable_language(...), it failed during first cmake configure but worked o + # subsequent. enable_language(... OPTIONAL) overcomes that issue altogether. + + if (NOT WIN32) + # Theoretically, CheckFortran should not be needed, but it + # enable_language(OPTIONAL) fails with Ninja generator. + include(CheckFortran) + check_fortran_support() + if (CMAKE_Fortran_COMPILER) + enable_language(Fortran OPTIONAL) + endif () + endif () +endif () + +if (PARAVIEW_BUILD_TESTING) + list(APPEND paraview_requested_modules + ParaView::smTestDriver) +endif () + +list(APPEND paraview_requested_modules + ParaView::Animation + ParaView::ProcessXML + ParaView::ServerManagerApplication + ParaView::ServerManagerDefault + ParaView::VTKExtensionsCGNSReader + ParaView::VTKExtensionsPoints + ParaView::WrapClientServer + VTK::FiltersFlowPaths + VTK::FiltersTexture + VTK::FiltersVerdict + VTK::IOAMR + VTK::IOAsynchronous # needed for cinema, but no harm adding always. + VTK::IOH5part + VTK::IOParallelLSDyna + VTK::IOSegY + VTK::IOTecplotTable + VTK::IOTRUCHAS + VTK::IOVeraOut + VTK::IOVPIC + ) + +if (PARAVIEW_ENABLE_WEB) + list(APPEND paraview_requested_modules + ParaView::PVWebCore + ParaView::PVWebPython + ParaView::PVWebExporter + VTK::WebCore + VTK::WebPython + ) + if (PARAVIEW_PYTHON_VERSION STREQUAL "2") + list(APPEND paraview_requested_modules + ParaView::PVWebPython2 + ) + else () + list(APPEND paraview_rejected_modules + ParaView::PVWebPython2 + ) + endif () +else() + list(APPEND paraview_rejected_modules + ParaView::PVWebCore + ParaView::PVWebPython + ParaView::PVWebPython2 + ParaView::PVWebExporter + VTK::WebCore + VTK::WebPython + ) +endif () + +if (paraview_requested_modules) + list(REMOVE_DUPLICATES paraview_requested_modules) +endif () + +option(PARAVIEW_BUILD_ALL_MODULES "Build all modules by default" OFF) +mark_as_advanced(PARAVIEW_BUILD_ALL_MODULES) + +if (PARAVIEW_USE_EXTERNAL_VTK) + find_package(VTK REQUIRED) +else () + list(APPEND CMAKE_MODULE_PATH + "${CMAKE_CURRENT_SOURCE_DIR}/VTK/CMake") + include(vtkCMakeBackports) + include(vtkModule) + include(vtkEncodeString) + include(vtkObjectFactory) + include(vtkExternalData) + include(vtkVersion) + set(VTK_VERSION + "${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}.${VTK_BUILD_VERSION}") + + if (PARAVIEW_ENABLE_PYTHON) + include(vtkModuleWrapPython) + endif () +endif () + +set_property(GLOBAL + PROPERTY + "_vtk_module_autoinit_include" "\"vtkAutoInit.h\"") + +# Note that the way that this flag gets used, it only has an effect on the +# initial configuration. +option(PARAVIEW_PLUGINS_DEFAULT "Default state for ParaView plugins" ON) +mark_as_advanced(PARAVIEW_PLUGINS_DEFAULT) +set(paraview_default_plugins + AcceleratedAlgorithms + AnalyzeNIfTIReaderWriter + ArrowGlyph + BagPlotViewsAndFilters + CDIReader + DigitalRockPhysics + EULATestPlugin + EmbossingRepresentations + EyeDomeLighting + ExplicitStructuredGrid + GenericIOReader + GeodesicMeasurement + GLTFReader + GMVReader + LagrangianParticleTracker + Moments + MooseXfemClip + NetCDFTimeAnnotationPlugin + NonOrthogonalSource + PacMan + PanoramicProjectionView + # ParFlow - Because of dependency to nlohmann_json + SLACTools + SierraPlotTools + StreamLinesRepresentation + StreamingParticles + SurfaceLIC + ThickenLayeredCells + VTKmFilters + pvblot) +foreach (paraview_default_plugin IN LISTS paraview_default_plugins) + set("_paraview_plugin_default_${paraview_default_plugin}" "${PARAVIEW_PLUGINS_DEFAULT}") +endforeach () + +set(paraview_plugin_directories + "${CMAKE_CURRENT_SOURCE_DIR}/Plugins") +paraview_plugin_find_plugins(paraview_plugin_files ${paraview_plugin_directories}) +paraview_plugin_scan( + PLUGIN_FILES ${paraview_plugin_files} + PROVIDES_PLUGINS paraview_plugins + REQUIRES_MODULES paraview_plugin_required_modules) + +set(_vtk_module_group_default_ParaViewCore "WANT") +set(_vtk_module_group_default_ParaViewRendering "WANT") + +set(paraview_source_directories + "${CMAKE_CURRENT_SOURCE_DIR}/CoProcessing" + "${CMAKE_CURRENT_SOURCE_DIR}/ParaViewCore" + "${CMAKE_CURRENT_SOURCE_DIR}/Qt" + "${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty" + "${CMAKE_CURRENT_SOURCE_DIR}/Utilities" + "${CMAKE_CURRENT_SOURCE_DIR}/Web") +vtk_module_find_modules(paraview_module_files ${paraview_source_directories}) +vtk_module_find_kits(paraview_kit_files ${paraview_source_directories}) +vtk_module_scan( + MODULE_FILES ${paraview_module_files} + KIT_FILES ${paraview_kit_files} + REQUEST_MODULES ${paraview_requested_modules} + ${paraview_plugin_required_modules} + REJECT_MODULES ${paraview_rejected_modules} + PROVIDES_MODULES paraview_modules + PROVIDES_KITS paraview_kits + REQUIRES_MODULES paraview_required_modules + UNRECOGNIZED_MODULES paraview_unrecognized_modules + WANT_BY_DEFAULT "${PARAVIEW_BUILD_ALL_MODULES}" + ENABLE_TESTS "${PARAVIEW_BUILD_TESTING}") + +set(paraview_unrecognized_paraview_modules) +foreach (paraview_module IN LISTS paraview_unrecognized_modules) + if (paraview_module MATCHES "ParaView::") + list(APPEND paraview_unrecognized_paraview_modules + "${paraview_module}") + endif () +endforeach () +if (paraview_unrecognized_paraview_modules) + message(FATAL_ERROR + "The following modules were requested or required, but not found: " + "${paraview_unrecognized_paraview_modules}.") +endif () + +option(PARAVIEW_VERSIONED_INSTALL "Install artifacts with versioned names." ON) +mark_as_advanced(PARAVIEW_VERSIONED_INSTALL) +set(paraview_version_suffix "") +if (PARAVIEW_VERSIONED_INSTALL) + set(paraview_version_suffix "-${PARAVIEW_VERSION_MAJOR}.${PARAVIEW_VERSION_MINOR}") +endif () + +set(paraview_cmake_destination + "${CMAKE_INSTALL_LIBDIR}/cmake/paraview${paraview_version_suffix}") + +set(PARAVIEW_CUSTOM_LIBRARY_SUFFIX "" + CACHE STRING "Custom library file name suffix (defaults to the version number)") +mark_as_advanced(PARAVIEW_CUSTOM_LIBRARY_SUFFIX) +if (PARAVIEW_CUSTOM_LIBRARY_SUFFIX STREQUAL "") + if (PARAVIEW_VERSIONED_INSTALL) + set(PARAVIEW_CUSTOM_LIBRARY_SUFFIX "pv${PARAVIEW_VERSION_MAJOR}.${PARAVIEW_VERSION_MINOR}") + else () + set(PARAVIEW_CUSTOM_LIBRARY_SUFFIX "") + endif () +endif () + +# Search for dependent libraries beside +set(_paraview_CMAKE_INSTALL_RPATH_save + "${CMAKE_INSTALL_RPATH}") +list(APPEND CMAKE_INSTALL_RPATH + "$ORIGIN") + +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}.") + endif () + + if (PARAVIEW_ENABLE_PYTHON) + find_package("Python${PARAVIEW_PYTHON_VERSION}" QUIET REQUIRED COMPONENTS Interpreter) + set(PYTHON_VERSION_MAJOR "${Python${PARAVIEW_PYTHON_VERSION}_VERSION_MAJOR}") + set(PYTHON_VERSION_MINOR "${Python${PARAVIEW_PYTHON_VERSION}_VERSION_MINOR}") + if (NOT PARAVIEW_PYTHON_SITE_PACKAGES_SUFFIX) + vtk_module_python_default_destination(PARAVIEW_PYTHON_SITE_PACKAGES_SUFFIX) + endif () + endif () +else () + set(vtk_requested_modules) + foreach (vtk_module IN LISTS paraview_requested_modules paraview_plugin_required_modules) + if (vtk_module MATCHES "ParaView::") + continue () + endif () + list(APPEND vtk_requested_modules + "${vtk_module}") + endforeach () + set(vtk_rejected_modules) + foreach (vtk_module IN LISTS paraview_rejected_modules) + if (vtk_module MATCHES "ParaView::") + continue () + endif () + list(APPEND vtk_rejected_modules + "${vtk_module}") + endforeach () + + cmake_dependent_option(PARAVIEW_BUILD_VTK_TESTING "" OFF + "PARAVIEW_BUILD_TESTING" OFF) + set(vtk_enable_tests "OFF") + if (PARAVIEW_BUILD_VTK_TESTING) + set(vtk_enable_tests "${PARAVIEW_BUILD_TESTING}") + # Needed for `rtImageTest.py` tests to work. See note in `vtkModuleTesting` + # about this. + set(VTK_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/VTK") + endif () + + # Forward Python option to VTK. + set(VTK_WRAP_PYTHON "${PARAVIEW_ENABLE_PYTHON}") + + # Forward MPI option to VTK. + set(VTK_USE_MPI "${PARAVIEW_USE_MPI}") + + # Forward logging option to VTK. + set(VTK_ENABLE_LOGGING "${PARAVIEW_ENABLE_LOGGING}") + if (PARAVIEW_ENABLE_LOGGING) + list(APPEND vtk_requested_modules VTK::loguru) + endif() + + if (use_vtk_remote_modules) + if (PARAVIEW_ENABLE_MOMENTINVARIANTS) + set(VTK_MODULE_ENABLE_VTK_MomentInvariants WANT) + endif() + # include the Remote module + include("${CMAKE_CURRENT_SOURCE_DIR}/VTK/CMake/vtkDownload.cmake") + # TODO: remove this after changing in vtkModuleRemote.cmake:160 + # "${VTK_SOURCE_DIR}/Remote/${_name}" to "${CMAKE_CURRENT_LIST_DIR}/${_name}" + set(VTK_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/VTK") + add_subdirectory(VTK/Remote) + endif() + + vtk_module_find_modules(vtk_module_files "${CMAKE_CURRENT_SOURCE_DIR}/VTK") + vtk_module_find_kits(vtk_kit_files "${CMAKE_CURRENT_SOURCE_DIR}/VTK") + vtk_module_scan( + MODULE_FILES ${vtk_module_files} + KIT_FILES ${vtk_kit_files} + REQUEST_MODULES ${vtk_requested_modules} + ${paraview_required_modules} + REJECT_MODULES ${vtk_rejected_modules} + PROVIDES_MODULES vtk_modules + PROVIDES_KITS vtk_kits + REQUIRES_MODULES vtk_required_modules + UNRECOGNIZED_MODULES vtk_unrecognized_modules + WANT_BY_DEFAULT OFF + ENABLE_TESTS "${vtk_enable_tests}" + HIDE_MODULES_FROM_CACHE ON) + + if (vtk_required_modules OR vtk_unrecognized_modules) + message(FATAL_ERROR + "The following modules were requested or required, but not found: " + "${vtk_required_modules};${vtk_unrecognized_modules}.") + endif () + + if (PARAVIEW_ENABLE_PYTHON) + find_package("Python${PARAVIEW_PYTHON_VERSION}" QUIET REQUIRED COMPONENTS Interpreter) + set(PYTHON_VERSION_MAJOR "${Python${PARAVIEW_PYTHON_VERSION}_VERSION_MAJOR}") + set(PYTHON_VERSION_MINOR "${Python${PARAVIEW_PYTHON_VERSION}_VERSION_MINOR}") + if (NOT PARAVIEW_PYTHON_SITE_PACKAGES_SUFFIX) + vtk_module_python_default_destination(PARAVIEW_PYTHON_SITE_PACKAGES_SUFFIX) + endif () + set(VTK_PYTHON_SITE_PACKAGES_SUFFIX "${PARAVIEW_PYTHON_SITE_PACKAGES_SUFFIX}") + endif () + + set(VTK_BUILD_QT_DESIGNER_PLUGIN OFF) + set(VTK_INSTALL_PYTHON_EXES OFF) + + cmake_dependent_option(VTK_NO_PYTHON_THREADS "Disable Python Threads support" ON + "PARAVIEW_ENABLE_PYTHON" OFF) + mark_as_advanced(VTK_NO_PYTHON_THREADS) + cmake_dependent_option(VTK_PYTHON_FULL_THREADSAFE "Wrap all Python calls with the GIL" ON + "NOT VTK_NO_PYTHON_THREADS" OFF) + mark_as_advanced(VTK_PYTHON_FULL_THREADSAFE) + cmake_dependent_option(VTK_USE_TK "Build VTK with Tk support" OFF + "PARAVIEW_ENABLE_PYTHON" OFF) + + vtk_module_build( + MODULES ${vtk_modules} + KITS ${vtk_kits} + PACKAGE VTK + INSTALL_EXPORT VTK + HEADERS_DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/paraview${paraview_version_suffix}" + CMAKE_DESTINATION "${paraview_cmake_destination}/vtk" + HIERARCHY_DESTINATION "${CMAKE_INSTALL_LIBDIR}/vtk/hierarchy/${CMAKE_PROJECT_NAME}" + LIBRARY_NAME_SUFFIX "${PARAVIEW_CUSTOM_LIBRARY_SUFFIX}" + VERSION "${PARAVIEW_VERSION}" + SOVERSION "1" + TEST_DATA_TARGET ParaViewData + BUILD_WITH_KITS "${PARAVIEW_ENABLE_KITS}" + USE_EXTERNAL "${PARAVIEW_USE_EXTERNAL}" + TEST_INPUT_DATA_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/VTK/Testing" + TEST_OUTPUT_DATA_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/ExternalData/VTK/Testing") + + if (NOT PARAVIEW_USE_EXTERNAL_VTK) + set(vtk_cmake_dir + "${CMAKE_CURRENT_SOURCE_DIR}/VTK/CMake") + set(vtk_cmake_destination + "${paraview_cmake_destination}/vtk") + set(vtk_cmake_build_dir + "${CMAKE_CURRENT_BINARY_DIR}/${vtk_cmake_destination}") + set(VTK_RELOCATABLE_INSTALL + "${PARAVIEW_RELOCATABLE_INSTALL}") + include("${CMAKE_CURRENT_SOURCE_DIR}/VTK/CMake/vtkInstallCMakePackage.cmake") + endif () +endif () + +set(paraview_test_data_directory_input + "${CMAKE_CURRENT_SOURCE_DIR}/Testing") +set(paraview_test_data_directory_output + "${CMAKE_CURRENT_BINARY_DIR}/ExternalData") +set(_paraview_add_tests_default_data_directory + "${paraview_test_data_directory_output}") +set(_paraview_add_tests_default_test_data_target + "ParaViewData") + +vtk_module_build( + MODULES ${paraview_modules} + KITS ${paraview_kits} + INSTALL_EXPORT ParaView + HEADERS_DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/paraview${paraview_version_suffix}" + CMAKE_DESTINATION "${paraview_cmake_destination}" + HIERARCHY_DESTINATION "${CMAKE_INSTALL_LIBDIR}/vtk/hierarchy/${CMAKE_PROJECT_NAME}" + LIBRARY_NAME_SUFFIX "${PARAVIEW_CUSTOM_LIBRARY_SUFFIX}" + VERSION "${PARAVIEW_VERSION}" + SOVERSION "1" + TEST_DATA_TARGET ParaViewData + BUILD_WITH_KITS "${PARAVIEW_ENABLE_KITS}" + USE_EXTERNAL "${PARAVIEW_USE_EXTERNAL}" + TEST_INPUT_DATA_DIRECTORY "${paraview_test_data_directory_input}" + TEST_OUTPUT_DATA_DIRECTORY "${paraview_test_data_directory_output}") + +include(vtkModuleJson) +vtk_module_json( + MODULES "${vtk_modules}" + OUTPUT "vtk-modules.json") +vtk_module_json( + MODULES "${paraview_modules}" + OUTPUT "paraview-modules.json") + +paraview_plugin_build( + RUNTIME_DESTINATION "${CMAKE_INSTALL_BINDIR}" + LIBRARY_DESTINATION "${CMAKE_INSTALL_LIBDIR}" + LIBRARY_SUBDIRECTORY "paraview${paraview_version_suffix}/plugins" + PLUGINS_FILE_NAME ".plugins" + TARGET paraview_plugins + PLUGINS ${paraview_plugins}) + +set(CMAKE_INSTALL_RPATH + "${_paraview_CMAKE_INSTALL_RPATH_save}") + +vtk_module_wrap_client_server( + MODULES ${paraview_modules} + ${vtk_modules} + TARGET paraview_client_server + INSTALL_EXPORT ParaView) + +paraview_server_manager_process( + MODULES ${paraview_modules} + ${vtk_modules} + TARGET paraview_server_manager + XML_FILES paraview_server_manager_files + INSTALL_EXPORT ParaView) + +if (PARAVIEW_ENABLE_PYTHON) + if (PARAVIEW_USE_EXTERNAL_VTK) + # TODO: Check if VTK is already wrapped in Python. + # Error out? + else () + vtk_module_wrap_python( + MODULES ${vtk_modules} + INSTALL_EXPORT VTKPython + PYTHON_PACKAGE "vtkmodules" + MODULE_DESTINATION "${PARAVIEW_PYTHON_SITE_PACKAGES_SUFFIX}" + CMAKE_DESTINATION "${paraview_cmake_destination}/vtk" + LIBRARY_DESTINATION "${CMAKE_INSTALL_LIBDIR}" + WRAPPED_MODULES vtk_python_wrapped_modules + TARGET VTK::vtkpythonmodules) + + add_subdirectory(VTK/Wrapping/Python) + + export( + EXPORT VTKPython + NAMESPACE VTK:: + FILE "${CMAKE_BINARY_DIR}/${paraview_cmake_destination}/vtk/VTKPython-targets.cmake") + install( + EXPORT VTKPython + NAMESPACE VTK:: + FILE VTKPython-targets.cmake + DESTINATION "${paraview_cmake_destination}/vtk" + COMPONENT "development") + endif () + + get_property(vtk_required_python_modules GLOBAL + PROPERTY vtk_required_python_modules) + if (vtk_required_python_modules) + list(REMOVE_DUPLICATES vtk_required_python_modules) + endif () + string(REPLACE ";" "\n" vtk_required_python_modules "${vtk_required_python_modules}") + file(WRITE "${CMAKE_BINARY_DIR}/requirements.txt" + "${vtk_required_python_modules}\n") + + vtk_module_wrap_python( + MODULES ${paraview_modules} + INSTALL_EXPORT ParaViewPython + PYTHON_PACKAGE "paraview.modules" + MODULE_DESTINATION "${PARAVIEW_PYTHON_SITE_PACKAGES_SUFFIX}" + CMAKE_DESTINATION "${paraview_cmake_destination}" + LIBRARY_DESTINATION "${CMAKE_INSTALL_LIBDIR}" + WRAPPED_MODULES paraview_python_wrapped_modules + TARGET ParaView::pvpythonmodules) + + export( + EXPORT ParaViewPython + NAMESPACE ParaView:: + FILE "${CMAKE_BINARY_DIR}/${paraview_cmake_destination}/ParaViewPython-targets.cmake") + install( + EXPORT ParaViewPython + NAMESPACE ParaView:: + FILE ParaViewPython-targets.cmake + DESTINATION "${paraview_cmake_destination}" + COMPONENT "development") +endif () + +if (PARAVIEW_ENABLE_WEB) + configure_file( + "${CMAKE_CURRENT_SOURCE_DIR}/Web/package.json.in" + "${CMAKE_CURRENT_BINARY_DIR}/package.json" + @ONLY) +endif () + +if (PARAVIEW_ENABLE_COMMANDLINE_TOOLS) + add_subdirectory(CommandLineExecutables) +endif () +add_subdirectory(Applications) + +if (PARAVIEW_ENABLE_PYTHON) + add_subdirectory(Wrapping/Python) +endif () + +if (NOT PARAVIEW_USE_EXTERNAL_VTK) + # Configure the CTestCustom.cmake file for exclusions. + configure_file( + "${CMAKE_CURRENT_SOURCE_DIR}/VTK/CMake/CTestCustom.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/VTK/CTestCustom.cmake" + @ONLY) +endif () + +# Configure the CTestCustom.cmake file for exclusions. +configure_file( + "${paraview_cmake_dir}/CTestCustom.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/CTestCustom.cmake" + @ONLY) + +ExternalData_Add_Target(ParaViewData) + +set(paraview_cmake_build_dir + "${CMAKE_CURRENT_BINARY_DIR}/${paraview_cmake_destination}") +include("${CMAKE_CURRENT_SOURCE_DIR}/CMake/ParaViewInstallCMakePackage.cmake") + +set(is_git FALSE) +if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git") + set(is_git TRUE) +endif () + +if (NOT WIN32 AND is_git AND Git_FOUND AND NOT GIT_VERSION_STRING VERSION_LESS "2.18.0") + set(source_all) + if (PARAVIEW_SOURCE_TARBALL_TARGETS) + set(source_all ALL) + endif () + + add_custom_target(paraview-source ${source_all}) + foreach (format tgz txz zip) + add_custom_target("paraview-source-${format}" ${source_all} + COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/Utilities/Maintenance/create_tarballs.bash" + "--${format}" + WORKING_DIRECTORY + "${CMAKE_CURRENT_BINARY_DIR}" + COMMENT "Creating source tarball in ${format} format") + add_dependencies("paraview-source-${format}" + ParaViewData) + add_dependencies(paraview-source + "paraview-source-${format}") + endforeach () + # This is a hack. Git version 2.17 does NOT like running these in parallel and + # reports that a lockfile is already locked. In order for the build to succeed, + # force these to run in serial. + add_dependencies(paraview-source-tgz paraview-source-txz) + add_dependencies(paraview-source-txz paraview-source-zip) +endif () + +# This is the directory under which all generated docs, such as Doxygen and +# Sphinx generated docs, are placed. +if (NOT PARAVIEW_GENERATED_DOCUMENTATION_OUTPUT_DIRECTORY) + set(PARAVIEW_GENERATED_DOCUMENTATION_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/doc") +endif () + +#----------------------------------------------------------------------------- +# Build doxygen documentation. +if (PARAVIEW_BUILD_DEVELOPER_DOCUMENTATION) + add_subdirectory(Utilities/Doxygen) + add_subdirectory(Utilities/Sphinx) + add_subdirectory(Documentation) +endif() + +#------------------------------------------------------------------------------ +# Test to check install tree +#------------------------------------------------------------------------------ +if (BUILD_TESTING AND PARAVIEW_INSTALL_DEVELOPMENT_FILES) + add_test( NAME pv.TestDevelopmentInstall + COMMAND ${CMAKE_COMMAND} + -DPARAVIEW_BINARY_DIR:PATH=${CMAKE_BINARY_DIR} + -DPARAVIEW_INSTALL_DIR:PATH=${CMAKE_INSTALL_PREFIX} + -DPARAVIEW_SOURCE_DIR:PATH=${CMAKE_SOURCE_DIR} + -DPARAVIEW_TEST_DIR:PATH=${CMAKE_BINARY_DIR}/Testing/Temporary + -DPARAVIEW_CMAKE_DESTINATION:STRING=${paraview_cmake_destination} + -DCMAKE_GENERATOR:STRING=${CMAKE_GENERATOR} + -DCMAKE_GENERATOR_PLATFORM:STRING=${CMAKE_GENERATOR_PLATFORM} + -DCMAKE_GENERATOR_TOOLSET:STRING=${CMAKE_GENERATOR_TOOLSET} + -P ${CMAKE_CURRENT_SOURCE_DIR}/CMake/ParaViewTestInstall.cmake) + set_tests_properties(pv.TestDevelopmentInstall PROPERTIES + LABELS "paraview" + ENVIRONMENT "DESTDIR=${CMAKE_BINARY_DIR}/test-install") +endif() +#------------------------------------------------------------------------------ + +#------------------------------------------------------------------------------ +# Test to check that we can process all of the Catalyst editions +#------------------------------------------------------------------------------ +if (BUILD_TESTING AND PARAVIEW_ENABLE_PYTHON AND UNIX AND NOT APPLE) +if (FALSE) # XXX(FIXME) + # disabling till we Catalyst editions are fixed post modularization + add_test( NAME GenerateCatalystEditions + COMMAND ${CMAKE_COMMAND} + -DPYTHON_EXECUTABLE:FILEPATH=${PYTHON_EXECUTABLE} + -DPARAVIEW_SOURCE_DIR:PATH=${CMAKE_SOURCE_DIR} + -DPARAVIEW_TEST_DIR:PATH=${CMAKE_BINARY_DIR}/Testing/Temporary + -P ${CMAKE_SOURCE_DIR}/CMake/ParaViewTestCatalystCodeGeneration.cmake) + set_tests_properties(GenerateCatalystEditions PROPERTIES + LABELS "paraview;catalyst") +endif() +endif() +#------------------------------------------------------------------------------ + +#----------------------------------------------------------------------------- +if (PARAVIEW_BUILD_CATALYST_ADAPTORS) + # BuildAdaptors.cmake builds the adaptors as a separate project. We mark is + # OPTIONAL for Catalyst packages that don't have the adaptors included. + include(${CMAKE_CURRENT_SOURCE_DIR}/CoProcessing/Adaptors/BuildAdaptors.cmake + OPTIONAL) +endif() + +#----------------------------------------------------------------------------- +if (PARAVIEW_ENABLE_EXAMPLES) + add_subdirectory(Examples) +endif () diff --git a/ports/paraview/portfile.cmake b/ports/paraview/portfile.cmake index fe68d558ec716c..8e57546b8a747c 100644 --- a/ports/paraview/portfile.cmake +++ b/ports/paraview/portfile.cmake @@ -60,10 +60,7 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA # Disable this option if project cannot be built with Ninja OPTIONS - -DCMAKE_MODULE_PATH:PATH=${CURRENT_INSTALLED_DIR}/share -DPARAVIEW_USE_EXTERNAL:BOOL=ON - -DVTK_MODULES_DIR:PATH=${CURRENT_INSTALLED_DIR}/share/vtk/Modules - -DVTK_INSTALL_PACKAGE_DIR:PATH= -DUSE_EXTERNAL_VTK:BOOL=ON -DVTK_USE_SYSTEM_PROTOBUF:BOOL=ON -DVTK_USE_SYSTEM_CGNS:BOOL=ON @@ -72,6 +69,8 @@ vcpkg_configure_cmake( -DVTK_MODULE_ENABLE_vtkIOParallelExodus:BOOL=OFF -DVTK_MODULE_ENABLE_vtkRenderingParallel:BOOL=OFF -DVTK_ENABLE_KITS:BOOL=ON + -DPARAVIEW_ENABLE_VISITBRIDGE:BOOL=OFF + -DPARAVIEW_ENABLE_CATALYST:BOOL=OFF # OPTIONS_RELEASE -DOPTIMIZE=1 # OPTIONS_DEBUG -DDEBUGGABLE=1 ) From 1900de98e43e10f27e24e567bb46acb1b82136dc Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sun, 8 Dec 2019 22:07:08 +0100 Subject: [PATCH 035/419] fix cgns hdf5 definitions by using the correct dll define --- ports/cgns/hdf5.patch | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/ports/cgns/hdf5.patch b/ports/cgns/hdf5.patch index 62ecd57f629529..4de9ee35ba031a 100644 --- a/ports/cgns/hdf5.patch +++ b/ports/cgns/hdf5.patch @@ -84,3 +84,25 @@ index 58f078fe7..46446da8a 100644 if (HDF5_FOUND) set (HDF5_HAVE_H5PUBCONF_H 1) set (HDF5_HAVE_HDF5 1) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 66b547ed1..4051f07d4 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -12,13 +12,14 @@ include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}) + if (CGNS_ENABLE_HDF5) + add_definitions(-DBUILD_HDF5) + if (WIN32) +- if (HDF5_LIBRARY) ++ add_definitions(-DWIN32) ++ if (HDF5_BUILD_SHARED_LIBS) + # file(STRINGS ${HDF5_LIBRARY} HDF5isDLL REGEX "__imp__H5close") + # if (HDF5isDLL) + # this is only needed when using hdf5 dll libs +- add_definitions(-DWIN32 -D_HDF5USEDLL_) ++ add_definitions(-DH5_BUILT_AS_DYNAMIC_LIB) + # endif (HDF5isDLL) +- endif (HDF5_LIBRARY) ++ endif (HDF5_BUILD_SHARED_LIBS) + endif (WIN32) + if(HDF5_NEED_MPI AND MPI_INC) + include_directories(${MPI_INC}) From 1001c94c62f29963c673d892733656372635b812 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sun, 8 Dec 2019 22:07:25 +0100 Subject: [PATCH 036/419] trying to make paraview work --- ports/paraview/CONTROL | 4 +- ports/paraview/paraview.patch | 120 ++++++++++++++++++++++++++++++++++ ports/paraview/portfile.cmake | 52 +++++++++++---- 3 files changed, 160 insertions(+), 16 deletions(-) create mode 100644 ports/paraview/paraview.patch diff --git a/ports/paraview/CONTROL b/ports/paraview/CONTROL index 89be05c8911945..b905c35127e41a 100644 --- a/ports/paraview/CONTROL +++ b/ports/paraview/CONTROL @@ -1,8 +1,8 @@ Source: paraview -Version: 5.6.3 +Version: 5.7.0 Homepage: https://www.paraview.org/ Description: VTK-based Data Analysis and Visualization Application -Build-Depends: vtk[paraview], protobuf +Build-Depends: vtk[paraview], protobuf, boost-core, boost-format, boost-algorithm Default-Features: Feature: all_modules diff --git a/ports/paraview/paraview.patch b/ports/paraview/paraview.patch new file mode 100644 index 00000000000000..a1056a326840fb --- /dev/null +++ b/ports/paraview/paraview.patch @@ -0,0 +1,120 @@ +diff --git a/CMake/ParaViewClient.cmake b/CMake/ParaViewClient.cmake +index 0333d354b..c348a674d 100644 +--- a/CMake/ParaViewClient.cmake ++++ b/CMake/ParaViewClient.cmake +@@ -456,10 +456,12 @@ function (paraview_client_documentation) + endif () + + include("${_ParaViewClient_cmake_dir}/paraview-find-package-helpers.cmake" OPTIONAL) ++ message(STATUS "Qt5DIR:${Qt5_DIR}") + find_program(qt_xmlpatterns_executable + NAMES xmlpatterns-qt5 xmlpatterns + HINTS "${Qt5_DIR}/../../../bin" + "${Qt5_DIR}/../../../libexec/qt5/bin" ++ "${Qt5_DIR}/../../../tools/qt5-xmlpatterns/bin" + DOC "Path to xmlpatterns") + mark_as_advanced(qt_xmlpatterns_executable) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 588da1883..28af52f7a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -72,7 +72,9 @@ if (NOT CMAKE_ARCHIVE_OUTPUT_DIRECTORY) + endif () + + set(paraview_cmake_dir "${CMAKE_CURRENT_SOURCE_DIR}/CMake") +-set(vtk_cmake_dir "${CMAKE_CURRENT_SOURCE_DIR}/VTK/CMake") ++set(vtk_cmake_dir "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/share/vtk") ++string(REPLACE "/debug" "" vtk_cmake_dir "${vtk_cmake_dir}") ++message(STATUS "${vtk_cmake_dir}") + list(APPEND CMAKE_MODULE_PATH + "${paraview_cmake_dir}" + "${vtk_cmake_dir}") +@@ -187,7 +189,7 @@ option(PARAVIEW_ENABLE_PYTHON "Enable/Disable Python scripting support" OFF) + + set(paraview_web_default ON) + if (PARAVIEW_ENABLE_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 () +@@ -288,7 +290,7 @@ cmake_dependent_option(PARAVIEW_BUILD_CATALYST_ADAPTORS + mark_as_advanced(PARAVIEW_BUILD_CATALYST_ADAPTORS) + + # 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 () +@@ -373,7 +375,7 @@ else () + ParaView::qttesting + VTK::GUISupportQt) + endif () +- ++message(STATUS "MPI:${PARAVIEW_USE_MPI}") + if (PARAVIEW_USE_MPI) + list(APPEND paraview_requested_modules + VTK::FiltersParallelFlowPaths +@@ -721,12 +723,41 @@ set(_paraview_CMAKE_INSTALL_RPATH_save + "${CMAKE_INSTALL_RPATH}") + list(APPEND CMAKE_INSTALL_RPATH + "$ORIGIN") +- ++message(STATUS EXTERNALVTK?:${PARAVIEW_USE_EXTERNAL_VTK}) + 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}.") ++ message(STATUS "REQUIRED:${paraview_required_modules}") ++ foreach(mod ${paraview_required_modules}) ++ if(NOT TARGET ${mod}) ++ message(STATUS "REQUIRED TARGET not defined: ${mod}") ++ list(APPEND modules_notarget ${mod}) ++ endif() ++ endforeach() ++ foreach(mod ${paraview_unrecognized_modules}) ++ if(NOT TARGET ${mod}) ++ message(STATUS "UNREC TARGET not defined: ${mod}") ++ list(FIND paraview_rejected_modules ${mod} _found_mod) ++ if(_found_mod GREATER 0) ++ message(STATUS "MODULE ${mod} not necessary; Removing from unrecognized") ++ list(APPEND _to_remove ${mod}) ++ endif() ++ else() ++ list(APPEND _to_remove ${mod}) ++ endif() ++ endforeach() ++ message(STATUS "UNRECOGNIZED:${paraview_unrecognized_modules}") ++ list(REMOVE_ITEM paraview_unrecognized_modules ${_to_remove}) ++ message(STATUS "REJECTED MODULES: ${paraview_rejected_modules}") ++ message(STATUS "UNRECOGNIZED WITHOUT REJECTED AND KNOWN TARGETS (should be empty): ${paraview_unrecognized_modules}") ++ message(STATUS "ALL PROVIDED MODULES: ${paraview_modules}") ++ set(_unnecessary_moduls ${paraview_modules}) ++ list(REMOVE_ITEM _unnecessary_moduls ${paraview_required_modules}) ++ message(STATUS "Unnecessary MODULES: ${_unnecessary_moduls}") ++ if(paraview_unrecognized_modules OR modules_notarget) ++ message(FATAL_ERROR ++ "The following modules were requested or required, but not found: " ++ "${modules_notarget};${paraview_unrecognized_modules}.") ++ endif() + endif () + + if (PARAVIEW_ENABLE_PYTHON) +@@ -887,11 +918,13 @@ vtk_module_build( + USE_EXTERNAL "${PARAVIEW_USE_EXTERNAL}" + TEST_INPUT_DATA_DIRECTORY "${paraview_test_data_directory_input}" + TEST_OUTPUT_DATA_DIRECTORY "${paraview_test_data_directory_output}") +- ++message(STATUS "VTKMOD:${vtk_modules}") + include(vtkModuleJson) ++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 8e57546b8a747c..5459dfc5f07aff 100644 --- a/ports/paraview/portfile.cmake +++ b/ports/paraview/portfile.cmake @@ -38,11 +38,31 @@ vcpkg_from_github( SHA512 df3490c463c96e2b7445e416067f0be469eca86ee655690fd8acdbcda8189c192909981dbb36b043d0e7ccd06f9eb6cf0a2c25a48d23d92c47b061a6ee39b2db HEAD_REF master PATCHES - #FindPythonModule.patch + paraview.patch ) +#Get VisItBridge Plugin +vcpkg_from_gitlab( + OUT_SOURCE_PATH VISITIT_SOURCE_PATH + GITLAB_URL https://gitlab.kitware.com/ + REPO paraview/visitbridge + REF 4e5fd802e83fcc8601b7a75d318ac277514cb736 + SHA512 49ab6e32051a9cb328f5694bca7445610d80bdedddc7ac3d48970f57be1c5969578a0501b12f48a2fb332f109f79f8df189e78530bb4af75e73b0d48d7124884 +) +#Get QtTesting Plugin +vcpkg_from_gitlab( + OUT_SOURCE_PATH QTTESTING_SOURCE_PATH + GITLAB_URL https://gitlab.kitware.com/ + REPO paraview/qttesting + REF a17c15627db0852242d83460e032a021571669df + SHA512 34ad7c97720366dd66c011aecbaf7103ebcc128223673140d42db32c6eb419c805da204ac9afe73dae4c9b2ef9acfc4ec1b927271351fde51c9df7c44d09bf6e +) + +#file(REMOVE_RECURSE ${SOURCE_PATH}/Utilities/VisItBridge) +file(COPY ${VISITIT_SOURCE_PATH}/ DESTINATION ${SOURCE_PATH}/Utilities/VisItBridge) +file(COPY ${QTTESTING_SOURCE_PATH}/ DESTINATION ${SOURCE_PATH}/ThirdParty/QtTesting/vtkqttesting) #file(REMOVE_RECURSE ${SOURCE_PATH}/ThirdPary/protobuf/vtkprotobuf) -file(REMOVE_RECURSE "${SOURCE_PATH}/ThirdParty/QtTesting") +#file(REMOVE_RECURSE "${SOURCE_PATH}/ThirdParty/QtTesting") # # Check if one or more features are a part of a package installation. # # See /docs/maintainers/vcpkg_check_features.md for more details # vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -55,29 +75,33 @@ file(REMOVE_RECURSE "${SOURCE_PATH}/ThirdParty/QtTesting") vcpkg_find_acquire_program(PYTHON3) get_filename_component(PYTHON3_EXE_PATH ${PYTHON3} DIRECTORY) vcpkg_add_to_path(PREPEND "${PYTHON3_EXE_PATH}") - + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA # Disable this option if project cannot be built with Ninja OPTIONS -DPARAVIEW_USE_EXTERNAL:BOOL=ON - -DUSE_EXTERNAL_VTK:BOOL=ON - -DVTK_USE_SYSTEM_PROTOBUF:BOOL=ON - -DVTK_USE_SYSTEM_CGNS:BOOL=ON - -DPARAVIEW_USE_VTKM:BOOL=OFF # VTK-m port is missing - -DVTK_MODULE_ENABLE_vtkqttesting:BOOL=OFF - -DVTK_MODULE_ENABLE_vtkIOParallelExodus:BOOL=OFF - -DVTK_MODULE_ENABLE_vtkRenderingParallel:BOOL=OFF - -DVTK_ENABLE_KITS:BOOL=ON - -DPARAVIEW_ENABLE_VISITBRIDGE:BOOL=OFF - -DPARAVIEW_ENABLE_CATALYST:BOOL=OFF + -DPARAVIEW_USE_EXTERNAL_VTK:BOOL=ON + #-DVTK_USE_SYSTEM_PROTOBUF:BOOL=ON + #-DVTK_USE_SYSTEM_CGNS:BOOL=ON + -DPARAVIEW_USE_VTKM:BOOL=ON # VTK-m port is missing but this is a requirement to build VisItLib + -DPARAVIEW_ENABLE_VISITBRIDGE:BOOL=ON + -DPARAVIEW_ENABLE_CATALYST:BOOL=ON + -DVTK_MODULE_ENABLE_ParaView_qttesting=YES + -DPARAVIEW_ENABLE_EMBEDDED_DOCUMENTATION=OFF + -DPARAVIEW_USE_QTHELP=OFF + -DBoost_INCLUDE_DIR:PATH="${CURRENT_INSTALLED_DIR}/include" + -DHAVE_SYS_TYPES_H=0 ## For some strange reason the test first succeeds and then fails the second time around + -DWORDS_BIGENDIAN=0 ## Tests fails in VisItCommon.cmake for some unknown reason this is just a workaround since most systems are little endian. + #-DPARAVIEW_ENABLE_FFMPEG:BOOL=OFF # OPTIONS_RELEASE -DOPTIMIZE=1 # OPTIONS_DEBUG -DDEBUGGABLE=1 ) #TODO. Patch .cmake from FindPythonModules in CMakeLists.txt away #VTK_MODULE_USE_EXTERNAL_ - +vcpkg_add_to_path(PREPEND ${CURRENT_INSTALLED_DIR}/debug/bin) +vcpkg_add_to_path(${CURRENT_INSTALLED_DIR}/bin) vcpkg_install_cmake() # # Moves all .cmake files from /debug/share/paraview/ to /share/paraview/ From 49b278da9f3f9f068495da3c6a6b5a5e59ff880b Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sun, 8 Dec 2019 22:07:37 +0100 Subject: [PATCH 037/419] making vtk-m work for paraview --- ports/vtk-m/CONTROL | 6 +++++- ports/vtk-m/portfile.cmake | 44 ++++++++++++++++++++++++++++---------- 2 files changed, 38 insertions(+), 12 deletions(-) diff --git a/ports/vtk-m/CONTROL b/ports/vtk-m/CONTROL index 10083bc8e88a86..4deffb93343da0 100644 --- a/ports/vtk-m/CONTROL +++ b/ports/vtk-m/CONTROL @@ -1,5 +1,5 @@ Source: vtk-m -Version: 1.5.0 +Version: 1.3.0 Homepage: https://gitlab.kitware.com/vtk/vtk-m/ Description: VTK-m is a toolkit of scientific visualization algorithms for emerging processor architectures. @@ -17,3 +17,7 @@ Build-Depends: tbb Feature: mpi Description: Use the MPI controller. Build-Depends: mpi + +Feature: double +Description: Use double precision in floating point calculations +Build-Depends: diff --git a/ports/vtk-m/portfile.cmake b/ports/vtk-m/portfile.cmake index 9961b532e3f818..56c86683368aae 100644 --- a/ports/vtk-m/portfile.cmake +++ b/ports/vtk-m/portfile.cmake @@ -1,21 +1,43 @@ include(vcpkg_common_functions) -vcpkg_check_features (OUT_FEATURE_OPTIONS OPTIONS FEATURES - cuda VTKm_ENABLE_CUDA - omp VTKm_ENABLE_OPENMP - tbb VTKm_ENABLE_TBB - mpi VTKm_ENABLE_MPI -) +vcpkg_check_features (OUT_FEATURE_OPTIONS OPTIONS + FEATURES + cuda VTKm_ENABLE_CUDA + omp VTKm_ENABLE_OPENMP + tbb VTKm_ENABLE_TBB + mpi VTKm_ENABLE_MPI + double VTKm_USE_DOUBLE_PRECISION + ) + if ("cuda" IN_LIST FEATURES AND NOT ENV{CUDACXX}) set(ENV{CUDACXX} "$ENV{CUDA_PATH}/bin/nvcc") - set(BUILD_SHARED_LIBS OFF) # CUDA forces static build. + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + message(STATUS "Feature CUDA forces static build!") + endif() + set(VCPKG_LIBRARY_LINKAGE "static") # CUDA forces static build. endif() -list (APPEND OPTIONS -DVTKm_ENABLE_RENDERING=OFF) -vcpkg_from_gitlab (GITLAB_URL "https://gitlab.kitware.com" OUT_SOURCE_PATH SOURCE_PATH REPO vtk/vtk-m REF v1.5.0 SHA512 c75c224ce86fee694b37a841befe5b4917d7c9dfeb47c3c899632cb81b772bc3178867c45668168a5377ad3b971c4e20da798130e36f67ab957e494582f94f9a) -vcpkg_configure_cmake (SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS ${OPTIONS}) +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 -DBUILD_TESTING=OFF) + +vcpkg_from_gitlab (GITLAB_URL "https://gitlab.kitware.com" + OUT_SOURCE_PATH SOURCE_PATH + REPO vtk/vtk-m + REF ae6999e534876ffa1b723511d60c2d8585a38f03 v1.3.0 + SHA512 f53cdafcf31feada9eb597717c5196e73fe0c60d4b96ce522cb9a10fe2757ef3faacbda21e7257ebf6d4b64c4818ddbd41302686c6eba4393b78a1d0f44787cd) +vcpkg_configure_cmake (SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS ${OPTIONS}) vcpkg_install_cmake () -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/vtkm-1.5) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/vtkm-1.3 TARGET_PATH share/vtkm) + +file(READ ${CURRENT_PACKAGES_DIR}/share/vtkm/VTKmConfig.cmake _contents) +string(REPLACE [[set_and_check(VTKm_CONFIG_DIR "${PACKAGE_PREFIX_DIR}/lib/cmake/vtkm-1.3")]] [[set_and_check(VTKm_CONFIG_DIR "${PACKAGE_PREFIX_DIR}/share/vtkm")]] _contents ${_contents}) +file(WRITE ${CURRENT_PACKAGES_DIR}/share/vtkm/VTKmConfig.cmake ${_contents}) + file (REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file (REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + file (INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) From dcffbaef62cec830a286638b9267c53d59a58132 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sun, 8 Dec 2019 22:07:56 +0100 Subject: [PATCH 038/419] make vtk work with vtkm and paraview --- ports/vtk/CONTROL | 4 +- ports/vtk/FindHDF5.patch | 26 ------ ports/vtk/FindLZMA.patch | 4 +- ports/vtk/portfile.cmake | 175 +++++++++++++++------------------------ ports/vtk/vtkm.patch | 113 +++++++++++++++++++++++++ 5 files changed, 186 insertions(+), 136 deletions(-) create mode 100644 ports/vtk/vtkm.patch diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL index 2299fbc4ba5f57..67ddc6d7219fbd 100644 --- a/ports/vtk/CONTROL +++ b/ports/vtk/CONTROL @@ -2,7 +2,7 @@ Source: vtk Version: 8.90-PV-v5.7 Description: Software system for 3D computer graphics, image processing, and visualization Homepage: https://github.com/Kitware/VTK -Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, liblzma, libtheora, eigen3, double-conversion, pugixml, libharu, sqlite3, netcdf-c, utfcpp, libogg +Build-Depends: vtk-m, zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, liblzma, libtheora, eigen3, double-conversion, pugixml, libharu, sqlite3, netcdf-c, utfcpp, libogg Feature: openvr Description: OpenVR functionality for VTK @@ -14,7 +14,7 @@ Build-Depends: qt5 Feature: mpi Description: MPI functionality for VTK -Build-Depends: mpi, hdf5[parallel] +Build-Depends: mpi, hdf5[parallel], vtk-m[mpi] Feature: python Description: Python functionality for VTK diff --git a/ports/vtk/FindHDF5.patch b/ports/vtk/FindHDF5.patch index 33a22b556c5c03..2c537ce3068d70 100644 --- a/ports/vtk/FindHDF5.patch +++ b/ports/vtk/FindHDF5.patch @@ -1104,29 +1104,3 @@ index 2f4709c97..52165c1ae 100644 +set(HDF5_FOUND ON CACHE BOOL "" FORCE) +set(hdf5_FOUND ON CACHE BOOL "" FORCE) \ No newline at end of file -diff --git a/5177cbfe68-32836f596b/ThirdParty/hdf5/CMakeLists.txt b/5177cbfe68-40a31268e5/ThirdParty/hdf5/CMakeLists.txt -index 79027198b..b9fb556ac 100644 ---- a/5177cbfe68-32836f596b/ThirdParty/hdf5/CMakeLists.txt -+++ b/5177cbfe68-40a31268e5/ThirdParty/hdf5/CMakeLists.txt -@@ -1,5 +1,9 @@ - set(HDF5_EXTERNALLY_CONFIGURED 1) - -+#if(VTK_MODULE_USE_EXTERNAL_VTK_hdf5) -+# find_package(hdf5 CONFIG REQUIRED) -+#endif() -+ - vtk_module_third_party( - INTERNAL - LICENSE_FILES "vtkhdf5/COPYING" - -index a7ab1dc23..789759f60 100644 -diff --git a/5177cbfe68-32836f596b/Wrapping/PythonCore/vtk.module b/5177cbfe68-40a31268e5/Wrapping/PythonCore/vtk.module -index 03b787cc2..49cefc464 100644 ---- a/5177cbfe68-32836f596b/Wrapping/PythonCore/vtk.module -+++ b/5177cbfe68-40a31268e5/Wrapping/PythonCore/vtk.module -@@ -6,4 +6,5 @@ DEPENDS - VTK::CommonCore - VTK::Python - VTK::vtksys -+ #VTK::hdf5 - EXCLUDE_WRAP diff --git a/ports/vtk/FindLZMA.patch b/ports/vtk/FindLZMA.patch index df9414421a6692..8da36b06bba2a0 100644 --- a/ports/vtk/FindLZMA.patch +++ b/ports/vtk/FindLZMA.patch @@ -2,7 +2,7 @@ diff --git a/CMake/FindLZMA.cmake b/CMake/FindLZMA.cmake index 0c8c7943c..d60669484 100644 --- a/CMake/FindLZMA.cmake +++ b/CMake/FindLZMA.cmake -@@ -1,9 +1,15 @@ +@@ -1,9 +1,17 @@ find_path(LZMA_INCLUDE_DIR NAMES lzma.h DOC "lzma include directory") @@ -16,6 +16,8 @@ index 0c8c7943c..d60669484 100644 +find_library(LZMA_LIBRARY_DEBUG + NAMES lzmad lzma NAMES_PER_DIR + DOC "lzma library") ++ include(SelectLibraryConfigurations) ++ select_library_configurations( LZMA ) if (LZMA_INCLUDE_DIR) file(STRINGS "${LZMA_INCLUDE_DIR}/lzma/version.h" _lzma_version_lines diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index f991f723a33614..5f3bc9a644d5f9 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -12,6 +12,8 @@ if("qt" IN_LIST FEATURES) list(APPEND ADDITIONAL_OPTIONS -DVTK_GROUP_ENABLE_Qt=YES -DVTK_BUILD_QT_DESIGNER_PLUGIN=OFF + -DVTK_MODULE_ENABLE_VTK_RenderingQt=YES + -DVTK_MODULE_ENABLE_VTK_ViewsQt=YES ) endif() @@ -23,6 +25,30 @@ if("python" IN_LIST FEATURES) ) endif() +if("paraview" IN_LIST FEATURES) + vcpkg_find_acquire_program(PYTHON3) + list(APPEND ADDITIONAL_OPTIONS + -DVTK_MODULE_ENABLE_VTK_FiltersParallelStatistics=YES + -DVTK_MODULE_ENABLE_VTK_IOParallelExodus=YES + -DVTK_MODULE_ENABLE_VTK_RenderingContextOpenGL2=YES + -DVTK_MODULE_ENABLE_VTK_RenderingParallel=YES + -DVTK_MODULE_ENABLE_VTK_RenderingVolumeAMR=YES + -DVTK_MODULE_ENABLE_VTK_IOXdmf2=YES + -DVTK_MODULE_ENABLE_VTK_IOH5part=YES + -DVTK_MODULE_ENABLE_VTK_IOParallelLSDyna=YES + -DVTK_MODULE_ENABLE_VTK_IOTRUCHAS=YES + -DVTK_MODULE_ENABLE_VTK_IOVPIC=YES + -DVTK_MODULE_ENABLE_VTK_RenderingLICOpenGL2=YES + -DVTK_MODULE_ENABLE_VTK_RenderingMatplotlib=YES + -DVTK_MODULE_ENABLE_VTK_RenderingAnnotation=YES + #-DVTK_MODULE_ENABLE_VTK_mpi=YES + #-DVTK_MODULE_ENABLE_VTK_ParallelMPI=YES + #-DVTK_MODULE_ENABLE_VTK_ParallelMPI4Py=YES + #-DVTK_MODULE_ENABLE_VTK_WebCore=YES + #-DVTK_MODULE_ENABLE_VTK_WebPython=YES + ) +endif() + if("mpi" IN_LIST FEATURES) set(VTK_GROUP_ENABLE_MPI NO) endif() @@ -47,6 +73,8 @@ vcpkg_from_github( FindHDF5.patch # completly replaces FindHDF5 FindLibHaru.patch FindLZMA.patch + vtkm.patch # To include an external VTKm build (v.1.3 required) + #install_private_headers.patch #Required by ParaView, also vtkStatisticsAlgorithmPrivate vtkCompositePolyDataMapper2Internal vtkTextureObjectVS(from build) ) # Remove the FindGLEW.cmake and FindPythonLibs.cmake that are distributed with VTK, @@ -69,13 +97,14 @@ if(VTK_WITH_ALL_MODULES) ) endif() -# include(SelectLibraryConfigurations) -# find_library(PROJ_LIBRARY_RELEASE proj proj4 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -# find_library(PROJ_LIBRARY_DEBUG proj proj4 proj_d proj4_d PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -# select_library_configurations(PROJ) -# find_library(PUGIXML_LIBRARY_RELEASE pugixml PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -# find_library(PUGIXML_LIBRARY_DEBUG pugixml PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -# select_library_configurations(PUGIXML) +find_library(PYTHON_LIBRARY_RELEASE python37 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(PYTHON_LIBRARY_DEBUG python37_d python37 PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +if(PYTHON_LIBRARY_RELEASE) + list(APPEND PYTHON_LIBRARY "optimized\\\\\;${PYTHON_LIBRARY_RELEASE}") +endif() +if(PYTHON_LIBRARY_DEBUG) + list(APPEND PYTHON_LIBRARY "debug\\\\\;${PYTHON_LIBRARY_DEBUG}") +endif() # ============================================================================= # Configure & Install @@ -103,11 +132,13 @@ vcpkg_configure_cmake( -DVTK_GROUP_ENABLE_StandAlone=YES -DVTK_GROUP_ENABLE_Rendering=YES -DVTK_GROUP_ENABLE_Views=YES - + -DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKm=YES + -DVTK_MODULE_ENABLE_VTK_vtkm=YES # Select modules / groups to install -DVTK_USE_EXTERNAL:BOOL=ON -DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps:BOOL=OFF - -DPYTHON_EXECUTABLE=${PYTHON3} + #-DPYTHON_EXECUTABLE=${PYTHON3} + #-DPython3_LIBRARIES="${PYTHON_LIBRARY}" ${ADDITIONAL_OPTIONS} ) @@ -137,93 +168,6 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/vtk-8.90) # file(WRITE ${CURRENT_PACKAGES_DIR}/share/vtk/VTKTargets-debug.cmake "${VTK_TARGETS_DEBUG_CONTENT}") # endif() -#file(READ "${CURRENT_PACKAGES_DIR}/share/vtk/VTKTargets.cmake" VTK_TARGETS_CONTENT) -# Remove unset of _IMPORT_PREFIX in VTKTargets.cmake -#_IMPORT_PREFIX is required by vtkModules due to vcpkg_fixup_cmake_targets changing all cmake files (to use _IMPORT_PREFIX). -#STRING(REPLACE [[set(_IMPORT_PREFIX)]] -#[[ -# VCPKG: The value of _IMPORT_PREFIX should not be unset. -#set(_IMPORT_PREFIX) -#]] -#VTK_TARGETS_CONTENT "${VTK_TARGETS_CONTENT}") -#file(WRITE "${CURRENT_PACKAGES_DIR}/share/vtk/VTKTargets.cmake" "${VTK_TARGETS_CONTENT}") - -#file(READ "${CURRENT_PACKAGES_DIR}/share/vtk/VTKTargets.cmake" VTK_TARGETS_CONTENT) - -# Fix _IMPORT_PREFIX. It is not set within the Modules cmake (only set in VTKTargets.cmake). -# Since for VCPKG _IMPORT_PREFIX == VTK_INSTALL_PREFIX we just replace it with that. -# file(GLOB_RECURSE CMAKE_FILES ${CURRENT_PACKAGES_DIR}/share/vtk/Modules/*.cmake) -# foreach(FILE IN LISTS CMAKE_FILES) - # file(READ "${FILE}" _contents) - # file(WRITE "${FILE}.bak" "${_contents}") - # string(REPLACE "\${_IMPORT_PREFIX}" "\${VTK_INSTALL_PREFIX}" _contents "${_contents}") - # file(WRITE "${FILE}" "${_contents}") -# endforeach() - -# Correct 3rd Party modules in *.cmake: -# set(FILE "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtkdoubleconversion.cmake") -# file(READ "${FILE}" _contents) -# string(REPLACE [["${VTK_INSTALL_PREFIX}/lib/double-conversion.lib"]] - # [[optimized;"${VTK_INSTALL_PREFIX}/lib/double-conversion.lib";debug;"${VTK_INSTALL_PREFIX}/debug/lib/double-conversion.lib"]] - # _contents "${_contents}") -# file(WRITE "${FILE}" "${_contents}") - -# set(FILE "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtkexpat.cmake") -# file(READ "${FILE}" _contents) -# string(REPLACE [["${VTK_INSTALL_PREFIX}/lib/expat.lib"]] - # [[optimized;"${VTK_INSTALL_PREFIX}/lib/expat.lib";debug;"${VTK_INSTALL_PREFIX}/debug/lib/expat.lib"]] - # _contents "${_contents}") -# file(WRITE "${FILE}" "${_contents}") - -# set(FILE "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtkjsoncpp.cmake") -# file(READ "${FILE}" _contents) -# string(REPLACE [["${VTK_INSTALL_PREFIX}/lib/jsoncpp.lib"]] - # [[optimized;"${VTK_INSTALL_PREFIX}/lib/jsoncpp.lib";debug;"${VTK_INSTALL_PREFIX}/debug/lib/jsoncpp.lib"]] - # _contents "${_contents}") -# file(WRITE "${FILE}" "${_contents}") - -# set(FILE "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtklibproj.cmake") -# file(READ "${FILE}" _contents) -# string(REPLACE [["${VTK_INSTALL_PREFIX}/lib/proj.lib"]] - # [[optimized;"${VTK_INSTALL_PREFIX}/lib/proj.lib";debug;"${VTK_INSTALL_PREFIX}/debug/lib/proj_d.lib"]] - # _contents "${_contents}") -# file(WRITE "${FILE}" "${_contents}") - -# set(FILE "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtklibxml2.cmake") -# file(READ "${FILE}" _contents) -# string(REPLACE [["${VTK_INSTALL_PREFIX}/lib/libxml2.lib"]] - # [[optimized;"${VTK_INSTALL_PREFIX}/lib/libxml2.lib";debug;"${VTK_INSTALL_PREFIX}/debug/lib/libxml2.lib"]] - # _contents "${_contents}") -# file(WRITE "${FILE}" "${_contents}") - -# set(FILE "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtknetcdf.cmake") -# file(READ "${FILE}" _contents) -# string(REPLACE [["${VTK_INSTALL_PREFIX}/lib/netcdf.lib"]] - # [[optimized;"${VTK_INSTALL_PREFIX}/lib/netcdf.lib";debug;"${VTK_INSTALL_PREFIX}/debug/lib/netcdf.lib"]] - # _contents "${_contents}") -# file(WRITE "${FILE}" "${_contents}") - -# set(FILE "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtkogg.cmake") -# file(READ "${FILE}" _contents) -# string(REPLACE [["${VTK_INSTALL_PREFIX}/lib/ogg.lib"]] - # [[optimized;"${VTK_INSTALL_PREFIX}/lib/ogg.lib";debug;"${VTK_INSTALL_PREFIX}/debug/lib/ogg.lib"]] - # _contents "${_contents}") -# file(WRITE "${FILE}" "${_contents}") - -# set(FILE "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtksqlite.cmake") -# file(READ "${FILE}" _contents) -# string(REPLACE [["${VTK_INSTALL_PREFIX}/lib/sqlite3.lib"]] - # [[optimized;"${VTK_INSTALL_PREFIX}/lib/sqlite3.lib";debug;"${VTK_INSTALL_PREFIX}/debug/lib/sqlite3.lib"]] - # _contents "${_contents}") -# file(WRITE "${FILE}" "${_contents}") - -# set(FILE "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtktheora.cmake") -# file(READ "${FILE}" _contents) -# string(REPLACE [["${VTK_INSTALL_PREFIX}/lib/theoraenc.lib;${VTK_INSTALL_PREFIX}/lib/theoradec.lib"]] - # [[optimized;"${VTK_INSTALL_PREFIX}/lib/theoraenc.lib";optimized;"${VTK_INSTALL_PREFIX}/lib/theoradec.lib";debug;"${VTK_INSTALL_PREFIX}/debug/lib/theoraenc.lib;";debug;"${VTK_INSTALL_PREFIX}/debug/lib/theoradec.lib"]] - # _contents "${_contents}") -# file(WRITE "${FILE}" "${_contents}") - # ============================================================================= # Clean-up other directories @@ -241,6 +185,7 @@ function(_vtk_remove_debug_tool TOOL_NAME) # to make them point to the release version of the tools file(READ "${CURRENT_PACKAGES_DIR}/share/vtk/VTK-targets-debug.cmake" VTK_TARGETS_CONTENT_DEBUG) string(REPLACE "debug/bin/${TOOL_NAME}" "tools/vtk/${TOOL_NAME}" VTK_TARGETS_CONTENT_DEBUG "${VTK_TARGETS_CONTENT_DEBUG}") + string(REPLACE "tools/vtk/${TOOL_NAME}d" "tools/vtk/${TOOL_NAME}" VTK_TARGETS_CONTENT_DEBUG "${VTK_TARGETS_CONTENT_DEBUG}") file(WRITE "${CURRENT_PACKAGES_DIR}/share/vtk/VTK-targets-debug.cmake" "${VTK_TARGETS_CONTENT_DEBUG}") endfunction() @@ -285,11 +230,6 @@ foreach(TOOL_NAME IN LISTS VTK_TOOLS) _vtk_move_release_tool("${TOOL_NAME}") endforeach() -# file(READ "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtkhdf5.cmake" _contents) -# string(REPLACE "vtk::hdf5::hdf5_hl" "" _contents "${_contents}") -# string(REPLACE "vtk::hdf5::hdf5" "" _contents "${_contents}") -# file(WRITE "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtkhdf5.cmake" "${_contents}") - # ============================================================================= # Remove other files and directories that are not valid for vcpkg # if(VTK_WITH_ALL_MODULES) @@ -297,10 +237,10 @@ endforeach() # file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/XdmfConfig.cmake) # endif() -# if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - # file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) - # file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) -# endif() +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) @@ -314,13 +254,34 @@ vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/vtk) ## Files Modules needed by ParaView if("paraview" IN_LIST FEATURES) - set(VTK_CMAKE_NEEDED vtkCompilerChecks vtkCompilerPlatformFlags vtkCompilerExtraFlags vtkInitializeBuildType vtkSupportMacros vtkDirectories vtkVersion) + set(VTK_CMAKE_NEEDED vtkCompilerChecks vtkCompilerPlatformFlags vtkCompilerExtraFlags vtkInitializeBuildType vtkSupportMacros vtkDirectories vtkVersion FindPythonModules) foreach(module ${VTK_CMAKE_NEEDED}) file(INSTALL "${SOURCE_PATH}/CMake/${module}.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/vtk) endforeach() - file(INSTALL "${SOURCE_PATH}/CMake/vtkRequireLarfeFilesSupport.cxx" DESTINATION ${CURRENT_PACKAGES_DIR}/share/vtk) + file(INSTALL "${SOURCE_PATH}/CMake/vtkRequireLargeFilesSupport.cxx" DESTINATION ${CURRENT_PACKAGES_DIR}/share/vtk) + + #ParaView requires some internal headers + file(INSTALL ${SOURCE_PATH}\Rendering\Annotation\vtkScalarBarActorInternal.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/vtk-8.90) + file(INSTALL ${SOURCE_PATH}\Filters\Statistics\vtkStatisticsAlgorithmPrivate.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/vtk-8.90) + file(INSTALL ${SOURCE_PATH}\Filters\Statistics\vtkCompositePolyDataMapper2Internal.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/vtk-8.90) + file(INSTALL ${CURRENT_BUILDTREES_DIR}\${TARGET_TRIPLET}-rel\Rendering\OpenGL2\vtkTextureObjectVS.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/vtk-8.90) endif() +#TODO remove one get_filename_component(_vtk_module_import_prefix "${_vtk_module_import_prefix}" DIRECTORY) from vtk-prefix.cmake and VTK-vtk-module-properties and vtk-python.cmake +set(filenames_fix_prefix vtk-prefix VTK-vtk-module-properties vtk-python) +foreach(name ${filenames_fix_prefix}) +if(EXISTS "${CURRENT_PACKAGES_DIR}/share/vtk/${name}.cmake") + file(READ "${CURRENT_PACKAGES_DIR}/share/vtk/${name}.cmake" _contents) + string(REPLACE +[[set(_vtk_module_import_prefix "${CMAKE_CURRENT_LIST_DIR}") +get_filename_component(_vtk_module_import_prefix "${_vtk_module_import_prefix}" DIRECTORY)]] +[[set(_vtk_module_import_prefix "${CMAKE_CURRENT_LIST_DIR}")]] _contents "${_contents}") + file(WRITE "${CURRENT_PACKAGES_DIR}/share/vtk/${name}.cmake" "${_contents}") +else() + message(STATUS "FILE:${CURRENT_PACKAGES_DIR}/share/vtk/${name}.cmake does not exist! No prefix correction!") +endif() +endforeach() + # file(INSTALL "${SOURCE_PATH}/CMake/FindPythonModules.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/vtk/CMake) # file(INSTALL "${SOURCE_PATH}/CMake/vtkCompilerPlatformFlags.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/vtk) # file(INSTALL "${SOURCE_PATH}/CMake/vtkEncodeString.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/vtk) diff --git a/ports/vtk/vtkm.patch b/ports/vtk/vtkm.patch new file mode 100644 index 00000000000000..ea3adb48176e5e --- /dev/null +++ b/ports/vtk/vtkm.patch @@ -0,0 +1,113 @@ +diff --git a/Accelerators/Vtkm/CMakeLists.txt b/Accelerators/Vtkm/CMakeLists.txt +index 4297575bd..643df6fd5 100644 +--- a/Accelerators/Vtkm/CMakeLists.txt ++++ b/Accelerators/Vtkm/CMakeLists.txt +@@ -14,8 +14,10 @@ + ## + ##============================================================================= + +-list(INSERT 0 CMAKE_MODULE_PATH +- "${VTK_SOURCE_DIR}/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake") ++find_package(VTKm CONFIG REQUIRED) ++ ++#list(INSERT 0 CMAKE_MODULE_PATH ++# "${VTK_SOURCE_DIR}/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake") + + set(sources + vtkmlib/ArrayConvertersReal.cxx +diff --git a/CMake/FindLZMA.cmake b/CMake/FindLZMA.cmake +index ee5538ad9..6a453d51e 100644 +--- a/CMake/FindLZMA.cmake ++++ b/CMake/FindLZMA.cmake +diff --git a/CMake/FindVTKm.cmake b/CMake/FindVTKm.cmake +new file mode 100644 +index 000000000..c0fe00c0e +--- /dev/null ++++ b/CMake/FindVTKm.cmake +@@ -0,0 +1 @@ ++find_package(VTKm CONFIG REQUIRED) +\ No newline at end of file +diff --git a/CMake/vtkCompilerPlatformFlags.cmake b/CMake/vtkCompilerPlatformFlags.cmake +index b0bdba1e6..69c570a25 100644 +--- a/CMake/vtkCompilerPlatformFlags.cmake ++++ b/CMake/vtkCompilerPlatformFlags.cmake +@@ -107,7 +107,7 @@ if(MSVC) + if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]") + STRING(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + else() +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4 /bigobj") + endif() + endif() + +diff --git a/ThirdParty/vtkm/CMakeLists.txt b/ThirdParty/vtkm/CMakeLists.txt +index 5817d42f8..bc5a33d93 100644 +--- a/ThirdParty/vtkm/CMakeLists.txt ++++ b/ThirdParty/vtkm/CMakeLists.txt +@@ -1,6 +1,47 @@ +-vtk_module_third_party_internal( +- LICENSE_FILES "vtkvtkm/vtk-m/LICENSE.txt" +- VERSION "master" +- 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) ++ 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_TAO_INCLUDE_DIRS vtkm_taotuple INTERFACE_INCLUDE_DIRECTORIES) ++ if(MSVC) ++ set(VTKm_DEFINITIONS /bigobj) ++ endif() ++ else() ++ message(FATAL_ERROR "VTKM target missing") ++ endif() ++ if(VTKM_FOUND) ++ message(STATUS "Found VTKm") ++ endif() ++endif() ++ ++vtk_module_third_party( ++ INTERNAL ++ HEADER_ONLY ++ LICENSE_FILES "vtkvtkm/vtk-m/LICENSE.txt" ++ VERSION "master" ++ SUBDIRECTORY vtkvtkm ++ STANDARD_INCLUDE_DIRS ++ INTERFACE ++ EXTERNAL ++ PACKAGE VTKm ++ TARGETS vtkm_cont vtkm_filter vtkm_diy vtkm_optionparser vtkm_taotuple ++ #LIBRARIES vtkm_cont vtkm_filter vtkm_diy vtkm_optionparser vtkm_taotuple ++ INCLUDE_DIRS VTKm_INCLUDE_DIRS VTKm_DIY_INCLUDE_DIRS VTKm_OPTION_INCLUDE_DIRS VTKm_TAO_INCLUDE_DIRS) ++# configure_file( ++ # "${CMAKE_CURRENT_SOURCE_DIR}/vtk_utf8.h.in" ++ # "${CMAKE_CURRENT_BINARY_DIR}/vtk_utf8.h") ++ ++# vtk_module_install_headers( ++ # FILES "${CMAKE_CURRENT_BINARY_DIR}/vtk_utf8.h") +diff --git a/ThirdParty/vtkm/vtk.module b/ThirdParty/vtkm/vtk.module +index a8e4dad0f..c7bbbf0e8 100644 +--- a/ThirdParty/vtkm/vtk.module ++++ b/ThirdParty/vtkm/vtk.module +@@ -3,5 +3,7 @@ NAME + PRIVATE_DEPENDS + # While not needed to satisfy symbols, this is necessary to guarantee that + # VTK_SMP_IMPLEMENTATION_TYPE is available when configuring vtk-m. +- VTK::CommonCore ++ # VTK::CommonCore ++LIBRARY_NAME ++ VTKm + THIRD_PARTY From 3f554c039fa793f0605d90854c19769d41316465 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sun, 8 Dec 2019 22:26:46 +0100 Subject: [PATCH 039/419] fix wrong hdf5 symbols in cgns.lib --- ports/cgns/hdf5.patch | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/ports/cgns/hdf5.patch b/ports/cgns/hdf5.patch index 62ecd57f629529..4de9ee35ba031a 100644 --- a/ports/cgns/hdf5.patch +++ b/ports/cgns/hdf5.patch @@ -84,3 +84,25 @@ index 58f078fe7..46446da8a 100644 if (HDF5_FOUND) set (HDF5_HAVE_H5PUBCONF_H 1) set (HDF5_HAVE_HDF5 1) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 66b547ed1..4051f07d4 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -12,13 +12,14 @@ include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}) + if (CGNS_ENABLE_HDF5) + add_definitions(-DBUILD_HDF5) + if (WIN32) +- if (HDF5_LIBRARY) ++ add_definitions(-DWIN32) ++ if (HDF5_BUILD_SHARED_LIBS) + # file(STRINGS ${HDF5_LIBRARY} HDF5isDLL REGEX "__imp__H5close") + # if (HDF5isDLL) + # this is only needed when using hdf5 dll libs +- add_definitions(-DWIN32 -D_HDF5USEDLL_) ++ add_definitions(-DH5_BUILT_AS_DYNAMIC_LIB) + # endif (HDF5isDLL) +- endif (HDF5_LIBRARY) ++ endif (HDF5_BUILD_SHARED_LIBS) + endif (WIN32) + if(HDF5_NEED_MPI AND MPI_INC) + include_directories(${MPI_INC}) From 84cf33416a2e3b3351e4509994fba7fd9b58f4f7 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sun, 8 Dec 2019 22:37:07 +0100 Subject: [PATCH 040/419] patch VisIt --- ports/paraview/VisIt _com.patch | 100 ++++++++++++++++++++++++++++++++ ports/paraview/VisIt.patch | 60 +++++++++++++++++++ ports/paraview/portfile.cmake | 2 + 3 files changed, 162 insertions(+) create mode 100644 ports/paraview/VisIt _com.patch create mode 100644 ports/paraview/VisIt.patch diff --git a/ports/paraview/VisIt _com.patch b/ports/paraview/VisIt _com.patch new file mode 100644 index 00000000000000..3479403f0d1995 --- /dev/null +++ b/ports/paraview/VisIt _com.patch @@ -0,0 +1,100 @@ +diff --git a/b9aca022aa-7293debb5e-1/Library/VisItLib/CMake/VisItCommon.cmake b/b9aca022aa-7293debb5e/Library/VisItLib/CMake/VisItCommon.cmake +index 62338692c..292a30ab4 100644 +--- a/b9aca022aa-7293debb5e-1/Library/VisItLib/CMake/VisItCommon.cmake ++++ b/b9aca022aa-7293debb5e/Library/VisItLib/CMake/VisItCommon.cmake +@@ -200,9 +200,9 @@ set(HAVE_LIBEXODUSII 1) + # elsewhere for this. + #----------------------------------------------------------------------------- + include(CheckIncludeFiles) +-#include(CMakeBackwardCompatibilityC) +-#include(CMakeBackwardCompatibilityCXX) +-#include(CheckTypeSize) ++include(CMakeBackwardCompatibilityC) ++include(CMakeBackwardCompatibilityCXX) ++include(CheckTypeSize) + include(CheckFunctionExists) + include(CheckSymbolExists) + include(TestBigEndian) +@@ -224,25 +224,25 @@ check_include_files (unistd.h HAVE_UNISTD_H) + check_include_files (stdbool.h HAVE_STDBOOL_H) + + # Check for type sizes, endian +-check_type_size("bool" SIZEOF_BOOLEAN) +-check_type_size("char" SIZEOF_CHAR) +-check_type_size("double" SIZEOF_DOUBLE) +-check_type_size("float" SIZEOF_FLOAT) +-check_type_size("int" SIZEOF_INT) +-check_type_size("long" SIZEOF_LONG) +-check_type_size("long double" SIZEOF_LONG_DOUBLE) +-check_type_size("long float" SIZEOF_LONG_FLOAT) +-check_type_size("long long" SIZEOF_LONG_LONG) +-check_type_size("short" SIZEOF_SHORT) +-check_type_size("char" SIZEOF_UNSIGNED_CHAR) +-check_type_size("int" SIZEOF_UNSIGNED_INT) +-check_type_size("unsigned long" SIZEOF_UNSIGNED_LONG) +-check_type_size("unsigned long long" SIZEOF_UNSIGNED_LONG_LONG) +-check_type_size("short" SIZEOF_UNSIGNED_SHORT) +-check_type_size("void*" SIZEOF_VOID_P) ++set(SIZEOF_BOOLEAN ${CMAKE_SIZEOF_BOOLEAN}) ++set(SIZEOF_CHAR ${CMAKE_SIZEOF_CHAR}) ++set(SIZEOF_DOUBLE ${CMAKE_SIZEOF_DOUBLE}) ++set(SIZEOF_FLOAT ${CMAKE_SIZEOF_FLOAT}) ++set(SIZEOF_INT ${CMAKE_SIZEOF_INT}) ++set(SIZEOF_LONG ${CMAKE_SIZEOF_LONG}) ++set(SIZEOF_LONG_DOUBLE ${CMAKE_SIZEOF_LONG_DOUBLE}) ++set(SIZEOF_LONG_FLOAT ${CMAKE_SIZEOF_LONG_FLOAT}) ++set(SIZEOF_LONG_LONG ${CMAKE_SIZEOF_LONG_LONG}) ++set(SIZEOF_SHORT ${CMAKE_SIZEOF_SHORT}) ++set(SIZEOF_UNSIGNED_CHAR ${CMAKE_SIZEOF_UNSIGNED_CHAR}) ++set(SIZEOF_UNSIGNED_INT ${CMAKE_SIZEOF_UNSIGNED_INT}) ++set(SIZEOF_UNSIGNED_LONG ${CMAKE_SIZEOF_UNSIGNED_LONG}) ++set(SIZEOF_UNSIGNED_LONG_LONG ${CMAKE_SIZEOF_UNSIGNED_LONG_LONG}) ++set(SIZEOF_UNSIGNED_SHORT ${CMAKE_SIZEOF_UNSIGNED_SHORT}) ++set(SIZEOF_VOID_P ${CMAKE_SIZEOF_VOID_P}) + set(CMAKE_REQUIRED_DEFINITIONS -D_LARGEFILE64_SOURCE) + check_type_size("off64_t" SIZEOF_OFF64_T) +-#test_big_endian(WORDS_BIGENDIAN) ++test_big_endian(WORDS_BIGENDIAN) + + # manually check for socklen_t as CHECK_SYMBOL_EXISTS + # doesn't appear to work on linux (at least) +diff --git a/b9aca022aa-7293debb5e-1/Library/VisItLib/visit_vtk/lightweight/vtkUnstructuredGridFacelistFilter.C b/b9aca022aa-7293debb5e/Library/VisItLib/visit_vtk/lightweight/vtkUnstructuredGridFacelistFilter.C +index 02bdc59fb..5e4a9e570 100644 +--- a/b9aca022aa-7293debb5e-1/Library/VisItLib/visit_vtk/lightweight/vtkUnstructuredGridFacelistFilter.C ++++ b/b9aca022aa-7293debb5e/Library/VisItLib/visit_vtk/lightweight/vtkUnstructuredGridFacelistFilter.C +@@ -1869,7 +1869,7 @@ LoopOverVertexCells(vtkUnstructuredGrid *input, vtkPolyData *output, + vtkIdType cellId; + vtkIdType newCellId; + vtkIdType npts; +- const vtkIdType *pts; ++ vtkIdType *pts; + for (cellId=0, Connectivity->InitTraversal(); + Connectivity->GetNextCell(npts,pts); + cellId++) +@@ -1921,7 +1921,7 @@ LoopOverLineCells(vtkUnstructuredGrid *input, vtkPolyData *output, + vtkIdType cellId; + vtkIdType newCellId; + vtkIdType npts; +- const vtkIdType *pts; ++ vtkIdType *pts; + for (cellId=0, Connectivity->InitTraversal(); + Connectivity->GetNextCell(npts,pts); + cellId++) +@@ -1982,7 +1982,7 @@ LoopOverPolygonCells(vtkUnstructuredGrid *input, vtkPolyData *output, + vtkIdType cellId; + vtkIdType newCellId; + vtkIdType npts; +- const vtkIdType *pts; ++ vtkIdType *pts; + for (cellId=0, Connectivity->InitTraversal(); + Connectivity->GetNextCell(npts,pts); + cellId++) +@@ -2040,7 +2040,7 @@ LoopOverStripCells(vtkUnstructuredGrid *input, vtkPolyData *output, + vtkIdType cellId; + vtkIdType newCellId; + vtkIdType npts; +- const vtkIdType *pts; ++ vtkIdType *pts; + for (cellId=0, Connectivity->InitTraversal(); + Connectivity->GetNextCell(npts,pts); + cellId++) diff --git a/ports/paraview/VisIt.patch b/ports/paraview/VisIt.patch new file mode 100644 index 00000000000000..8eb5d4cb941399 --- /dev/null +++ b/ports/paraview/VisIt.patch @@ -0,0 +1,60 @@ +diff --git a/Library/VisItLib/CMake/VisItCommon.cmake b/Library/VisItLib/CMake/VisItCommon.cmake +index 62338692c..292a30ab4 100644 +--- a/b9aca022aa-7293debb5e-1/Library/VisItLib/CMake/VisItCommon.cmake ++++ b/b9aca022aa-7293debb5e/Library/VisItLib/CMake/VisItCommon.cmake +@@ -200,9 +200,9 @@ set(HAVE_LIBEXODUSII 1) + # elsewhere for this. + #----------------------------------------------------------------------------- + include(CheckIncludeFiles) +-#include(CMakeBackwardCompatibilityC) +-#include(CMakeBackwardCompatibilityCXX) +-#include(CheckTypeSize) ++include(CMakeBackwardCompatibilityC) ++include(CMakeBackwardCompatibilityCXX) ++include(CheckTypeSize) + include(CheckFunctionExists) + include(CheckSymbolExists) + include(TestBigEndian) +@@ -224,25 +224,25 @@ check_include_files (unistd.h HAVE_UNISTD_H) + check_include_files (stdbool.h HAVE_STDBOOL_H) + + # Check for type sizes, endian +-check_type_size("bool" SIZEOF_BOOLEAN) +-check_type_size("char" SIZEOF_CHAR) +-check_type_size("double" SIZEOF_DOUBLE) +-check_type_size("float" SIZEOF_FLOAT) +-check_type_size("int" SIZEOF_INT) +-check_type_size("long" SIZEOF_LONG) +-check_type_size("long double" SIZEOF_LONG_DOUBLE) +-check_type_size("long float" SIZEOF_LONG_FLOAT) +-check_type_size("long long" SIZEOF_LONG_LONG) +-check_type_size("short" SIZEOF_SHORT) +-check_type_size("char" SIZEOF_UNSIGNED_CHAR) +-check_type_size("int" SIZEOF_UNSIGNED_INT) +-check_type_size("unsigned long" SIZEOF_UNSIGNED_LONG) +-check_type_size("unsigned long long" SIZEOF_UNSIGNED_LONG_LONG) +-check_type_size("short" SIZEOF_UNSIGNED_SHORT) +-check_type_size("void*" SIZEOF_VOID_P) ++set(SIZEOF_BOOLEAN ${CMAKE_SIZEOF_BOOLEAN}) ++set(SIZEOF_CHAR ${CMAKE_SIZEOF_CHAR}) ++set(SIZEOF_DOUBLE ${CMAKE_SIZEOF_DOUBLE}) ++set(SIZEOF_FLOAT ${CMAKE_SIZEOF_FLOAT}) ++set(SIZEOF_INT ${CMAKE_SIZEOF_INT}) ++set(SIZEOF_LONG ${CMAKE_SIZEOF_LONG}) ++set(SIZEOF_LONG_DOUBLE ${CMAKE_SIZEOF_LONG_DOUBLE}) ++set(SIZEOF_LONG_FLOAT ${CMAKE_SIZEOF_LONG_FLOAT}) ++set(SIZEOF_LONG_LONG ${CMAKE_SIZEOF_LONG_LONG}) ++set(SIZEOF_SHORT ${CMAKE_SIZEOF_SHORT}) ++set(SIZEOF_UNSIGNED_CHAR ${CMAKE_SIZEOF_UNSIGNED_CHAR}) ++set(SIZEOF_UNSIGNED_INT ${CMAKE_SIZEOF_UNSIGNED_INT}) ++set(SIZEOF_UNSIGNED_LONG ${CMAKE_SIZEOF_UNSIGNED_LONG}) ++set(SIZEOF_UNSIGNED_LONG_LONG ${CMAKE_SIZEOF_UNSIGNED_LONG_LONG}) ++set(SIZEOF_UNSIGNED_SHORT ${CMAKE_SIZEOF_UNSIGNED_SHORT}) ++set(SIZEOF_VOID_P ${CMAKE_SIZEOF_VOID_P}) + set(CMAKE_REQUIRED_DEFINITIONS -D_LARGEFILE64_SOURCE) + check_type_size("off64_t" SIZEOF_OFF64_T) +-#test_big_endian(WORDS_BIGENDIAN) ++test_big_endian(WORDS_BIGENDIAN) + + # manually check for socklen_t as CHECK_SYMBOL_EXISTS + # doesn't appear to work on linux (at least) diff --git a/ports/paraview/portfile.cmake b/ports/paraview/portfile.cmake index 5459dfc5f07aff..351f3018555add 100644 --- a/ports/paraview/portfile.cmake +++ b/ports/paraview/portfile.cmake @@ -48,6 +48,8 @@ vcpkg_from_gitlab( REPO paraview/visitbridge REF 4e5fd802e83fcc8601b7a75d318ac277514cb736 SHA512 49ab6e32051a9cb328f5694bca7445610d80bdedddc7ac3d48970f57be1c5969578a0501b12f48a2fb332f109f79f8df189e78530bb4af75e73b0d48d7124884 + PATCHES + VisIt.patch ) #Get QtTesting Plugin vcpkg_from_gitlab( From 6a68a24c8e2068c9c4982b64ef88c887eba09dec Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sun, 8 Dec 2019 22:53:26 +0100 Subject: [PATCH 041/419] fix invalid patch --- ports/vtk/vtkm.patch | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ports/vtk/vtkm.patch b/ports/vtk/vtkm.patch index ea3adb48176e5e..f549beaa0dbdfd 100644 --- a/ports/vtk/vtkm.patch +++ b/ports/vtk/vtkm.patch @@ -15,10 +15,6 @@ index 4297575bd..643df6fd5 100644 set(sources vtkmlib/ArrayConvertersReal.cxx -diff --git a/CMake/FindLZMA.cmake b/CMake/FindLZMA.cmake -index ee5538ad9..6a453d51e 100644 ---- a/CMake/FindLZMA.cmake -+++ b/CMake/FindLZMA.cmake diff --git a/CMake/FindVTKm.cmake b/CMake/FindVTKm.cmake new file mode 100644 index 000000000..c0fe00c0e From 71beb9f32feb8458de3d0b0e3384badc8985f6e1 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sun, 8 Dec 2019 23:17:38 +0100 Subject: [PATCH 042/419] fix proj linkage --- ports/vtk/findproj.patch | 13 +++++++++++++ ports/vtk/portfile.cmake | 1 + 2 files changed, 14 insertions(+) create mode 100644 ports/vtk/findproj.patch diff --git a/ports/vtk/findproj.patch b/ports/vtk/findproj.patch new file mode 100644 index 00000000000000..a4e0877e810703 --- /dev/null +++ b/ports/vtk/findproj.patch @@ -0,0 +1,13 @@ +diff --git a/5177cbfe68-ae867df19e-1/CMake/FindLibPROJ.cmake b/5177cbfe68-ae867df19e/CMake/FindLibPROJ.cmake +index e2344bb17..bac4c747e 100644 +--- a/5177cbfe68-ae867df19e-1/CMake/FindLibPROJ.cmake ++++ b/5177cbfe68-ae867df19e/CMake/FindLibPROJ.cmake +@@ -9,7 +9,7 @@ find_library(LibPROJ_LIBRARY_RELEASE + mark_as_advanced(LibPROJ_LIBRARY_RELEASE) + + find_library(LibPROJ_LIBRARY_DEBUG +- NAMES projd ++ NAMES projd proj_d proj NAMES_PER_DIR + DOC "libproj debug library") + mark_as_advanced(LibPROJ_LIBRARY_DEBUG) + diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 5f3bc9a644d5f9..627567c7963891 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -73,6 +73,7 @@ vcpkg_from_github( FindHDF5.patch # completly replaces FindHDF5 FindLibHaru.patch FindLZMA.patch + findproj.patch vtkm.patch # To include an external VTKm build (v.1.3 required) #install_private_headers.patch #Required by ParaView, also vtkStatisticsAlgorithmPrivate vtkCompositePolyDataMapper2Internal vtkTextureObjectVS(from build) ) From 991f34a3306fa1c1f50b0c648c9a5453822c1ca1 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sun, 8 Dec 2019 23:19:23 +0100 Subject: [PATCH 043/419] fix paths in patch --- ports/vtk/findproj.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/vtk/findproj.patch b/ports/vtk/findproj.patch index a4e0877e810703..d83b0f4510d8ea 100644 --- a/ports/vtk/findproj.patch +++ b/ports/vtk/findproj.patch @@ -1,7 +1,7 @@ -diff --git a/5177cbfe68-ae867df19e-1/CMake/FindLibPROJ.cmake b/5177cbfe68-ae867df19e/CMake/FindLibPROJ.cmake +diff --git a/CMake/FindLibPROJ.cmake b/CMake/FindLibPROJ.cmake index e2344bb17..bac4c747e 100644 ---- a/5177cbfe68-ae867df19e-1/CMake/FindLibPROJ.cmake -+++ b/5177cbfe68-ae867df19e/CMake/FindLibPROJ.cmake +--- a/CMake/FindLibPROJ.cmake ++++ b/CMake/FindLibPROJ.cmake @@ -9,7 +9,7 @@ find_library(LibPROJ_LIBRARY_RELEASE mark_as_advanced(LibPROJ_LIBRARY_RELEASE) From aba9699f4f6650f2246e8c61e107def6286440f7 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 9 Dec 2019 00:01:50 +0100 Subject: [PATCH 044/419] fix symbol conflict between libharu and tiff --- ports/libharu/CONTROL | 4 ++++ ports/libharu/portfile.cmake | 6 ++++-- ports/libharu/tiff.patch | 12 ++++++++++++ ports/vtk/CONTROL | 2 +- 4 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 ports/libharu/tiff.patch diff --git a/ports/libharu/CONTROL b/ports/libharu/CONTROL index f8d2ca29a3fbb7..68a215f7f27eb1 100644 --- a/ports/libharu/CONTROL +++ b/ports/libharu/CONTROL @@ -3,3 +3,7 @@ Version: 2017-08-15-8 Homepage: https://github.com/libharu/libharu Description: libharu - free PDF library Build-Depends: zlib, libpng + +Feature: notiffsymbols +Description: disable symbols also defined by the tiff port +Build-Depends: tiff \ No newline at end of file diff --git a/ports/libharu/portfile.cmake b/ports/libharu/portfile.cmake index 962550ca88e1db..aac192e2daf182 100644 --- a/ports/libharu/portfile.cmake +++ b/ports/libharu/portfile.cmake @@ -1,5 +1,6 @@ -include(vcpkg_common_functions) - +if("disabletiff" IN_LIST FEATURES) + set(DISABLETIFF tiff.patch) +endif() vcpkg_download_distfile(SHADING_PR URLS "https://github.com/libharu/libharu/pull/157.diff" FILENAME "libharu-shading-pr-157.patch" @@ -17,6 +18,7 @@ vcpkg_from_github( add-boolean-typedef.patch # This patch adds shading support which is required for VTK. If desired, this could be moved into an on-by-default feature. ${SHADING_PR} + ${DISABLETIFF} ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") diff --git a/ports/libharu/tiff.patch b/ports/libharu/tiff.patch new file mode 100644 index 00000000000000..e40a9bb9efc4cb --- /dev/null +++ b/ports/libharu/tiff.patch @@ -0,0 +1,12 @@ +diff --git a/src/hpdf_image_ccitt.c b/src/hpdf_image_ccitt.c +index 2937fc90d..a1a35d0ed 100644 +--- a/src/hpdf_image_ccitt.c ++++ b/src/hpdf_image_ccitt.c +@@ -21,7 +21,6 @@ + #include + #include + +-#define G3CODES + #include "t4.h" + + typedef unsigned int uint32; diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL index 67ddc6d7219fbd..ada3f135e7951f 100644 --- a/ports/vtk/CONTROL +++ b/ports/vtk/CONTROL @@ -2,7 +2,7 @@ Source: vtk Version: 8.90-PV-v5.7 Description: Software system for 3D computer graphics, image processing, and visualization Homepage: https://github.com/Kitware/VTK -Build-Depends: vtk-m, zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, liblzma, libtheora, eigen3, double-conversion, pugixml, libharu, sqlite3, netcdf-c, utfcpp, libogg +Build-Depends: vtk-m, zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, liblzma, libtheora, eigen3, double-conversion, pugixml, libharu[notiffsymbols], sqlite3, netcdf-c, utfcpp, libogg Feature: openvr Description: OpenVR functionality for VTK From 36c82d08fc464e3ddbcbf9e2915e8c7a476e1248 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 9 Dec 2019 00:08:58 +0100 Subject: [PATCH 045/419] change wrapper to account for VTKs generated target --- ports/libxml2/CONTROL | 2 +- ports/libxml2/vcpkg-cmake-wrapper.cmake | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ports/libxml2/CONTROL b/ports/libxml2/CONTROL index 7a4b02ceaf3887..ccf2a9c60feae2 100644 --- a/ports/libxml2/CONTROL +++ b/ports/libxml2/CONTROL @@ -1,5 +1,5 @@ Source: libxml2 -Version: 2.9.9-4 +Version: 2.9.9-5 Homepage: https://xmlsoft.org/ Description: Libxml2 is the XML C parser and toolkit developed for the Gnome project (but usable outside of the Gnome platform) Build-Depends: zlib, libiconv, liblzma diff --git a/ports/libxml2/vcpkg-cmake-wrapper.cmake b/ports/libxml2/vcpkg-cmake-wrapper.cmake index b6ec9571a34c61..3a8cf2e64646bb 100644 --- a/ports/libxml2/vcpkg-cmake-wrapper.cmake +++ b/ports/libxml2/vcpkg-cmake-wrapper.cmake @@ -12,6 +12,11 @@ if(LibXml2_FOUND) debug ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib/libcharset.lib optimized ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/libcharset.lib ws2_32) + if(TARGET LibXml2::LibXml2) + target_link_libraries(LibXml2::LibXml2 INTERFACE + debug ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib/libiconv.lib + optimized ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/libiconv.lib) + endif() elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux") list(APPEND LIBXML2_LIBRARIES m) endif() From aa8ace9e6a52ee5c8b7501e1cac009eaec54a25e Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 9 Dec 2019 00:27:41 +0100 Subject: [PATCH 046/419] fix wrapper for static vtk build --- ports/libxml2/vcpkg-cmake-wrapper.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ports/libxml2/vcpkg-cmake-wrapper.cmake b/ports/libxml2/vcpkg-cmake-wrapper.cmake index 3a8cf2e64646bb..50eca4d6163f44 100644 --- a/ports/libxml2/vcpkg-cmake-wrapper.cmake +++ b/ports/libxml2/vcpkg-cmake-wrapper.cmake @@ -15,7 +15,9 @@ if(LibXml2_FOUND) if(TARGET LibXml2::LibXml2) target_link_libraries(LibXml2::LibXml2 INTERFACE debug ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib/libiconv.lib - optimized ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/libiconv.lib) + optimized ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/libiconv.lib + debug ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib/libcharset.lib + optimized ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/libcharset.lib) endif() elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux") list(APPEND LIBXML2_LIBRARIES m) From 5a072d0613e3ba9aba64de600b97531019a82a2c Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 9 Dec 2019 10:19:19 +0100 Subject: [PATCH 047/419] closes #9234 and #9239 fix the build error on linux --- ports/qt5-base/CONTROL | 2 +- ports/qt5-base/portfile.cmake | 6 ++++++ scripts/cmake/vcpkg_configure_qmake.cmake | 6 +++++- scripts/cmake/vcpkg_fixup_cmake_targets.cmake | 1 + 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL index 59fd6788cd5b11..28a5fd0bebe697 100644 --- a/ports/qt5-base/CONTROL +++ b/ports/qt5-base/CONTROL @@ -1,5 +1,5 @@ Source: qt5-base -Version: 5.12.5-3 +Version: 5.12.5-4 Homepage: https://www.qt.io/ Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components. Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 42ab6c79243c08..73f041d7b24980 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -144,12 +144,14 @@ if(VCPKG_TARGET_IS_WINDOWS) "PSQL_LIBS=${PSQL_RELEASE} ${SSL_RELEASE} ${EAY_RELEASE} ws2_32.lib secur32.lib advapi32.lib shell32.lib crypt32.lib user32.lib gdi32.lib" "SQLITE_LIBS=${SQLITE_RELEASE}" "HARFBUZZ_LIBS=${HARFBUZZ_RELEASE}" + "OPENSSL_LIBS=${SSL_RELEASE} ${EAY_RELEASE} ws2_32.lib crypt32.lib" ) list(APPEND DEBUG_OPTIONS "PSQL_LIBS=${PSQL_DEBUG} ${SSL_DEBUG} ${EAY_DEBUG} ws2_32.lib secur32.lib advapi32.lib shell32.lib crypt32.lib user32.lib gdi32.lib" "SQLITE_LIBS=${SQLITE_DEBUG}" "HARFBUZZ_LIBS=${HARFBUZZ_DEBUG}" + "OPENSSL_LIBS=${SSL_DEBUG} ${EAY_DEBUG} ws2_32.lib crypt32.lib" ) elseif(VCPKG_TARGET_IS_LINUX) if (NOT EXISTS "/usr/include/GL/glu.h") @@ -159,11 +161,13 @@ elseif(VCPKG_TARGET_IS_LINUX) "PSQL_LIBS=${PSQL_RELEASE} ${SSL_RELEASE} ${EAY_RELEASE} -ldl -lpthread" "SQLITE_LIBS=${SQLITE_RELEASE} -ldl -lpthread" "HARFBUZZ_LIBS=${HARFBUZZ_RELEASE}" + "OPENSSL_LIBS=${SSL_RELEASE} ${EAY_RELEASE} -ldl -lpthread" ) list(APPEND DEBUG_OPTIONS "PSQL_LIBS=${PSQL_DEBUG} ${SSL_DEBUG} ${EAY_DEBUG} -ldl -lpthread" "SQLITE_LIBS=${SQLITE_DEBUG} -ldl -lpthread" "HARFBUZZ_LIBS=${HARFBUZZ_DEBUG}" + "OPENSSL_LIBS=${SSL_DEBUG} ${EAY_DEBUG} -ldl -lpthread" ) elseif(VCPKG_TARGET_IS_OSX) if(DEFINED VCPKG_OSX_DEPLOYMENT_TARGET) @@ -192,11 +196,13 @@ elseif(VCPKG_TARGET_IS_OSX) "PSQL_LIBS=${PSQL_RELEASE} ${SSL_RELEASE} ${EAY_RELEASE} -ldl -lpthread" "SQLITE_LIBS=${SQLITE_RELEASE} -ldl -lpthread" "HARFBUZZ_LIBS=${HARFBUZZ_RELEASE} -framework ApplicationServices" + "OPENSSL_LIBS=${SSL_RELEASE} ${EAY_RELEASE} -ldl -lpthread" ) list(APPEND DEBUG_OPTIONS "PSQL_LIBS=${PSQL_DEBUG} ${SSL_DEBUG} ${EAY_DEBUG} -ldl -lpthread" "SQLITE_LIBS=${SQLITE_DEBUG} -ldl -lpthread" "HARFBUZZ_LIBS=${HARFBUZZ_DEBUG} -framework ApplicationServices" + "OPENSSL_LIBS=${SSL_DEBUG} ${EAY_DEBUG} -ldl -lpthread" ) endif() diff --git a/scripts/cmake/vcpkg_configure_qmake.cmake b/scripts/cmake/vcpkg_configure_qmake.cmake index a04a4c8f6e0fd4..12739551fad03f 100644 --- a/scripts/cmake/vcpkg_configure_qmake.cmake +++ b/scripts/cmake/vcpkg_configure_qmake.cmake @@ -20,7 +20,11 @@ function(vcpkg_configure_qmake) # Find qmake executable set(_triplet_hostbindir ${CURRENT_INSTALLED_DIR}/tools/qt5/bin) - find_program(QMAKE_COMMAND NAMES qmake PATHS ${VCPKG_QT_HOST_TOOLS_ROOT_DIR}/bin ${_triplet_hostbindir}) + if(DEFINED VCPKG_QT_HOST_TOOLS_ROOT_DIR) + find_program(QMAKE_COMMAND NAMES qmake PATHS ${VCPKG_QT_HOST_TOOLS_ROOT_DIR}/bin ${_triplet_hostbindir}) + else() + find_program(QMAKE_COMMAND NAMES qmake PATHS ${_triplet_hostbindir}) + endif() if(NOT QMAKE_COMMAND) message(FATAL_ERROR "vcpkg_configure_qmake: unable to find qmake.") diff --git a/scripts/cmake/vcpkg_fixup_cmake_targets.cmake b/scripts/cmake/vcpkg_fixup_cmake_targets.cmake index c383fcb569a9e5..2e3b12f92adb5c 100644 --- a/scripts/cmake/vcpkg_fixup_cmake_targets.cmake +++ b/scripts/cmake/vcpkg_fixup_cmake_targets.cmake @@ -144,6 +144,7 @@ function(vcpkg_fixup_cmake_targets) file(GLOB_RECURSE MAIN_CMAKES "${RELEASE_SHARE}/*.cmake") foreach(MAIN_CMAKE IN LISTS MAIN_CMAKES) file(READ ${MAIN_CMAKE} _contents) + file(WRITE ${MAIN_CMAKE}.bak "${_contents}") string(REGEX REPLACE "get_filename_component\\(_IMPORT_PREFIX \"\\\${CMAKE_CURRENT_LIST_FILE}\" PATH\\)(\nget_filename_component\\(_IMPORT_PREFIX \"\\\${_IMPORT_PREFIX}\" PATH\\))*" "get_filename_component(_IMPORT_PREFIX \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)\nget_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)\nget_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)" From ec4219e92237f06df27947488d51002bbdb832a1 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 9 Dec 2019 11:00:35 +0100 Subject: [PATCH 048/419] fix qt5-base:x64-windows-static --- ports/qt5-base/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 73f041d7b24980..7f7d48e0e0c988 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -144,14 +144,14 @@ if(VCPKG_TARGET_IS_WINDOWS) "PSQL_LIBS=${PSQL_RELEASE} ${SSL_RELEASE} ${EAY_RELEASE} ws2_32.lib secur32.lib advapi32.lib shell32.lib crypt32.lib user32.lib gdi32.lib" "SQLITE_LIBS=${SQLITE_RELEASE}" "HARFBUZZ_LIBS=${HARFBUZZ_RELEASE}" - "OPENSSL_LIBS=${SSL_RELEASE} ${EAY_RELEASE} ws2_32.lib crypt32.lib" + "OPENSSL_LIBS=${SSL_RELEASE} ${EAY_RELEASE} ws2_32.lib secur32.lib advapi32.lib shell32.lib crypt32.lib user32.lib gdi32.lib" ) list(APPEND DEBUG_OPTIONS "PSQL_LIBS=${PSQL_DEBUG} ${SSL_DEBUG} ${EAY_DEBUG} ws2_32.lib secur32.lib advapi32.lib shell32.lib crypt32.lib user32.lib gdi32.lib" "SQLITE_LIBS=${SQLITE_DEBUG}" "HARFBUZZ_LIBS=${HARFBUZZ_DEBUG}" - "OPENSSL_LIBS=${SSL_DEBUG} ${EAY_DEBUG} ws2_32.lib crypt32.lib" + "OPENSSL_LIBS=${SSL_DEBUG} ${EAY_DEBUG} ws2_32.lib secur32.lib advapi32.lib shell32.lib crypt32.lib user32.lib gdi32.lib" ) elseif(VCPKG_TARGET_IS_LINUX) if (NOT EXISTS "/usr/include/GL/glu.h") From 1e14c2fde37ebbf35ac6cfc5f506be2c10e4fdac Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 9 Dec 2019 14:41:46 +0100 Subject: [PATCH 049/419] fix feature in libharu --- ports/libharu/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/libharu/portfile.cmake b/ports/libharu/portfile.cmake index aac192e2daf182..58b55a6fc0b94e 100644 --- a/ports/libharu/portfile.cmake +++ b/ports/libharu/portfile.cmake @@ -1,4 +1,4 @@ -if("disabletiff" IN_LIST FEATURES) +if("notiffsymbols" IN_LIST FEATURES) set(DISABLETIFF tiff.patch) endif() vcpkg_download_distfile(SHADING_PR From de5bf05e202540c762400c5ddd8b9efa3e65fe0d Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 9 Dec 2019 17:38:47 +0100 Subject: [PATCH 050/419] fix paths in portfile --- ports/vtk/portfile.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 627567c7963891..41d36e2724f994 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -262,10 +262,10 @@ if("paraview" IN_LIST FEATURES) file(INSTALL "${SOURCE_PATH}/CMake/vtkRequireLargeFilesSupport.cxx" DESTINATION ${CURRENT_PACKAGES_DIR}/share/vtk) #ParaView requires some internal headers - file(INSTALL ${SOURCE_PATH}\Rendering\Annotation\vtkScalarBarActorInternal.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/vtk-8.90) - file(INSTALL ${SOURCE_PATH}\Filters\Statistics\vtkStatisticsAlgorithmPrivate.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/vtk-8.90) - file(INSTALL ${SOURCE_PATH}\Filters\Statistics\vtkCompositePolyDataMapper2Internal.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/vtk-8.90) - file(INSTALL ${CURRENT_BUILDTREES_DIR}\${TARGET_TRIPLET}-rel\Rendering\OpenGL2\vtkTextureObjectVS.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/vtk-8.90) + file(INSTALL ${SOURCE_PATH}/Rendering/Annotation/vtkScalarBarActorInternal.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/vtk-8.90) + file(INSTALL ${SOURCE_PATH}/Filters/Statistics/vtkStatisticsAlgorithmPrivate.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/vtk-8.90) + file(INSTALL ${SOURCE_PATH}/Filters/Statistics/vtkCompositePolyDataMapper2Internal.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/vtk-8.90) + file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Rendering/OpenGL2/vtkTextureObjectVS.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/vtk-8.90) endif() #TODO remove one get_filename_component(_vtk_module_import_prefix "${_vtk_module_import_prefix}" DIRECTORY) from vtk-prefix.cmake and VTK-vtk-module-properties and vtk-python.cmake From 53ec7e2d99591ea6be2d28431ad9b508c4b249be Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 9 Dec 2019 18:42:19 +0100 Subject: [PATCH 051/419] we do not want to find a qmake which is supplied by the system related #9239 --- scripts/cmake/vcpkg_configure_qmake.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/cmake/vcpkg_configure_qmake.cmake b/scripts/cmake/vcpkg_configure_qmake.cmake index 12739551fad03f..916794e7b2841c 100644 --- a/scripts/cmake/vcpkg_configure_qmake.cmake +++ b/scripts/cmake/vcpkg_configure_qmake.cmake @@ -21,9 +21,9 @@ function(vcpkg_configure_qmake) # Find qmake executable set(_triplet_hostbindir ${CURRENT_INSTALLED_DIR}/tools/qt5/bin) if(DEFINED VCPKG_QT_HOST_TOOLS_ROOT_DIR) - find_program(QMAKE_COMMAND NAMES qmake PATHS ${VCPKG_QT_HOST_TOOLS_ROOT_DIR}/bin ${_triplet_hostbindir}) + find_program(QMAKE_COMMAND NAMES qmake PATHS ${VCPKG_QT_HOST_TOOLS_ROOT_DIR}/bin ${_triplet_hostbindir} NO_DEFAULT_PATH) else() - find_program(QMAKE_COMMAND NAMES qmake PATHS ${_triplet_hostbindir}) + find_program(QMAKE_COMMAND NAMES qmake PATHS ${_triplet_hostbindir} NO_DEFAULT_PATH) endif() if(NOT QMAKE_COMMAND) From 43b799d19d50cad4935597a99ea06e674d972b36 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 9 Dec 2019 19:31:23 +0100 Subject: [PATCH 052/419] Fix static qt5 builds and ignore system qmake closes #9234 and #9239 --- ports/qt5-base/CONTROL | 2 +- ports/qt5-base/portfile.cmake | 6 ++++++ scripts/cmake/vcpkg_configure_qmake.cmake | 6 +++++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL index 59fd6788cd5b11..28a5fd0bebe697 100644 --- a/ports/qt5-base/CONTROL +++ b/ports/qt5-base/CONTROL @@ -1,5 +1,5 @@ Source: qt5-base -Version: 5.12.5-3 +Version: 5.12.5-4 Homepage: https://www.qt.io/ Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components. Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 42ab6c79243c08..7f7d48e0e0c988 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -144,12 +144,14 @@ if(VCPKG_TARGET_IS_WINDOWS) "PSQL_LIBS=${PSQL_RELEASE} ${SSL_RELEASE} ${EAY_RELEASE} ws2_32.lib secur32.lib advapi32.lib shell32.lib crypt32.lib user32.lib gdi32.lib" "SQLITE_LIBS=${SQLITE_RELEASE}" "HARFBUZZ_LIBS=${HARFBUZZ_RELEASE}" + "OPENSSL_LIBS=${SSL_RELEASE} ${EAY_RELEASE} ws2_32.lib secur32.lib advapi32.lib shell32.lib crypt32.lib user32.lib gdi32.lib" ) list(APPEND DEBUG_OPTIONS "PSQL_LIBS=${PSQL_DEBUG} ${SSL_DEBUG} ${EAY_DEBUG} ws2_32.lib secur32.lib advapi32.lib shell32.lib crypt32.lib user32.lib gdi32.lib" "SQLITE_LIBS=${SQLITE_DEBUG}" "HARFBUZZ_LIBS=${HARFBUZZ_DEBUG}" + "OPENSSL_LIBS=${SSL_DEBUG} ${EAY_DEBUG} ws2_32.lib secur32.lib advapi32.lib shell32.lib crypt32.lib user32.lib gdi32.lib" ) elseif(VCPKG_TARGET_IS_LINUX) if (NOT EXISTS "/usr/include/GL/glu.h") @@ -159,11 +161,13 @@ elseif(VCPKG_TARGET_IS_LINUX) "PSQL_LIBS=${PSQL_RELEASE} ${SSL_RELEASE} ${EAY_RELEASE} -ldl -lpthread" "SQLITE_LIBS=${SQLITE_RELEASE} -ldl -lpthread" "HARFBUZZ_LIBS=${HARFBUZZ_RELEASE}" + "OPENSSL_LIBS=${SSL_RELEASE} ${EAY_RELEASE} -ldl -lpthread" ) list(APPEND DEBUG_OPTIONS "PSQL_LIBS=${PSQL_DEBUG} ${SSL_DEBUG} ${EAY_DEBUG} -ldl -lpthread" "SQLITE_LIBS=${SQLITE_DEBUG} -ldl -lpthread" "HARFBUZZ_LIBS=${HARFBUZZ_DEBUG}" + "OPENSSL_LIBS=${SSL_DEBUG} ${EAY_DEBUG} -ldl -lpthread" ) elseif(VCPKG_TARGET_IS_OSX) if(DEFINED VCPKG_OSX_DEPLOYMENT_TARGET) @@ -192,11 +196,13 @@ elseif(VCPKG_TARGET_IS_OSX) "PSQL_LIBS=${PSQL_RELEASE} ${SSL_RELEASE} ${EAY_RELEASE} -ldl -lpthread" "SQLITE_LIBS=${SQLITE_RELEASE} -ldl -lpthread" "HARFBUZZ_LIBS=${HARFBUZZ_RELEASE} -framework ApplicationServices" + "OPENSSL_LIBS=${SSL_RELEASE} ${EAY_RELEASE} -ldl -lpthread" ) list(APPEND DEBUG_OPTIONS "PSQL_LIBS=${PSQL_DEBUG} ${SSL_DEBUG} ${EAY_DEBUG} -ldl -lpthread" "SQLITE_LIBS=${SQLITE_DEBUG} -ldl -lpthread" "HARFBUZZ_LIBS=${HARFBUZZ_DEBUG} -framework ApplicationServices" + "OPENSSL_LIBS=${SSL_DEBUG} ${EAY_DEBUG} -ldl -lpthread" ) endif() diff --git a/scripts/cmake/vcpkg_configure_qmake.cmake b/scripts/cmake/vcpkg_configure_qmake.cmake index a04a4c8f6e0fd4..916794e7b2841c 100644 --- a/scripts/cmake/vcpkg_configure_qmake.cmake +++ b/scripts/cmake/vcpkg_configure_qmake.cmake @@ -20,7 +20,11 @@ function(vcpkg_configure_qmake) # Find qmake executable set(_triplet_hostbindir ${CURRENT_INSTALLED_DIR}/tools/qt5/bin) - find_program(QMAKE_COMMAND NAMES qmake PATHS ${VCPKG_QT_HOST_TOOLS_ROOT_DIR}/bin ${_triplet_hostbindir}) + if(DEFINED VCPKG_QT_HOST_TOOLS_ROOT_DIR) + find_program(QMAKE_COMMAND NAMES qmake PATHS ${VCPKG_QT_HOST_TOOLS_ROOT_DIR}/bin ${_triplet_hostbindir} NO_DEFAULT_PATH) + else() + find_program(QMAKE_COMMAND NAMES qmake PATHS ${_triplet_hostbindir} NO_DEFAULT_PATH) + endif() if(NOT QMAKE_COMMAND) message(FATAL_ERROR "vcpkg_configure_qmake: unable to find qmake.") From 7c02fd9fa83ec5b8009bd328e8449a0e5423e530 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 9 Dec 2019 19:38:10 +0100 Subject: [PATCH 053/419] fix angle conflict and icu dependency --- ports/qt5-base/CONTROL | 2 +- ports/qt5-base/portfile.cmake | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL index 28a5fd0bebe697..be89e6154e6a3d 100644 --- a/ports/qt5-base/CONTROL +++ b/ports/qt5-base/CONTROL @@ -2,7 +2,7 @@ Source: qt5-base Version: 5.12.5-4 Homepage: https://www.qt.io/ Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components. -Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl +Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl, angle (!windows), icu (!uwp) Feature: latest Description: Build latest qt version (5.13.1) instead of LTS diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 7f7d48e0e0c988..3b0a0fdbf3a0d7 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -79,7 +79,8 @@ list(APPEND CORE_OPTIONS -system-pcre -system-doubleconversion -system-sqlite - -system-harfbuzz) + -system-harfbuzz + -no-angle) # Qt does not need to build angle. VCPKG will build angle! if(QT_OPENSSL_LINK) list(APPEND CORE_OPTIONS -openssl-linked) @@ -103,6 +104,8 @@ find_library(HARFBUZZ_RELEASE NAMES harfbuzz PATHS "${CURRENT_INSTALLED_DIR}/lib find_library(HARFBUZZ_DEBUG NAMES harfbuzz PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) find_library(SQLITE_RELEASE NAMES sqlite3 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) # Depends on openssl and zlib(linux) find_library(SQLITE_DEBUG NAMES sqlite3 sqlite3d PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(ICU_RELEASE NAMES icuuc libicuuc PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(ICU_DEBUG NAMES icuucd libicuucd iccuc libicuuc PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) #Dependent libraries find_library(BZ2_RELEASE bz2 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(BZ2_DEBUG bz2 bz2d PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) @@ -117,6 +120,7 @@ set(RELEASE_OPTIONS "LIBPNG_LIBS=${LIBPNG_RELEASE} ${ZLIB_RELEASE}" "PCRE2_LIBS=${PCRE2_RELEASE}" "FREETYPE_LIBS=${FREETYPE_RELEASE} ${BZ2_RELEASE} ${LIBPNG_RELEASE} ${ZLIB_RELEASE}" + "ICU_LIBS=${ICU_RELEASE}" "QMAKE_LIBS_PRIVATE+=${BZ2_RELEASE}" "QMAKE_LIBS_PRIVATE+=${LIBPNG_RELEASE}" ) @@ -126,6 +130,7 @@ set(DEBUG_OPTIONS "LIBPNG_LIBS=${LIBPNG_DEBUG} ${ZLIB_DEBUG}" "PCRE2_LIBS=${PCRE2_DEBUG}" "FREETYPE_LIBS=${FREETYPE_DEBUG} ${BZ2_DEBUG} ${LIBPNG_DEBUG} ${ZLIB_DEBUG}" + "ICU_LIBS=${ICU_DEBUG}" "QMAKE_LIBS_PRIVATE+=${BZ2_DEBUG}" "QMAKE_LIBS_PRIVATE+=${LIBPNG_DEBUG}" ) From 9aae04e660a4c80713ab65f1cfd2e0d12fc715da Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 9 Dec 2019 20:39:58 +0100 Subject: [PATCH 054/419] add egl-registry as a dependency --- ports/qt5-base/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL index be89e6154e6a3d..e1cb81675654e1 100644 --- a/ports/qt5-base/CONTROL +++ b/ports/qt5-base/CONTROL @@ -2,7 +2,7 @@ Source: qt5-base Version: 5.12.5-4 Homepage: https://www.qt.io/ Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components. -Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl, angle (!windows), icu (!uwp) +Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl, angle(!windows), egl-registry, icu (!uwp) Feature: latest Description: Build latest qt version (5.13.1) instead of LTS From 364abb26a40e68baf2604c59817702d309be07cd Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 9 Dec 2019 22:27:59 +0100 Subject: [PATCH 055/419] remove space --- ports/qt5-base/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL index e1cb81675654e1..6679329a2ef4ca 100644 --- a/ports/qt5-base/CONTROL +++ b/ports/qt5-base/CONTROL @@ -2,7 +2,7 @@ Source: qt5-base Version: 5.12.5-4 Homepage: https://www.qt.io/ Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components. -Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl, angle(!windows), egl-registry, icu (!uwp) +Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl, angle(!windows), egl-registry, icu(!uwp) Feature: latest Description: Build latest qt version (5.13.1) instead of LTS From b19bd48840b3385e52fbc976cdafc5fe9d0f4452 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 9 Dec 2019 22:49:27 +0100 Subject: [PATCH 056/419] adding spaces resolved the problem --- ports/qt5-base/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL index 6679329a2ef4ca..4609b7e3f03f7b 100644 --- a/ports/qt5-base/CONTROL +++ b/ports/qt5-base/CONTROL @@ -2,7 +2,7 @@ Source: qt5-base Version: 5.12.5-4 Homepage: https://www.qt.io/ Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components. -Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl, angle(!windows), egl-registry, icu(!uwp) +Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl, angle (!windows), egl-registry, icu (!uwp) Feature: latest Description: Build latest qt version (5.13.1) instead of LTS From a516bd6992d079aaf20fe53faad8d9cd6a1fca71 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 10 Dec 2019 00:22:25 +0100 Subject: [PATCH 057/419] remove one file from install --- ports/vtk/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 41d36e2724f994..0af9555ca3c496 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -264,7 +264,7 @@ if("paraview" IN_LIST FEATURES) #ParaView requires some internal headers file(INSTALL ${SOURCE_PATH}/Rendering/Annotation/vtkScalarBarActorInternal.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/vtk-8.90) file(INSTALL ${SOURCE_PATH}/Filters/Statistics/vtkStatisticsAlgorithmPrivate.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/vtk-8.90) - file(INSTALL ${SOURCE_PATH}/Filters/Statistics/vtkCompositePolyDataMapper2Internal.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/vtk-8.90) + #file(INSTALL ${SOURCE_PATH}/Filters/Statistics/vtkCompositePolyDataMapper2Internal.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/vtk-8.90) file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Rendering/OpenGL2/vtkTextureObjectVS.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/vtk-8.90) endif() From 58f796f460a9ce2d3bba37e734a552f7160c2848 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 10 Dec 2019 00:26:05 +0100 Subject: [PATCH 058/419] fix patch. was the wrong way around --- ports/paraview/VisIt.patch | 84 +++++++++++++++++++------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/ports/paraview/VisIt.patch b/ports/paraview/VisIt.patch index 8eb5d4cb941399..b14fd427c950bf 100644 --- a/ports/paraview/VisIt.patch +++ b/ports/paraview/VisIt.patch @@ -1,17 +1,17 @@ diff --git a/Library/VisItLib/CMake/VisItCommon.cmake b/Library/VisItLib/CMake/VisItCommon.cmake index 62338692c..292a30ab4 100644 ---- a/b9aca022aa-7293debb5e-1/Library/VisItLib/CMake/VisItCommon.cmake -+++ b/b9aca022aa-7293debb5e/Library/VisItLib/CMake/VisItCommon.cmake +--- a/Library/VisItLib/CMake/VisItCommon.cmake ++++ b/Library/VisItLib/CMake/VisItCommon.cmake @@ -200,9 +200,9 @@ set(HAVE_LIBEXODUSII 1) # elsewhere for this. #----------------------------------------------------------------------------- include(CheckIncludeFiles) --#include(CMakeBackwardCompatibilityC) --#include(CMakeBackwardCompatibilityCXX) --#include(CheckTypeSize) -+include(CMakeBackwardCompatibilityC) -+include(CMakeBackwardCompatibilityCXX) -+include(CheckTypeSize) ++#include(CMakeBackwardCompatibilityC) ++#include(CMakeBackwardCompatibilityCXX) ++#include(CheckTypeSize) +-include(CMakeBackwardCompatibilityC) +-include(CMakeBackwardCompatibilityCXX) +-include(CheckTypeSize) include(CheckFunctionExists) include(CheckSymbolExists) include(TestBigEndian) @@ -19,42 +19,42 @@ index 62338692c..292a30ab4 100644 check_include_files (stdbool.h HAVE_STDBOOL_H) # Check for type sizes, endian --check_type_size("bool" SIZEOF_BOOLEAN) --check_type_size("char" SIZEOF_CHAR) --check_type_size("double" SIZEOF_DOUBLE) --check_type_size("float" SIZEOF_FLOAT) --check_type_size("int" SIZEOF_INT) --check_type_size("long" SIZEOF_LONG) --check_type_size("long double" SIZEOF_LONG_DOUBLE) --check_type_size("long float" SIZEOF_LONG_FLOAT) --check_type_size("long long" SIZEOF_LONG_LONG) --check_type_size("short" SIZEOF_SHORT) --check_type_size("char" SIZEOF_UNSIGNED_CHAR) --check_type_size("int" SIZEOF_UNSIGNED_INT) --check_type_size("unsigned long" SIZEOF_UNSIGNED_LONG) --check_type_size("unsigned long long" SIZEOF_UNSIGNED_LONG_LONG) --check_type_size("short" SIZEOF_UNSIGNED_SHORT) --check_type_size("void*" SIZEOF_VOID_P) -+set(SIZEOF_BOOLEAN ${CMAKE_SIZEOF_BOOLEAN}) -+set(SIZEOF_CHAR ${CMAKE_SIZEOF_CHAR}) -+set(SIZEOF_DOUBLE ${CMAKE_SIZEOF_DOUBLE}) -+set(SIZEOF_FLOAT ${CMAKE_SIZEOF_FLOAT}) -+set(SIZEOF_INT ${CMAKE_SIZEOF_INT}) -+set(SIZEOF_LONG ${CMAKE_SIZEOF_LONG}) -+set(SIZEOF_LONG_DOUBLE ${CMAKE_SIZEOF_LONG_DOUBLE}) -+set(SIZEOF_LONG_FLOAT ${CMAKE_SIZEOF_LONG_FLOAT}) -+set(SIZEOF_LONG_LONG ${CMAKE_SIZEOF_LONG_LONG}) -+set(SIZEOF_SHORT ${CMAKE_SIZEOF_SHORT}) -+set(SIZEOF_UNSIGNED_CHAR ${CMAKE_SIZEOF_UNSIGNED_CHAR}) -+set(SIZEOF_UNSIGNED_INT ${CMAKE_SIZEOF_UNSIGNED_INT}) -+set(SIZEOF_UNSIGNED_LONG ${CMAKE_SIZEOF_UNSIGNED_LONG}) -+set(SIZEOF_UNSIGNED_LONG_LONG ${CMAKE_SIZEOF_UNSIGNED_LONG_LONG}) -+set(SIZEOF_UNSIGNED_SHORT ${CMAKE_SIZEOF_UNSIGNED_SHORT}) -+set(SIZEOF_VOID_P ${CMAKE_SIZEOF_VOID_P}) ++check_type_size("bool" SIZEOF_BOOLEAN) ++check_type_size("char" SIZEOF_CHAR) ++check_type_size("double" SIZEOF_DOUBLE) ++check_type_size("float" SIZEOF_FLOAT) ++check_type_size("int" SIZEOF_INT) ++check_type_size("long" SIZEOF_LONG) ++check_type_size("long double" SIZEOF_LONG_DOUBLE) ++check_type_size("long float" SIZEOF_LONG_FLOAT) ++check_type_size("long long" SIZEOF_LONG_LONG) ++check_type_size("short" SIZEOF_SHORT) ++check_type_size("char" SIZEOF_UNSIGNED_CHAR) ++check_type_size("int" SIZEOF_UNSIGNED_INT) ++check_type_size("unsigned long" SIZEOF_UNSIGNED_LONG) ++check_type_size("unsigned long long" SIZEOF_UNSIGNED_LONG_LONG) ++check_type_size("short" SIZEOF_UNSIGNED_SHORT) ++check_type_size("void*" SIZEOF_VOID_P) +-set(SIZEOF_BOOLEAN ${CMAKE_SIZEOF_BOOLEAN}) +-set(SIZEOF_CHAR ${CMAKE_SIZEOF_CHAR}) +-set(SIZEOF_DOUBLE ${CMAKE_SIZEOF_DOUBLE}) +-set(SIZEOF_FLOAT ${CMAKE_SIZEOF_FLOAT}) +-set(SIZEOF_INT ${CMAKE_SIZEOF_INT}) +-set(SIZEOF_LONG ${CMAKE_SIZEOF_LONG}) +-set(SIZEOF_LONG_DOUBLE ${CMAKE_SIZEOF_LONG_DOUBLE}) +-set(SIZEOF_LONG_FLOAT ${CMAKE_SIZEOF_LONG_FLOAT}) +-set(SIZEOF_LONG_LONG ${CMAKE_SIZEOF_LONG_LONG}) +-set(SIZEOF_SHORT ${CMAKE_SIZEOF_SHORT}) +-set(SIZEOF_UNSIGNED_CHAR ${CMAKE_SIZEOF_UNSIGNED_CHAR}) +-set(SIZEOF_UNSIGNED_INT ${CMAKE_SIZEOF_UNSIGNED_INT}) +-set(SIZEOF_UNSIGNED_LONG ${CMAKE_SIZEOF_UNSIGNED_LONG}) +-set(SIZEOF_UNSIGNED_LONG_LONG ${CMAKE_SIZEOF_UNSIGNED_LONG_LONG}) +-set(SIZEOF_UNSIGNED_SHORT ${CMAKE_SIZEOF_UNSIGNED_SHORT}) +-set(SIZEOF_VOID_P ${CMAKE_SIZEOF_VOID_P}) set(CMAKE_REQUIRED_DEFINITIONS -D_LARGEFILE64_SOURCE) check_type_size("off64_t" SIZEOF_OFF64_T) --#test_big_endian(WORDS_BIGENDIAN) -+test_big_endian(WORDS_BIGENDIAN) ++#test_big_endian(WORDS_BIGENDIAN) +-test_big_endian(WORDS_BIGENDIAN) # manually check for socklen_t as CHECK_SYMBOL_EXISTS # doesn't appear to work on linux (at least) From b81452acdcf88c662a8423b3a890c703759b3c48 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 10 Dec 2019 00:30:41 +0100 Subject: [PATCH 059/419] found the missing file --- ports/vtk/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 0af9555ca3c496..19aa8c5642ba4c 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -264,7 +264,7 @@ if("paraview" IN_LIST FEATURES) #ParaView requires some internal headers file(INSTALL ${SOURCE_PATH}/Rendering/Annotation/vtkScalarBarActorInternal.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/vtk-8.90) file(INSTALL ${SOURCE_PATH}/Filters/Statistics/vtkStatisticsAlgorithmPrivate.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/vtk-8.90) - #file(INSTALL ${SOURCE_PATH}/Filters/Statistics/vtkCompositePolyDataMapper2Internal.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/vtk-8.90) + file(INSTALL ${SOURCE_PATH}/Rendering/OpenGL2/vtkCompositePolyDataMapper2Internal.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/vtk-8.90) file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Rendering/OpenGL2/vtkTextureObjectVS.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/vtk-8.90) endif() From b0cda9a7b9c3cebcaba9b6044d24bb5011937e7d Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 10 Dec 2019 09:58:26 +0100 Subject: [PATCH 060/419] move files only if they exist --- ports/qt5-base/portfile.cmake | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 3b0a0fdbf3a0d7..11a01d0c6e8046 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -254,11 +254,13 @@ else() #This needs a new VCPKG policy. if(VCPKG_TARGET_IS_WINDOWS AND ${VCPKG_LIBRARY_LINKAGE} MATCHES "static") # Move angle dll libraries message(STATUS "Moving ANGLE dlls from /bin to /tools/qt5-angle/bin. In static builds dlls are not allowed in /bin") - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/qt5-angle) - file(RENAME ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/tools/qt5-angle/bin) - if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/bin) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/qt5-angle/debug) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/tools/qt5-angle/debug/bin) + if(EXISTS "${CURRENT_PACKAGES_DIR}/bin") + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/qt5-angle) + file(RENAME ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/tools/qt5-angle/bin) + if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/bin) + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/qt5-angle/debug) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/tools/qt5-angle/debug/bin) + endif() endif() endif() From 86fc540bb9f25559fde7d357fb099f383f16087b Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 10 Dec 2019 10:46:00 +0100 Subject: [PATCH 061/419] Update the Wrapper to use the Postgres target fixes some observed linkage issues --- ports/qt5-base/vcpkg-cmake-wrapper.cmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ports/qt5-base/vcpkg-cmake-wrapper.cmake b/ports/qt5-base/vcpkg-cmake-wrapper.cmake index 81a434ffd5e46d..bb922622806df9 100644 --- a/ports/qt5-base/vcpkg-cmake-wrapper.cmake +++ b/ports/qt5-base/vcpkg-cmake-wrapper.cmake @@ -23,12 +23,11 @@ if("${_target_type}" STREQUAL "STATIC_LIBRARY") set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES ZLIB::ZLIB JPEG::JPEG PNG::PNG Freetype::Freetype sqlite3 harfbuzz::harfbuzz - double-conversion::double-conversion OpenSSL::SSL OpenSSL::Crypto + double-conversion::double-conversion OpenSSL::SSL OpenSSL::Crypto PostgreSQL::PostgreSQL ) add_qt_library(Qt5::Core pcre2-16 - libpq Qt5ThemeSupport Qt5EventDispatcherSupport Qt5PlatformCompositorSupport From 38a0093c402928ff146baf06f66fffd06ebd5c99 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 10 Dec 2019 13:42:18 +0100 Subject: [PATCH 062/419] add cgns as a dependency --- ports/paraview/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/paraview/CONTROL b/ports/paraview/CONTROL index b905c35127e41a..16c700ddfdb400 100644 --- a/ports/paraview/CONTROL +++ b/ports/paraview/CONTROL @@ -2,7 +2,7 @@ Source: paraview Version: 5.7.0 Homepage: https://www.paraview.org/ Description: VTK-based Data Analysis and Visualization Application -Build-Depends: vtk[paraview], protobuf, boost-core, boost-format, boost-algorithm +Build-Depends: vtk[paraview], protobuf, cgns, boost-core, boost-format, boost-algorithm Default-Features: Feature: all_modules From a940b82c21aeb3c693d1843b4046cf54b88099a0 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 10 Dec 2019 21:31:56 +0100 Subject: [PATCH 063/419] update baseline --- scripts/ci.baseline.txt | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 83351593b0808f..5b7db263a84dec 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1372,32 +1372,16 @@ qpid-proton:x64-uwp=fail qpid-proton:x64-windows-static=fail qscintilla:x64-linux=fail qscintilla:x64-osx=fail -qt-advanced-docking-system:x64-linux=ignore qt5-activeqt:x64-linux=fail qt5-activeqt:x64-osx=fail -qt5-base:x64-linux=fail -qt5-charts:x64-linux=ignore -qt5-connectivity:x64-linux=ignore -qt5-datavis3d:x64-linux=ignore qt5-macextras:x64-linux=fail qt5-macextras:x64-windows=fail qt5-macextras:x64-windows-static=fail qt5-macextras:x86-windows=fail -qt5-mqtt:x64-linux=ignore -qt5-networkauth:x64-linux=ignore -qt5-quickcontrols2:x64-linux=ignore -qt5-remoteobjects:x64-linux=ignore -qt5-scxml:x64-linux=ignore -qt5-serialport:x64-linux=ignore -qt5-speech:x64-linux=ignore qt5-tools:x64-linux=ignore qt5-tools:x64-windows-static=ignore -qt5-webchannel:x64-linux=ignore -qt5-websockets:x64-linux=ignore -qt5-webview:x64-linux=ignore qt5-winextras:x64-linux=fail qt5-winextras:x64-osx=fail -qt5-xmlpatterns:x64-linux=ignore quickfast:x64-linux=ignore quickfix:x64-linux=ignore quickfix:x64-windows=ignore From 5a5cfd45b0b11773b1486b7d6ae99697ec732c4b Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 10 Dec 2019 22:58:07 +0100 Subject: [PATCH 064/419] add vtk libraries to the client server wrapper --- ports/paraview/paraview.patch | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ports/paraview/paraview.patch b/ports/paraview/paraview.patch index a1056a326840fb..43980372b6dc9c 100644 --- a/ports/paraview/paraview.patch +++ b/ports/paraview/paraview.patch @@ -57,7 +57,7 @@ index 588da1883..28af52f7a 100644 if (PARAVIEW_USE_MPI) list(APPEND paraview_requested_modules VTK::FiltersParallelFlowPaths -@@ -721,12 +723,41 @@ set(_paraview_CMAKE_INSTALL_RPATH_save +@@ -721,12 +723,43 @@ set(_paraview_CMAKE_INSTALL_RPATH_save "${CMAKE_INSTALL_RPATH}") list(APPEND CMAKE_INSTALL_RPATH "$ORIGIN") @@ -85,6 +85,7 @@ index 588da1883..28af52f7a 100644 + endif() + else() + list(APPEND _to_remove ${mod}) ++ list(APPEND vtk_modules ${mod}) + endif() + endforeach() + message(STATUS "UNRECOGNIZED:${paraview_unrecognized_modules}") @@ -100,15 +101,17 @@ index 588da1883..28af52f7a 100644 + "The following modules were requested or required, but not found: " + "${modules_notarget};${paraview_unrecognized_modules}.") + endif() ++ list(REMOVE_DUPLICATES vtk_modules) endif () if (PARAVIEW_ENABLE_PYTHON) -@@ -887,11 +918,13 @@ vtk_module_build( +@@ -887,11 +918,14 @@ vtk_module_build( USE_EXTERNAL "${PARAVIEW_USE_EXTERNAL}" TEST_INPUT_DATA_DIRECTORY "${paraview_test_data_directory_input}" TEST_OUTPUT_DATA_DIRECTORY "${paraview_test_data_directory_output}") - +message(STATUS "VTKMOD:${vtk_modules}") ++message(STATUS "PARAVIEWMOD:${paraview_modules}") include(vtkModuleJson) +if(NOT PARAVIEW_USE_EXTERNAL_VTK) vtk_module_json( From e01574c734f8d7ce0aae65e8fe1f970214e29402 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 11 Dec 2019 00:16:21 +0100 Subject: [PATCH 065/419] patch wrapper to include interface include directories --- ports/paraview/paraview.patch | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/ports/paraview/paraview.patch b/ports/paraview/paraview.patch index 43980372b6dc9c..36c19046793304 100644 --- a/ports/paraview/paraview.patch +++ b/ports/paraview/paraview.patch @@ -121,3 +121,22 @@ index 588da1883..28af52f7a 100644 vtk_module_json( MODULES "${paraview_modules}" OUTPUT "paraview-modules.json") +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" From 2921aa95bf37bd505fab9b9166f444f206c00328 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 11 Dec 2019 00:16:33 +0100 Subject: [PATCH 066/419] use the correct path variable --- ports/paraview/portfile.cmake | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ports/paraview/portfile.cmake b/ports/paraview/portfile.cmake index 351f3018555add..cc2b7069af2327 100644 --- a/ports/paraview/portfile.cmake +++ b/ports/paraview/portfile.cmake @@ -102,9 +102,7 @@ vcpkg_configure_cmake( #TODO. Patch .cmake from FindPythonModules in CMakeLists.txt away #VTK_MODULE_USE_EXTERNAL_ -vcpkg_add_to_path(PREPEND ${CURRENT_INSTALLED_DIR}/debug/bin) -vcpkg_add_to_path(${CURRENT_INSTALLED_DIR}/bin) -vcpkg_install_cmake() +vcpkg_install_cmake(ADD_BIN_TO_PATH) # # Moves all .cmake files from /debug/share/paraview/ to /share/paraview/ # # See /docs/maintainers/vcpkg_fixup_cmake_targets.md for more details From 84ef530e840a711cf5077eb33d4d273f07f92cba Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 11 Dec 2019 18:27:58 +0100 Subject: [PATCH 067/419] export all module information about dependencies. --- ports/vtk/exportalldependinfo.patch | 24 ++++++++++++++++++++++++ ports/vtk/portfile.cmake | 1 + 2 files changed, 25 insertions(+) create mode 100644 ports/vtk/exportalldependinfo.patch diff --git a/ports/vtk/exportalldependinfo.patch b/ports/vtk/exportalldependinfo.patch new file mode 100644 index 00000000000000..35afea4dd7aa7a --- /dev/null +++ b/ports/vtk/exportalldependinfo.patch @@ -0,0 +1,24 @@ +diff --git a/CMake/vtkModule.cmake b/CMake/vtkModule.cmake +index 33408e59b..0e9cddfb0 100644 +--- a/CMake/vtkModule.cmake ++++ b/CMake/vtkModule.cmake +@@ -2237,7 +2237,9 @@ function (vtk_module_build) + MODULE "${_vtk_build_module}" + FROM_GLOBAL_PROPERTIES + # Export the public dependencies of a module. +- depends ++ depends ++ private_depends ++ optional_depends + # The library name of the module. + library_name + PROPERTIES +@@ -2266,6 +2268,8 @@ function (vtk_module_build) + exclude_wrap + # Export the public dependencies of a module. + depends ++ private_depends ++ optional_depends + # Export what modules are implemented by the module. + implements + # Export whether the module contains autoinit logic. diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 19aa8c5642ba4c..e40f8b68cf4621 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -75,6 +75,7 @@ vcpkg_from_github( FindLZMA.patch findproj.patch vtkm.patch # To include an external VTKm build (v.1.3 required) + exportalldependinfo.patch # This one is already in master and is required by paraview #install_private_headers.patch #Required by ParaView, also vtkStatisticsAlgorithmPrivate vtkCompositePolyDataMapper2Internal vtkTextureObjectVS(from build) ) From a596f8a1c02e796526ea94bf97994f55cea839d3 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 11 Dec 2019 23:48:10 +0100 Subject: [PATCH 068/419] make paraview build cleanly and execute in a forced build. --- ports/paraview/paraview.patch | 11 +----- ports/paraview/portfile.cmake | 4 +-- ports/paraview/second.patch | 52 +++++++++++++++++++++++++++ ports/vtk/FindLZ4.patch | 47 +++++++++++++++++++++++++ ports/vtk/portfile.cmake | 66 +++++++++++++---------------------- ports/vtk/pythonwrapper.patch | 19 ++++++++++ 6 files changed, 145 insertions(+), 54 deletions(-) create mode 100644 ports/paraview/second.patch create mode 100644 ports/vtk/FindLZ4.patch create mode 100644 ports/vtk/pythonwrapper.patch diff --git a/ports/paraview/paraview.patch b/ports/paraview/paraview.patch index 36c19046793304..e7077856e6a576 100644 --- a/ports/paraview/paraview.patch +++ b/ports/paraview/paraview.patch @@ -48,15 +48,6 @@ index 588da1883..28af52f7a 100644 option(PARAVIEW_USE_EXTERNAL_VTK "Use an external VTK." OFF) mark_as_advanced(PARAVIEW_USE_EXTERNAL_VTK) else () -@@ -373,7 +375,7 @@ else () - ParaView::qttesting - VTK::GUISupportQt) - endif () -- -+message(STATUS "MPI:${PARAVIEW_USE_MPI}") - if (PARAVIEW_USE_MPI) - list(APPEND paraview_requested_modules - VTK::FiltersParallelFlowPaths @@ -721,12 +723,43 @@ set(_paraview_CMAKE_INSTALL_RPATH_save "${CMAKE_INSTALL_RPATH}") list(APPEND CMAKE_INSTALL_RPATH @@ -79,7 +70,7 @@ index 588da1883..28af52f7a 100644 + if(NOT TARGET ${mod}) + message(STATUS "UNREC TARGET not defined: ${mod}") + list(FIND paraview_rejected_modules ${mod} _found_mod) -+ if(_found_mod GREATER 0) ++ if(_found_mod GREATER_EQUAL 0) + message(STATUS "MODULE ${mod} not necessary; Removing from unrecognized") + list(APPEND _to_remove ${mod}) + endif() diff --git a/ports/paraview/portfile.cmake b/ports/paraview/portfile.cmake index cc2b7069af2327..d922f4c6fccfd8 100644 --- a/ports/paraview/portfile.cmake +++ b/ports/paraview/portfile.cmake @@ -39,6 +39,7 @@ vcpkg_from_github( HEAD_REF master PATCHES paraview.patch + second.patch ) #Get VisItBridge Plugin @@ -84,8 +85,7 @@ vcpkg_configure_cmake( OPTIONS -DPARAVIEW_USE_EXTERNAL:BOOL=ON -DPARAVIEW_USE_EXTERNAL_VTK:BOOL=ON - #-DVTK_USE_SYSTEM_PROTOBUF:BOOL=ON - #-DVTK_USE_SYSTEM_CGNS:BOOL=ON + -DPARAVIEW_ENABLE_PYTHON:BOOL=ON -DPARAVIEW_USE_VTKM:BOOL=ON # VTK-m port is missing but this is a requirement to build VisItLib -DPARAVIEW_ENABLE_VISITBRIDGE:BOOL=ON -DPARAVIEW_ENABLE_CATALYST:BOOL=ON diff --git a/ports/paraview/second.patch b/ports/paraview/second.patch new file mode 100644 index 00000000000000..2abd9f2d22b1ba --- /dev/null +++ b/ports/paraview/second.patch @@ -0,0 +1,52 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a39d533df..8683c81d3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -731,6 +731,11 @@ if (PARAVIEW_USE_EXTERNAL_VTK) + if(NOT TARGET ${mod}) + message(STATUS "REQUIRED TARGET not defined: ${mod}") + list(APPEND modules_notarget ${mod}) ++ ++ endif() ++ if(${mod} MATCHES "VTK::") ++ message(STATUS "VTK TARGET found: ${mod}") ++ list(APPEND vtk_modules ${mod}) + endif() + endforeach() + foreach(mod ${paraview_unrecognized_modules}) +@@ -760,6 +765,35 @@ if (PARAVIEW_USE_EXTERNAL_VTK) + "${modules_notarget};${paraview_unrecognized_modules}.") + 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_ENABLE_PYTHON) diff --git a/ports/vtk/FindLZ4.patch b/ports/vtk/FindLZ4.patch new file mode 100644 index 00000000000000..dced8bf56ffd56 --- /dev/null +++ b/ports/vtk/FindLZ4.patch @@ -0,0 +1,47 @@ +diff --git a/CMake/FindLZ4.cmake b/CMake/FindLZ4.cmake +index 8c94e3bcd..ade3f9451 100644 +--- a/CMake/FindLZ4.cmake ++++ b/CMake/FindLZ4.cmake +@@ -1,38 +1,3 @@ +-find_path(LZ4_INCLUDE_DIR +- NAMES lz4.h +- DOC "lz4 include directory") +-mark_as_advanced(LZ4_INCLUDE_DIR) +-find_library(LZ4_LIBRARY +- NAMES lz4 liblz4 +- DOC "lz4 library") +-mark_as_advanced(LZ4_LIBRARY) +- +-if (LZ4_INCLUDE_DIR) +- file(STRINGS "${LZ4_INCLUDE_DIR}/lz4.h" _lz4_version_lines +- REGEX "#define[ \t]+LZ4_VERSION_(MAJOR|MINOR|RELEASE)") +- string(REGEX REPLACE ".*LZ4_VERSION_MAJOR *\([0-9]*\).*" "\\1" _lz4_version_major "${_lz4_version_lines}") +- string(REGEX REPLACE ".*LZ4_VERSION_MINOR *\([0-9]*\).*" "\\1" _lz4_version_minor "${_lz4_version_lines}") +- string(REGEX REPLACE ".*LZ4_VERSION_RELEASE *\([0-9]*\).*" "\\1" _lz4_version_release "${_lz4_version_lines}") +- set(LZ4_VERSION "${_lz4_version_major}.${_lz4_version_minor}.${_lz4_version_release}") +- unset(_lz4_version_major) +- unset(_lz4_version_minor) +- unset(_lz4_version_release) +- unset(_lz4_version_lines) +-endif () +- +-include(FindPackageHandleStandardArgs) +-find_package_handle_standard_args(LZ4 +- REQUIRED_VARS LZ4_LIBRARY LZ4_INCLUDE_DIR +- VERSION_VAR LZ4_VERSION) +- +-if (LZ4_FOUND) +- set(LZ4_INCLUDE_DIRS "${LZ4_INCLUDE_DIR}") +- set(LZ4_LIBRARIES "${LZ4_LIBRARY}") +- +- if (NOT TARGET LZ4::LZ4) +- add_library(LZ4::LZ4 UNKNOWN IMPORTED) +- set_target_properties(LZ4::LZ4 PROPERTIES +- IMPORTED_LOCATION "${LZ4_LIBRARY}" +- INTERFACE_INCLUDE_DIRECTORIES "${LZ4_INCLUDE_DIR}") +- endif () +-endif () ++find_package(LZ4 CONFIG REQUIRED) ++set_target_properties(lz4::lz4 PROPERTIES IMPORTED_GLOBAL TRUE) ++add_library(LZ4::LZ4 ALIAS lz4::lz4) +\ No newline at end of file diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index e40f8b68cf4621..1b1d1714b3d4fe 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -11,18 +11,33 @@ endif() if("qt" IN_LIST FEATURES) list(APPEND ADDITIONAL_OPTIONS -DVTK_GROUP_ENABLE_Qt=YES - -DVTK_BUILD_QT_DESIGNER_PLUGIN=OFF -DVTK_MODULE_ENABLE_VTK_RenderingQt=YES -DVTK_MODULE_ENABLE_VTK_ViewsQt=YES ) endif() +if("qtdesignerplugin" IN_LIST FEATURES) + list(APPEND ADDITIONAL_OPTIONS + -DVTK_BUILD_QT_DESIGNER_PLUGIN=ON + ) +else() + list(APPEND ADDITIONAL_OPTIONS + -DVTK_BUILD_QT_DESIGNER_PLUGIN=OFF +endif() + if("python" IN_LIST FEATURES) vcpkg_find_acquire_program(PYTHON3) list(APPEND ADDITIONAL_OPTIONS -DVTK_WRAP_PYTHON=ON -DVTK_PYTHON_VERSION=3 + -DPython3_FIND_REGISTRY=NEVER + "-DPython3_LIBRARY_RELEASE=${CURRENT_INSTALLED_DIR}/lib/python37.lib" + "-DPython3_LIBRARY_DEBUG=${CURRENT_INSTALLED_DIR}/debug/lib/python37_d.lib" + "-DPython3_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include/python3.7" + "-DPython3_EXECUTABLE=${PYTHON3}" ) + #VTK_PYTHON_SITE_PACKAGES_SUFFIX should be set to the install dir of the site-packages + endif() if("paraview" IN_LIST FEATURES) @@ -41,11 +56,6 @@ if("paraview" IN_LIST FEATURES) -DVTK_MODULE_ENABLE_VTK_RenderingLICOpenGL2=YES -DVTK_MODULE_ENABLE_VTK_RenderingMatplotlib=YES -DVTK_MODULE_ENABLE_VTK_RenderingAnnotation=YES - #-DVTK_MODULE_ENABLE_VTK_mpi=YES - #-DVTK_MODULE_ENABLE_VTK_ParallelMPI=YES - #-DVTK_MODULE_ENABLE_VTK_ParallelMPI4Py=YES - #-DVTK_MODULE_ENABLE_VTK_WebCore=YES - #-DVTK_MODULE_ENABLE_VTK_WebPython=YES ) endif() @@ -73,25 +83,16 @@ vcpkg_from_github( FindHDF5.patch # completly replaces FindHDF5 FindLibHaru.patch FindLZMA.patch - findproj.patch + FindLZ4.patch + Findproj.patch vtkm.patch # To include an external VTKm build (v.1.3 required) - exportalldependinfo.patch # This one is already in master and is required by paraview - #install_private_headers.patch #Required by ParaView, also vtkStatisticsAlgorithmPrivate vtkCompositePolyDataMapper2Internal vtkTextureObjectVS(from build) + exportalldependinfo.patch # This one is already in master and is seems to be required by paraview to wrap the client server code + pythonwrapper.patch # + # Last patch TODO: Patch out internal loguru ) -# Remove the FindGLEW.cmake and FindPythonLibs.cmake that are distributed with VTK, -# since they do not detect the debug libraries correctly. -# The default files distributed with CMake (>= 3.9) should be superior by all means. -# For GDAL, the one distributed with CMake does not detect the debug libraries correctly, -# so we provide an own one. -#file(REMOVE ${SOURCE_PATH}/CMake/FindGLEW.cmake) -#file(REMOVE ${SOURCE_PATH}/CMake/FindPythonLibs.cmake) - -#file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindGDAL.cmake DESTINATION ${SOURCE_PATH}/CMake) - # ============================================================================= - if(VTK_WITH_ALL_MODULES) list(APPEND ADDITIONAL_OPTIONS -DVTK_BUILD_ALL_MODULES=ON @@ -99,24 +100,10 @@ if(VTK_WITH_ALL_MODULES) ) endif() -find_library(PYTHON_LIBRARY_RELEASE python37 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(PYTHON_LIBRARY_DEBUG python37_d python37 PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -if(PYTHON_LIBRARY_RELEASE) - list(APPEND PYTHON_LIBRARY "optimized\\\\\;${PYTHON_LIBRARY_RELEASE}") -endif() -if(PYTHON_LIBRARY_DEBUG) - list(APPEND PYTHON_LIBRARY "debug\\\\\;${PYTHON_LIBRARY_DEBUG}") -endif() # ============================================================================= # Configure & Install # We set all libraries to "system" and explicitly list the ones that should use embedded copies - -# set(EXTERNAL_MODULES doubleconversion eigen expat freetype glew hdf5 jpeg jsoncpp libharu libproj libxml2 lz4 lzma netcdf ogg pugixml sqlite theora tiff utf8 zlib) -# foreach(dep IN_LIST EXTERNAL_MODULES) - # list(APPEND ADDITIONAL_OPTIONS -DVTK_MODULE_USE_EXTERNAL_VTK_${dep}:BOOL=ON) -# endif() - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -138,9 +125,8 @@ vcpkg_configure_cmake( -DVTK_MODULE_ENABLE_VTK_vtkm=YES # Select modules / groups to install -DVTK_USE_EXTERNAL:BOOL=ON - -DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps:BOOL=OFF - #-DPYTHON_EXECUTABLE=${PYTHON3} - #-DPython3_LIBRARIES="${PYTHON_LIBRARY}" + -DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps:BOOL=OFF # Not yet in VCPKG + ${ADDITIONAL_OPTIONS} ) @@ -267,6 +253,7 @@ if("paraview" IN_LIST FEATURES) file(INSTALL ${SOURCE_PATH}/Filters/Statistics/vtkStatisticsAlgorithmPrivate.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/vtk-8.90) file(INSTALL ${SOURCE_PATH}/Rendering/OpenGL2/vtkCompositePolyDataMapper2Internal.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/vtk-8.90) file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Rendering/OpenGL2/vtkTextureObjectVS.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/vtk-8.90) + file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/CMakeFiles/static_python/vtkpythonmodules.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/vtk-8.90) endif() #TODO remove one get_filename_component(_vtk_module_import_prefix "${_vtk_module_import_prefix}" DIRECTORY) from vtk-prefix.cmake and VTK-vtk-module-properties and vtk-python.cmake @@ -283,8 +270,3 @@ else() message(STATUS "FILE:${CURRENT_PACKAGES_DIR}/share/vtk/${name}.cmake does not exist! No prefix correction!") endif() endforeach() - -# file(INSTALL "${SOURCE_PATH}/CMake/FindPythonModules.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/vtk/CMake) -# file(INSTALL "${SOURCE_PATH}/CMake/vtkCompilerPlatformFlags.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/vtk) -# file(INSTALL "${SOURCE_PATH}/CMake/vtkEncodeString.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/vtk) -#add install for CMAKE/FindPythonModules.cmake vtkCompilerPlatformFlags \ No newline at end of file diff --git a/ports/vtk/pythonwrapper.patch b/ports/vtk/pythonwrapper.patch new file mode 100644 index 00000000000000..66e5df1ee7d314 --- /dev/null +++ b/ports/vtk/pythonwrapper.patch @@ -0,0 +1,19 @@ +diff --git a/CMake/vtkModuleWrapPython.cmake b/CMake/vtkModuleWrapPython.cmake +index 5d2c2e1bf..e33a16d68 100644 +--- a/CMake/vtkModuleWrapPython.cmake ++++ b/CMake/vtkModuleWrapPython.cmake +@@ -75,10 +75,13 @@ function (_vtk_module_wrap_python_sources module sources classes) + "$") + set(_vtk_python_genex_include_directories + "$") ++ set(_vtk_python_genex_interface_include_directories ++ "$") + file(GENERATE + OUTPUT "${_vtk_python_args_file}" + CONTENT "$<$:\n-D\'$\'>\n +-$<$:\n-I\'$\'>\n") ++$<$:\n-I\'$\'>\n ++$<$:\n-I\'$\'>\n") + + _vtk_module_get_module_property("${module}" + PROPERTY "hierarchy" \ No newline at end of file From 42d28cf8a20eea464ebe278c129a1d602deacd44 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 12 Dec 2019 00:10:23 +0100 Subject: [PATCH 069/419] fix missing brace --- ports/vtk/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 1b1d1714b3d4fe..84b110b4d93426 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -22,7 +22,7 @@ if("qtdesignerplugin" IN_LIST FEATURES) ) else() list(APPEND ADDITIONAL_OPTIONS - -DVTK_BUILD_QT_DESIGNER_PLUGIN=OFF + -DVTK_BUILD_QT_DESIGNER_PLUGIN=OFF) endif() if("python" IN_LIST FEATURES) From 98a62dc19e2f98c03001ad21012b333b803f26fe Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 12 Dec 2019 00:18:31 +0100 Subject: [PATCH 070/419] help paraview find python3 Signed-off-by: Alexander Neumann --- ports/paraview/portfile.cmake | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/ports/paraview/portfile.cmake b/ports/paraview/portfile.cmake index d922f4c6fccfd8..b319e3e7690e03 100644 --- a/ports/paraview/portfile.cmake +++ b/ports/paraview/portfile.cmake @@ -76,8 +76,8 @@ file(COPY ${QTTESTING_SOURCE_PATH}/ DESTINATION ${SOURCE_PATH}/ThirdParty/QtTest # ) vcpkg_find_acquire_program(PYTHON3) -get_filename_component(PYTHON3_EXE_PATH ${PYTHON3} DIRECTORY) -vcpkg_add_to_path(PREPEND "${PYTHON3_EXE_PATH}") +#get_filename_component(PYTHON3_EXE_PATH ${PYTHON3} DIRECTORY) +#vcpkg_add_to_path(PREPEND "${PYTHON3_EXE_PATH}") vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} @@ -95,6 +95,13 @@ vcpkg_configure_cmake( -DBoost_INCLUDE_DIR:PATH="${CURRENT_INSTALLED_DIR}/include" -DHAVE_SYS_TYPES_H=0 ## For some strange reason the test first succeeds and then fails the second time around -DWORDS_BIGENDIAN=0 ## Tests fails in VisItCommon.cmake for some unknown reason this is just a workaround since most systems are little endian. + + # Help find Python3 correctly + "-DPython3_LIBRARY_RELEASE=${CURRENT_INSTALLED_DIR}/lib/python37.lib" + "-DPython3_LIBRARY_DEBUG=${CURRENT_INSTALLED_DIR}/debug/lib/python37_d.lib" + "-DPython3_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include/python3.7" + "-DPython3_EXECUTABLE=${PYTHON3}" + #-DPARAVIEW_ENABLE_FFMPEG:BOOL=OFF # OPTIONS_RELEASE -DOPTIMIZE=1 # OPTIONS_DEBUG -DDEBUGGABLE=1 From be062d25eb92919095581a00e50f5495ac929570 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 12 Dec 2019 00:18:46 +0100 Subject: [PATCH 071/419] add newline to patch --- ports/vtk/pythonwrapper.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/vtk/pythonwrapper.patch b/ports/vtk/pythonwrapper.patch index 66e5df1ee7d314..d7585cf0f5fc76 100644 --- a/ports/vtk/pythonwrapper.patch +++ b/ports/vtk/pythonwrapper.patch @@ -16,4 +16,4 @@ index 5d2c2e1bf..e33a16d68 100644 +$<$:\n-I\'$\'>\n") _vtk_module_get_module_property("${module}" - PROPERTY "hierarchy" \ No newline at end of file + PROPERTY "hierarchy" From 60afabffb54696cc5222047cd1da374207fd6250 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 12 Dec 2019 00:18:31 +0100 Subject: [PATCH 072/419] help paraview find python3 --- ports/paraview/portfile.cmake | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/ports/paraview/portfile.cmake b/ports/paraview/portfile.cmake index d922f4c6fccfd8..b319e3e7690e03 100644 --- a/ports/paraview/portfile.cmake +++ b/ports/paraview/portfile.cmake @@ -76,8 +76,8 @@ file(COPY ${QTTESTING_SOURCE_PATH}/ DESTINATION ${SOURCE_PATH}/ThirdParty/QtTest # ) vcpkg_find_acquire_program(PYTHON3) -get_filename_component(PYTHON3_EXE_PATH ${PYTHON3} DIRECTORY) -vcpkg_add_to_path(PREPEND "${PYTHON3_EXE_PATH}") +#get_filename_component(PYTHON3_EXE_PATH ${PYTHON3} DIRECTORY) +#vcpkg_add_to_path(PREPEND "${PYTHON3_EXE_PATH}") vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} @@ -95,6 +95,13 @@ vcpkg_configure_cmake( -DBoost_INCLUDE_DIR:PATH="${CURRENT_INSTALLED_DIR}/include" -DHAVE_SYS_TYPES_H=0 ## For some strange reason the test first succeeds and then fails the second time around -DWORDS_BIGENDIAN=0 ## Tests fails in VisItCommon.cmake for some unknown reason this is just a workaround since most systems are little endian. + + # Help find Python3 correctly + "-DPython3_LIBRARY_RELEASE=${CURRENT_INSTALLED_DIR}/lib/python37.lib" + "-DPython3_LIBRARY_DEBUG=${CURRENT_INSTALLED_DIR}/debug/lib/python37_d.lib" + "-DPython3_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include/python3.7" + "-DPython3_EXECUTABLE=${PYTHON3}" + #-DPARAVIEW_ENABLE_FFMPEG:BOOL=OFF # OPTIONS_RELEASE -DOPTIMIZE=1 # OPTIONS_DEBUG -DDEBUGGABLE=1 From 3c4ab819151e3d83a4315c75295e1b2335919007 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 12 Dec 2019 00:20:20 +0100 Subject: [PATCH 073/419] fix patch --- ports/vtk/pythonwrapper.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/vtk/pythonwrapper.patch b/ports/vtk/pythonwrapper.patch index 66e5df1ee7d314..d7585cf0f5fc76 100644 --- a/ports/vtk/pythonwrapper.patch +++ b/ports/vtk/pythonwrapper.patch @@ -16,4 +16,4 @@ index 5d2c2e1bf..e33a16d68 100644 +$<$:\n-I\'$\'>\n") _vtk_module_get_module_property("${module}" - PROPERTY "hierarchy" \ No newline at end of file + PROPERTY "hierarchy" From 7ae0fe1c7a41bdb89aea93ca48484b546cf04dcd Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 12 Dec 2019 00:26:50 +0100 Subject: [PATCH 074/419] remove unecessary variable --- ports/vtk/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 84b110b4d93426..7d86c4ea69b117 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -34,7 +34,7 @@ if("python" IN_LIST FEATURES) "-DPython3_LIBRARY_RELEASE=${CURRENT_INSTALLED_DIR}/lib/python37.lib" "-DPython3_LIBRARY_DEBUG=${CURRENT_INSTALLED_DIR}/debug/lib/python37_d.lib" "-DPython3_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include/python3.7" - "-DPython3_EXECUTABLE=${PYTHON3}" + # "-DPython3_EXECUTABLE=${PYTHON3}" ) #VTK_PYTHON_SITE_PACKAGES_SUFFIX should be set to the install dir of the site-packages From dd0027775dd43f78b33e67a3886f66e364ba2ae3 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 12 Dec 2019 09:15:58 +0100 Subject: [PATCH 075/419] remove unused cmakelists.txt --- ports/paraview/CMakeLists.txt | 1116 --------------------------------- 1 file changed, 1116 deletions(-) delete mode 100644 ports/paraview/CMakeLists.txt diff --git a/ports/paraview/CMakeLists.txt b/ports/paraview/CMakeLists.txt deleted file mode 100644 index d3a989d467e873..00000000000000 --- a/ports/paraview/CMakeLists.txt +++ /dev/null @@ -1,1116 +0,0 @@ -#========================================================================== -# -# Program: ParaView -# -# Copyright (c) 2005-2008 Sandia Corporation, Kitware Inc. -# All rights reserved. -# -# ParaView is a free software; you can redistribute it and/or modify it -# under the terms of the ParaView license version 1.2. -# -# See License_v1.2.txt for the full ParaView license. -# A copy of this license can be obtained by contacting -# Kitware Inc. -# 28 Corporate Drive -# Clifton Park, NY 12065 -# USA -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -#========================================================================== -cmake_minimum_required(VERSION 3.10 FATAL_ERROR) -project(ParaView) - -foreach (policy IN ITEMS - CMP0083 # CMake 3.14 - ) - if (POLICY ${policy}) - cmake_policy(SET ${policy} NEW) - endif () -endforeach () - -# Disallow in-source build -if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR) - message(FATAL_ERROR - "ParaView requires an out-of-source build. Please create a separate " - "binary directory and run CMake there.") -endif () - -#------------------------------------------------------------------------------ -# Set a default build type if none was specified -get_property(generator_is_multi_config GLOBAL - PROPERTY GENERATOR_IS_MULTI_CONFIG) -if (NOT CMAKE_BUILD_TYPE AND NOT generator_is_multi_config) - message(STATUS "Setting build type to 'Debug' as none was specified.") - set(CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build." FORCE) - # Set the possible values of build type for cmake-gui - set_property(CACHE CMAKE_BUILD_TYPE - PROPERTY - STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo") -endif () - -# Set up our directory structure for output libraries and binaries -include(GNUInstallDirs) -if (NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY) - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}") -endif () -if (NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY) - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}") -endif () -if (NOT CMAKE_ARCHIVE_OUTPUT_DIRECTORY) - set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}") -endif () - -set(paraview_cmake_dir "${CMAKE_CURRENT_SOURCE_DIR}/CMake") -set(vtk_cmake_dir "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/share/vtk") -string(REPLACE "/debug" "" vtk_cmake_dir "${vtk_cmake_dir}") -message(STATUS "${vtk_cmake_dir}") -list(APPEND CMAKE_MODULE_PATH - "${paraview_cmake_dir}" - "${vtk_cmake_dir}") -include(ParaViewServerManager) -include(ParaViewTesting) -include(ParaViewClient) -include(ParaViewPlugin) -include(vtkModuleWrapClientServer) -include(CTest) -set_property(CACHE BUILD_TESTING - PROPERTY - TYPE INTERNAL) - -include(vtkCompilerChecks) -include(vtkCompilerPlatformFlags) -include(vtkCompilerExtraFlags) -include(vtkInitializeBuildType) -include(vtkSupportMacros) -include(vtkDirectories) - -#------------------------------------------------------------------------------ -# Choose static or shared libraries. -vtk_deprecated_setting(shared_default PARAVIEW_BUILD_SHARED_LIBS BUILD_SHARED_LIBS "ON") -option(PARAVIEW_BUILD_SHARED_LIBS "Build ParaView with shared libraries" "${shared_default}") -set(BUILD_SHARED_LIBS "${PARAVIEW_BUILD_SHARED_LIBS}") -set(CMAKE_CXX_VISIBILITY_PRESET "hidden") -set(CMAKE_VISIBILITY_INLINES_HIDDEN 1) - -#------------------------------------------------------------------------------ -# Protect against a stampede of static links at the same time. -if (NOT PARAVIEW_BUILD_SHARED_LIBS) - set(pv_exe_job_link_pool static_exe_link) - set_property(GLOBAL APPEND PROPERTY - JOB_POOLS static_exe_link=1) -endif () - -#----------------------------------------------------------------------------- -# Does VTK require support for 64 bit file systems -include(CheckCXXSourceRuns) -file(READ "${vtk_cmake_dir}/vtkRequireLargeFilesSupport.cxx" - VTK_REQUIRE_LARGE_FILE_SUPPORT_FILE) -check_cxx_source_runs("${VTK_REQUIRE_LARGE_FILE_SUPPORT_FILE}" - CMAKE_REQUIRE_LARGE_FILE_SUPPORT "Support for 64 bit file systems") -set(VTK_REQUIRE_LARGE_FILE_SUPPORT ${CMAKE_REQUIRE_LARGE_FILE_SUPPORT}) - -#----------------------------------------------------------------------------- -# Provide compatibility options. -option(VTK_LEGACY_REMOVE "Remove all legacy code completely." OFF) -option(VTK_LEGACY_SILENT "Silence all legacy code messages." OFF) -mark_as_advanced(VTK_LEGACY_REMOVE VTK_LEGACY_SILENT) - -# Setup external data. this will automatically download the test data and -# baseline files to the build tree and set PARAVIEW_DATA_ROOT. -include(ParaViewExternalData) - -find_package(Git QUIET) -include(ParaViewDetermineVersion) - -#------------------------------------------------------------------------------ -# Setup ParaView Environment -#------------------------------------------------------------------------------ -# Determine ParaView Source Version -# Hardcoded version variables are readin from a separate file. This makes it -# easier to have a script to update version numbers automatically. -file(STRINGS version.txt version_txt) -extract_version_components("${version_txt}" "PARAVIEW") -determine_version("${CMAKE_CURRENT_SOURCE_DIR}" "${GIT_EXECUTABLE}" "PARAVIEW") - -# Setting this ensures that "make install" will leave rpaths to external -# libraries (not part of the build-tree e.g. Qt, ffmpeg, etc.) intact on -# "make install". This ensures that one can install a version of ParaView on the -# build machine without any issues. If this not desired, simply specify -# CMAKE_INSTALL_RPATH_USE_LINK_PATH when configuring Paraview and -# "make install" will strip all rpaths, which is default behavior. -if (NOT DEFINED CMAKE_INSTALL_RPATH_USE_LINK_PATH) - set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) -endif () - -include(CMakeDependentOption) -set(examples_default OFF) -if (DEFINED PARAVIEW_BUILD_EXAMPLES) - message(DEPRECATION - "PARAVIEW_BUILD_EXAMPLES has been renamed to PARAVIEW_ENABLE_EXAMPLES.") - # Use the old variable as the default for the new variable if present. - set(examples_default "${PARAVIEW_BUILD_EXAMPLES}") - # Remove the old setting from the cache and local scope. - unset(PARAVIEW_BUILD_EXAMPLES) - unset(PARAVIEW_BUILD_EXAMPLES CACHE) -endif () -option(PARAVIEW_ENABLE_EXAMPLES "Enable ParaView examples" "${examples_default}") -option(PARAVIEW_BUILD_DEVELOPER_DOCUMENTATION "Build ParaView C++/Python docs" OFF) -option(PARAVIEW_BUILD_QT_GUI "Enable ParaView Qt-based client" ON) -option(PARAVIEW_USE_MPI "Enable MPI support for parallel computing" OFF) -option(PARAVIEW_USE_VTKM "Enable VTK-m accelerated algorithms" ON) -set(raytracing_default OFF) -if (DEFINED PARAVIEW_USE_OSPRAY) - message(DEPRECATION - "PARAVIEW_USE_OSPRAY has been renamed to PARAVIEW_USE_RAYTRACING.") - set(raytracing_default "${PARAVIEW_USE_OSPRAY}") - unset(PARAVIEW_USE_OSPRAY) - unset(PARAVIEW_USE_OSPRAY CACHE) -endif () -option(PARAVIEW_USE_RAYTRACING "Build ParaView with OSPRay and/or OptiX ray Traced rendering" ${raytracing_default}) -option(PARAVIEW_ENABLE_LOGGING "Enable logging support." ON) -mark_as_advanced(PARAVIEW_ENABLE_LOGGING) -option(PARAVIEW_INSTALL_DEVELOPMENT_FILES "Install development files to the install tree" ON) -mark_as_advanced(PARAVIEW_INSTALL_DEVELOPMENT_FILES) -option(PARAVIEW_RELOCATABLE_INSTALL "Do not embed hard-coded paths into the install" ON) -mark_as_advanced(PARAVIEW_RELOCATABLE_INSTALL) - -option(PARAVIEW_ENABLE_PYTHON "Enable/Disable Python scripting support" OFF) - -set(paraview_web_default ON) -if (PARAVIEW_ENABLE_PYTHON AND WIN32) - include("${CMAKE_CURRENT_SOURCE_DIR}/VTK/CMake/FindPythonModules.cmake") - find_python_module(win32api have_pywin32) - set(paraview_web_default "${have_pywin32}") -endif () -# Add ability to freeze Python modules. -cmake_dependent_option(PARAVIEW_FREEZE_PYTHON - "Freeze Python packages/modules into the application." OFF - # FIXME(python): Freezing is not yet supported. - "PARAVIEW_ENABLE_PYTHON;NOT WIN32;NOT APPLE;FALSE" OFF) -mark_as_advanced(PARAVIEW_FREEZE_PYTHON) -cmake_dependent_option(PARAVIEW_ENABLE_WEB "Enable/Disable web support" "${paraview_web_default}" - "PARAVIEW_ENABLE_PYTHON" OFF) -mark_as_advanced(PARAVIEW_ENABLE_WEB) - -# NvPipe requires an NVIDIA GPU. -option(PARAVIEW_ENABLE_NVPIPE "Build ParaView with NvPipe remoting. Requires CUDA and an NVIDIA GPU" OFF) - -option(PARAVIEW_ENABLE_GDAL "Enable GDAL support." OFF) -mark_as_advanced(PARAVIEW_ENABLE_GDAL) -option(PARAVIEW_ENABLE_LAS "Enable LAS support." OFF) -mark_as_advanced(PARAVIEW_ENABLE_LAS) -option(PARAVIEW_ENABLE_OPENTURNS "Enable OpenTURNS support." OFF) -option(PARAVIEW_ENABLE_PDAL "Enable PDAL support." OFF) -mark_as_advanced(PARAVIEW_ENABLE_PDAL) -option(PARAVIEW_ENABLE_MOTIONFX "Enable MotionFX support." OFF) -mark_as_advanced(PARAVIEW_ENABLE_MOTIONFX) -option(PARAVIEW_ENABLE_MOMENTINVARIANTS "Enable MomentInvariants filters" OFF) -mark_as_advanced(PARAVIEW_ENABLE_MOMENTINVARIANTS) -option(PARAVIEW_ENABLE_VISITBRIDGE "Enable VisIt readers." OFF) -option(PARAVIEW_ENABLE_XDMF2 "Enable Xdmf2 support." ON) -mark_as_advanced(PARAVIEW_ENABLE_XDMF2) -option(PARAVIEW_ENABLE_XDMF3 "Enable Xdmf3 support." OFF) - -set(PARAVIEW_BUILD_TESTING "OFF" - CACHE STRING "Build module testing directories") -set_property(CACHE PARAVIEW_BUILD_TESTING - PROPERTY - STRINGS "ON;OFF;WANT") -set(BUILD_TESTING OFF) -if (PARAVIEW_BUILD_TESTING) - set(BUILD_TESTING ON) -endif () - -cmake_dependent_option(PARAVIEW_ENABLE_FFMPEG "Enable FFMPEG Support." OFF - "UNIX" OFF) - -cmake_dependent_option(PARAVIEW_USE_MPI_SSEND - "Use MPI synchronous-send commands for communication" OFF - "PARAVIEW_USE_MPI" OFF) -cmake_dependent_option(PARAVIEW_USE_ICE_T - "Enable IceT (needed for parallel rendering)" ON - "PARAVIEW_USE_MPI" OFF) -cmake_dependent_option(PARAVIEW_INITIALIZE_MPI_ON_CLIENT - "Initialize MPI on client-processes by default. Can be overridden using command line arguments" ON - "PARAVIEW_USE_MPI" OFF) -mark_as_advanced( - PARAVIEW_USE_ICE_T - PARAVIEW_USE_MPI_SSEND - PARAVIEW_INITIALIZE_MPI_ON_CLIENT) - -cmake_dependent_option(PARAVIEW_ENABLE_QT_SUPPORT - "Build ParaView with Qt support (without GUI)" OFF - "NOT PARAVIEW_BUILD_QT_GUI" ON) - -# Add an option to enable using Qt Webkit for widgets, as needed. -# Default is OFF. We don't want to depend on WebKit unless absolutely needed. -# FIXME: Move this to the module which cares. -cmake_dependent_option(PARAVIEW_USE_QTWEBENGINE - "Use Qt WebKit components as needed." OFF - "PARAVIEW_ENABLE_QT_SUPPORT" OFF) -mark_as_advanced(PARAVIEW_USE_QTWEBENGINE) - -# Add an option to enable using Qt Help, as needed. -# Default is ON to enable integrated help/documentation. -cmake_dependent_option(PARAVIEW_USE_QTHELP - "Use Qt Help infrastructure as needed." ON - "PARAVIEW_ENABLE_QT_SUPPORT" OFF) -mark_as_advanced(PARAVIEW_USE_QTHELP) - -# If PARAVIEW_BUILD_QT_GUI is OFF, provide an option to the user to turn other -# command line executables ON/OFF. -cmake_dependent_option(PARAVIEW_ENABLE_COMMANDLINE_TOOLS - "Build ParaView command-line tools" ON - "NOT PARAVIEW_BUILD_QT_GUI" ON) - -# If building on Unix with MPI enabled, we will present another option to -# enable building of CosmoTools VTK extensions. This option is by default -# OFF and set to OFF if ParaView is not built with MPI. -cmake_dependent_option(PARAVIEW_ENABLE_COSMOTOOLS - "Build ParaView with CosmoTools VTK Extensions" OFF - "UNIX;PARAVIEW_USE_MPI" OFF) -mark_as_advanced(PARAVIEW_ENABLE_COSMOTOOLS) - -option(PARAVIEW_ENABLE_CATALYST "Enable Catalyst CoProcessing modules" ON) -cmake_dependent_option(PARAVIEW_BUILD_CATALYST_ADAPTORS - "Build Adaptors for various simulation codes" OFF - # XXX: Adaptors need some work yet. - "FALSE;PARAVIEW_ENABLE_CATALYST;NOT WIN32" OFF) -mark_as_advanced(PARAVIEW_BUILD_CATALYST_ADAPTORS) - -# XXX(VTK): External VTK is not yet actually supported. -if (FALSE) -option(PARAVIEW_USE_EXTERNAL_VTK "Use an external VTK." OFF) -mark_as_advanced(PARAVIEW_USE_EXTERNAL_VTK) -else () -set(PARAVIEW_USE_EXTERNAL_VTK OFF) -endif () - -# Kits bundle multiple modules together into a single library, this -# is used to dramatically reduce the number of generated libraries. -option(PARAVIEW_ENABLE_KITS "Build ParaView using kits instead of modules." OFF) -mark_as_advanced(PARAVIEW_ENABLE_KITS) - -option(PARAVIEW_USE_EXTERNAL "Use external copies of third party libraries by default" OFF) -mark_as_advanced(PARAVIEW_USE_EXTERNAL) - -set(paraview_requested_modules) -set(paraview_rejected_modules) - -if (PARAVIEW_ENABLE_COMMANDLINE_TOOLS AND PARAVIEW_ENABLE_PYTHON) - list(APPEND paraview_requested_modules - VTK::PythonInterpreter) -endif () - -if (PARAVIEW_ENABLE_PYTHON) - set(PARAVIEW_PYTHON_VERSION "3" - CACHE STRING "") - set_property(CACHE PARAVIEW_PYTHON_VERSION - PROPERTY - STRINGS "2;3") - if (NOT PARAVIEW_PYTHON_VERSION STREQUAL "2" AND - NOT PARAVIEW_PYTHON_VERSION STREQUAL "3") - message(FATAL_ERROR - "`PARAVIEW_PYTHON_VERSION` must either be 2 or 3.") - endif () - set(VTK_PYTHON_VERSION "${PARAVIEW_PYTHON_VERSION}") - - list(APPEND paraview_requested_modules - ParaView::PythonAlgorithm - ParaView::PythonInitializer - ParaView::ClientServerCorePythonRendering - VTK::RenderingMatplotlib) -else () - list(APPEND paraview_rejected_modules - ParaView::PythonAlgorithm - ParaView::PythonInitializer - ParaView::ClientServerCorePythonRendering - VTK::RenderingMatplotlib) -endif () - -if (PARAVIEW_ENABLE_PYTHON) - list(APPEND paraview_requested_modules - ParaView::CinemaPython - ParaView::CinemaReader) -else () - list(APPEND paraview_rejected_modules - ParaView::CinemaPython - ParaView::CinemaReader) -endif() - -if (PARAVIEW_ENABLE_PYTHON AND PARAVIEW_BUILD_TESTING) - # testing needs Python interpreter i.e. `PYTHON_EXECUTABLE` without which - # our `find_python_module` checks to determine which tests to add or exclude - # will fail. We find it here. - find_package(PythonInterp "${PARAVIEW_PYTHON_VERSION}" QUIET) - mark_as_advanced(PYTHON_EXECUTABLE) -endif() - -if (PARAVIEW_BUILD_QT_GUI) - list(APPEND paraview_requested_modules - ParaView::pqApplicationComponents - ParaView::pqComponents - ParaView::pqCore) - if (PARAVIEW_ENABLE_PYTHON) - list(APPEND paraview_requested_modules - ParaView::pqPython) - endif () -else () - list(APPEND paraview_rejected_modules - ParaView::pqApplicationComponents - ParaView::pqComponents - ParaView::pqCore - ParaView::pqWidgets - ParaView::qttesting - VTK::GUISupportQt) -endif () - -if (PARAVIEW_USE_MPI) - list(APPEND paraview_requested_modules - VTK::FiltersParallelFlowPaths - VTK::FiltersParallelGeometry - VTK::FiltersParallelMPI - # Required because of ParaView::VTKExtensionsDefault having an optional dependency. - VTK::IOMPIImage - VTK::IOParallelLSDyna - VTK::IOParallelNetCDF - VTK::ParallelMPI - ParaView::VTKExtensionsDefaultParallel - ParaView::icet) - if (NOT WIN32) - list(APPEND paraview_requested_modules - VTK::FiltersParallelDIY2) - endif() -else () - list(APPEND paraview_rejected_modules - VTK::mpi) -endif () - -if (PARAVIEW_USE_MPI AND PARAVIEW_ENABLE_PYTHON) - list(APPEND paraview_requested_modules - VTK::ParallelMPI4Py) -else () - list(APPEND paraview_rejected_modules - VTK::ParallelMPI4Py) -endif() - -if (PARAVIEW_USE_VTKM) - list(APPEND paraview_requested_modules - VTK::AcceleratorsVTKm) -endif () - -if (PARAVIEW_USE_RAYTRACING) - list(APPEND paraview_requested_modules - VTK::RenderingRayTracing) -endif () - -if (PARAVIEW_ENABLE_NVPIPE) - list(APPEND paraview_requested_modules - ParaView::nvpipe) -else () - list(APPEND paraview_rejected_modules - ParaView::nvpipe) -endif () - -if (PARAVIEW_ENABLE_GDAL) - list(APPEND paraview_requested_modules - VTK::IOGDAL) -endif () - -if (PARAVIEW_ENABLE_LAS) - list(APPEND paraview_requested_modules - VTK::IOLAS) -endif () - -if (PARAVIEW_ENABLE_OPENTURNS) - list(APPEND paraview_requested_modules - VTK::FiltersOpenTURNS) -endif () - -if (PARAVIEW_ENABLE_PDAL) - list(APPEND paraview_requested_modules - VTK::IOPDAL) -endif () - -if (PARAVIEW_ENABLE_MOTIONFX) - list(APPEND paraview_requested_modules - VTK::IOMotionFX) -endif () - -set(use_vtk_remote_modules OFF) -if (PARAVIEW_ENABLE_MOMENTINVARIANTS) - list(APPEND paraview_requested_modules - VTK::MomentInvariants) - if (PARAVIEW_USE_MPI) - list(APPEND paraview_requested_modules - VTK::ParallelMomentInvariants) - endif() - set(use_vtk_remote_modules ON) -endif () - -if (PARAVIEW_ENABLE_VISITBRIDGE) - list(APPEND paraview_requested_modules - ParaView::IOVisItBridge - ParaView::VisItLib) -else () - list(APPEND paraview_rejected_modules - ParaView::IOVisItBridge - ParaView::VisItLib) -endif () - -if (PARAVIEW_ENABLE_XDMF2) - list(APPEND paraview_requested_modules - VTK::IOXdmf2) -endif () - -if (PARAVIEW_ENABLE_XDMF3) - list(APPEND paraview_requested_modules - VTK::IOXdmf3) -endif () - -if (PARAVIEW_ENABLE_FFMPEG) - list(APPEND paraview_requested_modules - VTK::IOFFMPEG) -endif () - -if (PARAVIEW_USE_ICE_T) - list(APPEND paraview_requested_modules - ParaView::icet) -endif () - -if (PARAVIEW_ENABLE_COSMOTOOLS) - list(APPEND paraview_requested_modules - ParaView::VTKExtensionsCosmoTools) -else () - list(APPEND paraview_rejected_modules - ParaView::VTKExtensionsCosmoTools) -endif () - -if (PARAVIEW_ENABLE_CATALYST) - list(APPEND paraview_requested_modules - ParaView::Catalyst) - - if (PARAVIEW_ENABLE_PYTHON) - list(APPEND paraview_requested_modules - ParaView::PythonCatalyst) - endif () - - if (BUILD_TESTING) - list(APPEND paraview_requested_modules - ParaView::CatalystTestDriver) - endif () - - # When Catalyst is enabled, Fortran is optionally needed. Hence we enable - # Fortran at the top level itself. When individual module called - # enable_language(...), it failed during first cmake configure but worked o - # subsequent. enable_language(... OPTIONAL) overcomes that issue altogether. - - if (NOT WIN32) - # Theoretically, CheckFortran should not be needed, but it - # enable_language(OPTIONAL) fails with Ninja generator. - include(CheckFortran) - check_fortran_support() - if (CMAKE_Fortran_COMPILER) - enable_language(Fortran OPTIONAL) - endif () - endif () -endif () - -if (PARAVIEW_BUILD_TESTING) - list(APPEND paraview_requested_modules - ParaView::smTestDriver) -endif () - -list(APPEND paraview_requested_modules - ParaView::Animation - ParaView::ProcessXML - ParaView::ServerManagerApplication - ParaView::ServerManagerDefault - ParaView::VTKExtensionsCGNSReader - ParaView::VTKExtensionsPoints - ParaView::WrapClientServer - VTK::FiltersFlowPaths - VTK::FiltersTexture - VTK::FiltersVerdict - VTK::IOAMR - VTK::IOAsynchronous # needed for cinema, but no harm adding always. - VTK::IOH5part - VTK::IOParallelLSDyna - VTK::IOSegY - VTK::IOTecplotTable - VTK::IOTRUCHAS - VTK::IOVeraOut - VTK::IOVPIC - ) - -if (PARAVIEW_ENABLE_WEB) - list(APPEND paraview_requested_modules - ParaView::PVWebCore - ParaView::PVWebPython - ParaView::PVWebExporter - VTK::WebCore - VTK::WebPython - ) - if (PARAVIEW_PYTHON_VERSION STREQUAL "2") - list(APPEND paraview_requested_modules - ParaView::PVWebPython2 - ) - else () - list(APPEND paraview_rejected_modules - ParaView::PVWebPython2 - ) - endif () -else() - list(APPEND paraview_rejected_modules - ParaView::PVWebCore - ParaView::PVWebPython - ParaView::PVWebPython2 - ParaView::PVWebExporter - VTK::WebCore - VTK::WebPython - ) -endif () - -if (paraview_requested_modules) - list(REMOVE_DUPLICATES paraview_requested_modules) -endif () - -option(PARAVIEW_BUILD_ALL_MODULES "Build all modules by default" OFF) -mark_as_advanced(PARAVIEW_BUILD_ALL_MODULES) - -if (PARAVIEW_USE_EXTERNAL_VTK) - find_package(VTK REQUIRED) -else () - list(APPEND CMAKE_MODULE_PATH - "${CMAKE_CURRENT_SOURCE_DIR}/VTK/CMake") - include(vtkCMakeBackports) - include(vtkModule) - include(vtkEncodeString) - include(vtkObjectFactory) - include(vtkExternalData) - include(vtkVersion) - set(VTK_VERSION - "${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}.${VTK_BUILD_VERSION}") - - if (PARAVIEW_ENABLE_PYTHON) - include(vtkModuleWrapPython) - endif () -endif () - -set_property(GLOBAL - PROPERTY - "_vtk_module_autoinit_include" "\"vtkAutoInit.h\"") - -# Note that the way that this flag gets used, it only has an effect on the -# initial configuration. -option(PARAVIEW_PLUGINS_DEFAULT "Default state for ParaView plugins" ON) -mark_as_advanced(PARAVIEW_PLUGINS_DEFAULT) -set(paraview_default_plugins - AcceleratedAlgorithms - AnalyzeNIfTIReaderWriter - ArrowGlyph - BagPlotViewsAndFilters - CDIReader - DigitalRockPhysics - EULATestPlugin - EmbossingRepresentations - EyeDomeLighting - ExplicitStructuredGrid - GenericIOReader - GeodesicMeasurement - GLTFReader - GMVReader - LagrangianParticleTracker - Moments - MooseXfemClip - NetCDFTimeAnnotationPlugin - NonOrthogonalSource - PacMan - PanoramicProjectionView - # ParFlow - Because of dependency to nlohmann_json - SLACTools - SierraPlotTools - StreamLinesRepresentation - StreamingParticles - SurfaceLIC - ThickenLayeredCells - VTKmFilters - pvblot) -foreach (paraview_default_plugin IN LISTS paraview_default_plugins) - set("_paraview_plugin_default_${paraview_default_plugin}" "${PARAVIEW_PLUGINS_DEFAULT}") -endforeach () - -set(paraview_plugin_directories - "${CMAKE_CURRENT_SOURCE_DIR}/Plugins") -paraview_plugin_find_plugins(paraview_plugin_files ${paraview_plugin_directories}) -paraview_plugin_scan( - PLUGIN_FILES ${paraview_plugin_files} - PROVIDES_PLUGINS paraview_plugins - REQUIRES_MODULES paraview_plugin_required_modules) - -set(_vtk_module_group_default_ParaViewCore "WANT") -set(_vtk_module_group_default_ParaViewRendering "WANT") - -set(paraview_source_directories - "${CMAKE_CURRENT_SOURCE_DIR}/CoProcessing" - "${CMAKE_CURRENT_SOURCE_DIR}/ParaViewCore" - "${CMAKE_CURRENT_SOURCE_DIR}/Qt" - "${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty" - "${CMAKE_CURRENT_SOURCE_DIR}/Utilities" - "${CMAKE_CURRENT_SOURCE_DIR}/Web") -vtk_module_find_modules(paraview_module_files ${paraview_source_directories}) -vtk_module_find_kits(paraview_kit_files ${paraview_source_directories}) -vtk_module_scan( - MODULE_FILES ${paraview_module_files} - KIT_FILES ${paraview_kit_files} - REQUEST_MODULES ${paraview_requested_modules} - ${paraview_plugin_required_modules} - REJECT_MODULES ${paraview_rejected_modules} - PROVIDES_MODULES paraview_modules - PROVIDES_KITS paraview_kits - REQUIRES_MODULES paraview_required_modules - UNRECOGNIZED_MODULES paraview_unrecognized_modules - WANT_BY_DEFAULT "${PARAVIEW_BUILD_ALL_MODULES}" - ENABLE_TESTS "${PARAVIEW_BUILD_TESTING}") - -set(paraview_unrecognized_paraview_modules) -foreach (paraview_module IN LISTS paraview_unrecognized_modules) - if (paraview_module MATCHES "ParaView::") - list(APPEND paraview_unrecognized_paraview_modules - "${paraview_module}") - endif () -endforeach () -if (paraview_unrecognized_paraview_modules) - message(FATAL_ERROR - "The following modules were requested or required, but not found: " - "${paraview_unrecognized_paraview_modules}.") -endif () - -option(PARAVIEW_VERSIONED_INSTALL "Install artifacts with versioned names." ON) -mark_as_advanced(PARAVIEW_VERSIONED_INSTALL) -set(paraview_version_suffix "") -if (PARAVIEW_VERSIONED_INSTALL) - set(paraview_version_suffix "-${PARAVIEW_VERSION_MAJOR}.${PARAVIEW_VERSION_MINOR}") -endif () - -set(paraview_cmake_destination - "${CMAKE_INSTALL_LIBDIR}/cmake/paraview${paraview_version_suffix}") - -set(PARAVIEW_CUSTOM_LIBRARY_SUFFIX "" - CACHE STRING "Custom library file name suffix (defaults to the version number)") -mark_as_advanced(PARAVIEW_CUSTOM_LIBRARY_SUFFIX) -if (PARAVIEW_CUSTOM_LIBRARY_SUFFIX STREQUAL "") - if (PARAVIEW_VERSIONED_INSTALL) - set(PARAVIEW_CUSTOM_LIBRARY_SUFFIX "pv${PARAVIEW_VERSION_MAJOR}.${PARAVIEW_VERSION_MINOR}") - else () - set(PARAVIEW_CUSTOM_LIBRARY_SUFFIX "") - endif () -endif () - -# Search for dependent libraries beside -set(_paraview_CMAKE_INSTALL_RPATH_save - "${CMAKE_INSTALL_RPATH}") -list(APPEND CMAKE_INSTALL_RPATH - "$ORIGIN") - -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}.") - endif () - - if (PARAVIEW_ENABLE_PYTHON) - find_package("Python${PARAVIEW_PYTHON_VERSION}" QUIET REQUIRED COMPONENTS Interpreter) - set(PYTHON_VERSION_MAJOR "${Python${PARAVIEW_PYTHON_VERSION}_VERSION_MAJOR}") - set(PYTHON_VERSION_MINOR "${Python${PARAVIEW_PYTHON_VERSION}_VERSION_MINOR}") - if (NOT PARAVIEW_PYTHON_SITE_PACKAGES_SUFFIX) - vtk_module_python_default_destination(PARAVIEW_PYTHON_SITE_PACKAGES_SUFFIX) - endif () - endif () -else () - set(vtk_requested_modules) - foreach (vtk_module IN LISTS paraview_requested_modules paraview_plugin_required_modules) - if (vtk_module MATCHES "ParaView::") - continue () - endif () - list(APPEND vtk_requested_modules - "${vtk_module}") - endforeach () - set(vtk_rejected_modules) - foreach (vtk_module IN LISTS paraview_rejected_modules) - if (vtk_module MATCHES "ParaView::") - continue () - endif () - list(APPEND vtk_rejected_modules - "${vtk_module}") - endforeach () - - cmake_dependent_option(PARAVIEW_BUILD_VTK_TESTING "" OFF - "PARAVIEW_BUILD_TESTING" OFF) - set(vtk_enable_tests "OFF") - if (PARAVIEW_BUILD_VTK_TESTING) - set(vtk_enable_tests "${PARAVIEW_BUILD_TESTING}") - # Needed for `rtImageTest.py` tests to work. See note in `vtkModuleTesting` - # about this. - set(VTK_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/VTK") - endif () - - # Forward Python option to VTK. - set(VTK_WRAP_PYTHON "${PARAVIEW_ENABLE_PYTHON}") - - # Forward MPI option to VTK. - set(VTK_USE_MPI "${PARAVIEW_USE_MPI}") - - # Forward logging option to VTK. - set(VTK_ENABLE_LOGGING "${PARAVIEW_ENABLE_LOGGING}") - if (PARAVIEW_ENABLE_LOGGING) - list(APPEND vtk_requested_modules VTK::loguru) - endif() - - if (use_vtk_remote_modules) - if (PARAVIEW_ENABLE_MOMENTINVARIANTS) - set(VTK_MODULE_ENABLE_VTK_MomentInvariants WANT) - endif() - # include the Remote module - include("${CMAKE_CURRENT_SOURCE_DIR}/VTK/CMake/vtkDownload.cmake") - # TODO: remove this after changing in vtkModuleRemote.cmake:160 - # "${VTK_SOURCE_DIR}/Remote/${_name}" to "${CMAKE_CURRENT_LIST_DIR}/${_name}" - set(VTK_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/VTK") - add_subdirectory(VTK/Remote) - endif() - - vtk_module_find_modules(vtk_module_files "${CMAKE_CURRENT_SOURCE_DIR}/VTK") - vtk_module_find_kits(vtk_kit_files "${CMAKE_CURRENT_SOURCE_DIR}/VTK") - vtk_module_scan( - MODULE_FILES ${vtk_module_files} - KIT_FILES ${vtk_kit_files} - REQUEST_MODULES ${vtk_requested_modules} - ${paraview_required_modules} - REJECT_MODULES ${vtk_rejected_modules} - PROVIDES_MODULES vtk_modules - PROVIDES_KITS vtk_kits - REQUIRES_MODULES vtk_required_modules - UNRECOGNIZED_MODULES vtk_unrecognized_modules - WANT_BY_DEFAULT OFF - ENABLE_TESTS "${vtk_enable_tests}" - HIDE_MODULES_FROM_CACHE ON) - - if (vtk_required_modules OR vtk_unrecognized_modules) - message(FATAL_ERROR - "The following modules were requested or required, but not found: " - "${vtk_required_modules};${vtk_unrecognized_modules}.") - endif () - - if (PARAVIEW_ENABLE_PYTHON) - find_package("Python${PARAVIEW_PYTHON_VERSION}" QUIET REQUIRED COMPONENTS Interpreter) - set(PYTHON_VERSION_MAJOR "${Python${PARAVIEW_PYTHON_VERSION}_VERSION_MAJOR}") - set(PYTHON_VERSION_MINOR "${Python${PARAVIEW_PYTHON_VERSION}_VERSION_MINOR}") - if (NOT PARAVIEW_PYTHON_SITE_PACKAGES_SUFFIX) - vtk_module_python_default_destination(PARAVIEW_PYTHON_SITE_PACKAGES_SUFFIX) - endif () - set(VTK_PYTHON_SITE_PACKAGES_SUFFIX "${PARAVIEW_PYTHON_SITE_PACKAGES_SUFFIX}") - endif () - - set(VTK_BUILD_QT_DESIGNER_PLUGIN OFF) - set(VTK_INSTALL_PYTHON_EXES OFF) - - cmake_dependent_option(VTK_NO_PYTHON_THREADS "Disable Python Threads support" ON - "PARAVIEW_ENABLE_PYTHON" OFF) - mark_as_advanced(VTK_NO_PYTHON_THREADS) - cmake_dependent_option(VTK_PYTHON_FULL_THREADSAFE "Wrap all Python calls with the GIL" ON - "NOT VTK_NO_PYTHON_THREADS" OFF) - mark_as_advanced(VTK_PYTHON_FULL_THREADSAFE) - cmake_dependent_option(VTK_USE_TK "Build VTK with Tk support" OFF - "PARAVIEW_ENABLE_PYTHON" OFF) - - vtk_module_build( - MODULES ${vtk_modules} - KITS ${vtk_kits} - PACKAGE VTK - INSTALL_EXPORT VTK - HEADERS_DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/paraview${paraview_version_suffix}" - CMAKE_DESTINATION "${paraview_cmake_destination}/vtk" - HIERARCHY_DESTINATION "${CMAKE_INSTALL_LIBDIR}/vtk/hierarchy/${CMAKE_PROJECT_NAME}" - LIBRARY_NAME_SUFFIX "${PARAVIEW_CUSTOM_LIBRARY_SUFFIX}" - VERSION "${PARAVIEW_VERSION}" - SOVERSION "1" - TEST_DATA_TARGET ParaViewData - BUILD_WITH_KITS "${PARAVIEW_ENABLE_KITS}" - USE_EXTERNAL "${PARAVIEW_USE_EXTERNAL}" - TEST_INPUT_DATA_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/VTK/Testing" - TEST_OUTPUT_DATA_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/ExternalData/VTK/Testing") - - if (NOT PARAVIEW_USE_EXTERNAL_VTK) - set(vtk_cmake_dir - "${CMAKE_CURRENT_SOURCE_DIR}/VTK/CMake") - set(vtk_cmake_destination - "${paraview_cmake_destination}/vtk") - set(vtk_cmake_build_dir - "${CMAKE_CURRENT_BINARY_DIR}/${vtk_cmake_destination}") - set(VTK_RELOCATABLE_INSTALL - "${PARAVIEW_RELOCATABLE_INSTALL}") - include("${CMAKE_CURRENT_SOURCE_DIR}/VTK/CMake/vtkInstallCMakePackage.cmake") - endif () -endif () - -set(paraview_test_data_directory_input - "${CMAKE_CURRENT_SOURCE_DIR}/Testing") -set(paraview_test_data_directory_output - "${CMAKE_CURRENT_BINARY_DIR}/ExternalData") -set(_paraview_add_tests_default_data_directory - "${paraview_test_data_directory_output}") -set(_paraview_add_tests_default_test_data_target - "ParaViewData") - -vtk_module_build( - MODULES ${paraview_modules} - KITS ${paraview_kits} - INSTALL_EXPORT ParaView - HEADERS_DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/paraview${paraview_version_suffix}" - CMAKE_DESTINATION "${paraview_cmake_destination}" - HIERARCHY_DESTINATION "${CMAKE_INSTALL_LIBDIR}/vtk/hierarchy/${CMAKE_PROJECT_NAME}" - LIBRARY_NAME_SUFFIX "${PARAVIEW_CUSTOM_LIBRARY_SUFFIX}" - VERSION "${PARAVIEW_VERSION}" - SOVERSION "1" - TEST_DATA_TARGET ParaViewData - BUILD_WITH_KITS "${PARAVIEW_ENABLE_KITS}" - USE_EXTERNAL "${PARAVIEW_USE_EXTERNAL}" - TEST_INPUT_DATA_DIRECTORY "${paraview_test_data_directory_input}" - TEST_OUTPUT_DATA_DIRECTORY "${paraview_test_data_directory_output}") - -include(vtkModuleJson) -vtk_module_json( - MODULES "${vtk_modules}" - OUTPUT "vtk-modules.json") -vtk_module_json( - MODULES "${paraview_modules}" - OUTPUT "paraview-modules.json") - -paraview_plugin_build( - RUNTIME_DESTINATION "${CMAKE_INSTALL_BINDIR}" - LIBRARY_DESTINATION "${CMAKE_INSTALL_LIBDIR}" - LIBRARY_SUBDIRECTORY "paraview${paraview_version_suffix}/plugins" - PLUGINS_FILE_NAME ".plugins" - TARGET paraview_plugins - PLUGINS ${paraview_plugins}) - -set(CMAKE_INSTALL_RPATH - "${_paraview_CMAKE_INSTALL_RPATH_save}") - -vtk_module_wrap_client_server( - MODULES ${paraview_modules} - ${vtk_modules} - TARGET paraview_client_server - INSTALL_EXPORT ParaView) - -paraview_server_manager_process( - MODULES ${paraview_modules} - ${vtk_modules} - TARGET paraview_server_manager - XML_FILES paraview_server_manager_files - INSTALL_EXPORT ParaView) - -if (PARAVIEW_ENABLE_PYTHON) - if (PARAVIEW_USE_EXTERNAL_VTK) - # TODO: Check if VTK is already wrapped in Python. - # Error out? - else () - vtk_module_wrap_python( - MODULES ${vtk_modules} - INSTALL_EXPORT VTKPython - PYTHON_PACKAGE "vtkmodules" - MODULE_DESTINATION "${PARAVIEW_PYTHON_SITE_PACKAGES_SUFFIX}" - CMAKE_DESTINATION "${paraview_cmake_destination}/vtk" - LIBRARY_DESTINATION "${CMAKE_INSTALL_LIBDIR}" - WRAPPED_MODULES vtk_python_wrapped_modules - TARGET VTK::vtkpythonmodules) - - add_subdirectory(VTK/Wrapping/Python) - - export( - EXPORT VTKPython - NAMESPACE VTK:: - FILE "${CMAKE_BINARY_DIR}/${paraview_cmake_destination}/vtk/VTKPython-targets.cmake") - install( - EXPORT VTKPython - NAMESPACE VTK:: - FILE VTKPython-targets.cmake - DESTINATION "${paraview_cmake_destination}/vtk" - COMPONENT "development") - endif () - - get_property(vtk_required_python_modules GLOBAL - PROPERTY vtk_required_python_modules) - if (vtk_required_python_modules) - list(REMOVE_DUPLICATES vtk_required_python_modules) - endif () - string(REPLACE ";" "\n" vtk_required_python_modules "${vtk_required_python_modules}") - file(WRITE "${CMAKE_BINARY_DIR}/requirements.txt" - "${vtk_required_python_modules}\n") - - vtk_module_wrap_python( - MODULES ${paraview_modules} - INSTALL_EXPORT ParaViewPython - PYTHON_PACKAGE "paraview.modules" - MODULE_DESTINATION "${PARAVIEW_PYTHON_SITE_PACKAGES_SUFFIX}" - CMAKE_DESTINATION "${paraview_cmake_destination}" - LIBRARY_DESTINATION "${CMAKE_INSTALL_LIBDIR}" - WRAPPED_MODULES paraview_python_wrapped_modules - TARGET ParaView::pvpythonmodules) - - export( - EXPORT ParaViewPython - NAMESPACE ParaView:: - FILE "${CMAKE_BINARY_DIR}/${paraview_cmake_destination}/ParaViewPython-targets.cmake") - install( - EXPORT ParaViewPython - NAMESPACE ParaView:: - FILE ParaViewPython-targets.cmake - DESTINATION "${paraview_cmake_destination}" - COMPONENT "development") -endif () - -if (PARAVIEW_ENABLE_WEB) - configure_file( - "${CMAKE_CURRENT_SOURCE_DIR}/Web/package.json.in" - "${CMAKE_CURRENT_BINARY_DIR}/package.json" - @ONLY) -endif () - -if (PARAVIEW_ENABLE_COMMANDLINE_TOOLS) - add_subdirectory(CommandLineExecutables) -endif () -add_subdirectory(Applications) - -if (PARAVIEW_ENABLE_PYTHON) - add_subdirectory(Wrapping/Python) -endif () - -if (NOT PARAVIEW_USE_EXTERNAL_VTK) - # Configure the CTestCustom.cmake file for exclusions. - configure_file( - "${CMAKE_CURRENT_SOURCE_DIR}/VTK/CMake/CTestCustom.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/VTK/CTestCustom.cmake" - @ONLY) -endif () - -# Configure the CTestCustom.cmake file for exclusions. -configure_file( - "${paraview_cmake_dir}/CTestCustom.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/CTestCustom.cmake" - @ONLY) - -ExternalData_Add_Target(ParaViewData) - -set(paraview_cmake_build_dir - "${CMAKE_CURRENT_BINARY_DIR}/${paraview_cmake_destination}") -include("${CMAKE_CURRENT_SOURCE_DIR}/CMake/ParaViewInstallCMakePackage.cmake") - -set(is_git FALSE) -if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git") - set(is_git TRUE) -endif () - -if (NOT WIN32 AND is_git AND Git_FOUND AND NOT GIT_VERSION_STRING VERSION_LESS "2.18.0") - set(source_all) - if (PARAVIEW_SOURCE_TARBALL_TARGETS) - set(source_all ALL) - endif () - - add_custom_target(paraview-source ${source_all}) - foreach (format tgz txz zip) - add_custom_target("paraview-source-${format}" ${source_all} - COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/Utilities/Maintenance/create_tarballs.bash" - "--${format}" - WORKING_DIRECTORY - "${CMAKE_CURRENT_BINARY_DIR}" - COMMENT "Creating source tarball in ${format} format") - add_dependencies("paraview-source-${format}" - ParaViewData) - add_dependencies(paraview-source - "paraview-source-${format}") - endforeach () - # This is a hack. Git version 2.17 does NOT like running these in parallel and - # reports that a lockfile is already locked. In order for the build to succeed, - # force these to run in serial. - add_dependencies(paraview-source-tgz paraview-source-txz) - add_dependencies(paraview-source-txz paraview-source-zip) -endif () - -# This is the directory under which all generated docs, such as Doxygen and -# Sphinx generated docs, are placed. -if (NOT PARAVIEW_GENERATED_DOCUMENTATION_OUTPUT_DIRECTORY) - set(PARAVIEW_GENERATED_DOCUMENTATION_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/doc") -endif () - -#----------------------------------------------------------------------------- -# Build doxygen documentation. -if (PARAVIEW_BUILD_DEVELOPER_DOCUMENTATION) - add_subdirectory(Utilities/Doxygen) - add_subdirectory(Utilities/Sphinx) - add_subdirectory(Documentation) -endif() - -#------------------------------------------------------------------------------ -# Test to check install tree -#------------------------------------------------------------------------------ -if (BUILD_TESTING AND PARAVIEW_INSTALL_DEVELOPMENT_FILES) - add_test( NAME pv.TestDevelopmentInstall - COMMAND ${CMAKE_COMMAND} - -DPARAVIEW_BINARY_DIR:PATH=${CMAKE_BINARY_DIR} - -DPARAVIEW_INSTALL_DIR:PATH=${CMAKE_INSTALL_PREFIX} - -DPARAVIEW_SOURCE_DIR:PATH=${CMAKE_SOURCE_DIR} - -DPARAVIEW_TEST_DIR:PATH=${CMAKE_BINARY_DIR}/Testing/Temporary - -DPARAVIEW_CMAKE_DESTINATION:STRING=${paraview_cmake_destination} - -DCMAKE_GENERATOR:STRING=${CMAKE_GENERATOR} - -DCMAKE_GENERATOR_PLATFORM:STRING=${CMAKE_GENERATOR_PLATFORM} - -DCMAKE_GENERATOR_TOOLSET:STRING=${CMAKE_GENERATOR_TOOLSET} - -P ${CMAKE_CURRENT_SOURCE_DIR}/CMake/ParaViewTestInstall.cmake) - set_tests_properties(pv.TestDevelopmentInstall PROPERTIES - LABELS "paraview" - ENVIRONMENT "DESTDIR=${CMAKE_BINARY_DIR}/test-install") -endif() -#------------------------------------------------------------------------------ - -#------------------------------------------------------------------------------ -# Test to check that we can process all of the Catalyst editions -#------------------------------------------------------------------------------ -if (BUILD_TESTING AND PARAVIEW_ENABLE_PYTHON AND UNIX AND NOT APPLE) -if (FALSE) # XXX(FIXME) - # disabling till we Catalyst editions are fixed post modularization - add_test( NAME GenerateCatalystEditions - COMMAND ${CMAKE_COMMAND} - -DPYTHON_EXECUTABLE:FILEPATH=${PYTHON_EXECUTABLE} - -DPARAVIEW_SOURCE_DIR:PATH=${CMAKE_SOURCE_DIR} - -DPARAVIEW_TEST_DIR:PATH=${CMAKE_BINARY_DIR}/Testing/Temporary - -P ${CMAKE_SOURCE_DIR}/CMake/ParaViewTestCatalystCodeGeneration.cmake) - set_tests_properties(GenerateCatalystEditions PROPERTIES - LABELS "paraview;catalyst") -endif() -endif() -#------------------------------------------------------------------------------ - -#----------------------------------------------------------------------------- -if (PARAVIEW_BUILD_CATALYST_ADAPTORS) - # BuildAdaptors.cmake builds the adaptors as a separate project. We mark is - # OPTIONAL for Catalyst packages that don't have the adaptors included. - include(${CMAKE_CURRENT_SOURCE_DIR}/CoProcessing/Adaptors/BuildAdaptors.cmake - OPTIONAL) -endif() - -#----------------------------------------------------------------------------- -if (PARAVIEW_ENABLE_EXAMPLES) - add_subdirectory(Examples) -endif () From 0b385fc1341152c779b325dd34c38cefe609fd47 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 12 Dec 2019 09:16:59 +0100 Subject: [PATCH 076/419] remove unused patch --- ports/paraview/VisIt _com.patch | 100 -------------------------------- 1 file changed, 100 deletions(-) delete mode 100644 ports/paraview/VisIt _com.patch diff --git a/ports/paraview/VisIt _com.patch b/ports/paraview/VisIt _com.patch deleted file mode 100644 index 3479403f0d1995..00000000000000 --- a/ports/paraview/VisIt _com.patch +++ /dev/null @@ -1,100 +0,0 @@ -diff --git a/b9aca022aa-7293debb5e-1/Library/VisItLib/CMake/VisItCommon.cmake b/b9aca022aa-7293debb5e/Library/VisItLib/CMake/VisItCommon.cmake -index 62338692c..292a30ab4 100644 ---- a/b9aca022aa-7293debb5e-1/Library/VisItLib/CMake/VisItCommon.cmake -+++ b/b9aca022aa-7293debb5e/Library/VisItLib/CMake/VisItCommon.cmake -@@ -200,9 +200,9 @@ set(HAVE_LIBEXODUSII 1) - # elsewhere for this. - #----------------------------------------------------------------------------- - include(CheckIncludeFiles) --#include(CMakeBackwardCompatibilityC) --#include(CMakeBackwardCompatibilityCXX) --#include(CheckTypeSize) -+include(CMakeBackwardCompatibilityC) -+include(CMakeBackwardCompatibilityCXX) -+include(CheckTypeSize) - include(CheckFunctionExists) - include(CheckSymbolExists) - include(TestBigEndian) -@@ -224,25 +224,25 @@ check_include_files (unistd.h HAVE_UNISTD_H) - check_include_files (stdbool.h HAVE_STDBOOL_H) - - # Check for type sizes, endian --check_type_size("bool" SIZEOF_BOOLEAN) --check_type_size("char" SIZEOF_CHAR) --check_type_size("double" SIZEOF_DOUBLE) --check_type_size("float" SIZEOF_FLOAT) --check_type_size("int" SIZEOF_INT) --check_type_size("long" SIZEOF_LONG) --check_type_size("long double" SIZEOF_LONG_DOUBLE) --check_type_size("long float" SIZEOF_LONG_FLOAT) --check_type_size("long long" SIZEOF_LONG_LONG) --check_type_size("short" SIZEOF_SHORT) --check_type_size("char" SIZEOF_UNSIGNED_CHAR) --check_type_size("int" SIZEOF_UNSIGNED_INT) --check_type_size("unsigned long" SIZEOF_UNSIGNED_LONG) --check_type_size("unsigned long long" SIZEOF_UNSIGNED_LONG_LONG) --check_type_size("short" SIZEOF_UNSIGNED_SHORT) --check_type_size("void*" SIZEOF_VOID_P) -+set(SIZEOF_BOOLEAN ${CMAKE_SIZEOF_BOOLEAN}) -+set(SIZEOF_CHAR ${CMAKE_SIZEOF_CHAR}) -+set(SIZEOF_DOUBLE ${CMAKE_SIZEOF_DOUBLE}) -+set(SIZEOF_FLOAT ${CMAKE_SIZEOF_FLOAT}) -+set(SIZEOF_INT ${CMAKE_SIZEOF_INT}) -+set(SIZEOF_LONG ${CMAKE_SIZEOF_LONG}) -+set(SIZEOF_LONG_DOUBLE ${CMAKE_SIZEOF_LONG_DOUBLE}) -+set(SIZEOF_LONG_FLOAT ${CMAKE_SIZEOF_LONG_FLOAT}) -+set(SIZEOF_LONG_LONG ${CMAKE_SIZEOF_LONG_LONG}) -+set(SIZEOF_SHORT ${CMAKE_SIZEOF_SHORT}) -+set(SIZEOF_UNSIGNED_CHAR ${CMAKE_SIZEOF_UNSIGNED_CHAR}) -+set(SIZEOF_UNSIGNED_INT ${CMAKE_SIZEOF_UNSIGNED_INT}) -+set(SIZEOF_UNSIGNED_LONG ${CMAKE_SIZEOF_UNSIGNED_LONG}) -+set(SIZEOF_UNSIGNED_LONG_LONG ${CMAKE_SIZEOF_UNSIGNED_LONG_LONG}) -+set(SIZEOF_UNSIGNED_SHORT ${CMAKE_SIZEOF_UNSIGNED_SHORT}) -+set(SIZEOF_VOID_P ${CMAKE_SIZEOF_VOID_P}) - set(CMAKE_REQUIRED_DEFINITIONS -D_LARGEFILE64_SOURCE) - check_type_size("off64_t" SIZEOF_OFF64_T) --#test_big_endian(WORDS_BIGENDIAN) -+test_big_endian(WORDS_BIGENDIAN) - - # manually check for socklen_t as CHECK_SYMBOL_EXISTS - # doesn't appear to work on linux (at least) -diff --git a/b9aca022aa-7293debb5e-1/Library/VisItLib/visit_vtk/lightweight/vtkUnstructuredGridFacelistFilter.C b/b9aca022aa-7293debb5e/Library/VisItLib/visit_vtk/lightweight/vtkUnstructuredGridFacelistFilter.C -index 02bdc59fb..5e4a9e570 100644 ---- a/b9aca022aa-7293debb5e-1/Library/VisItLib/visit_vtk/lightweight/vtkUnstructuredGridFacelistFilter.C -+++ b/b9aca022aa-7293debb5e/Library/VisItLib/visit_vtk/lightweight/vtkUnstructuredGridFacelistFilter.C -@@ -1869,7 +1869,7 @@ LoopOverVertexCells(vtkUnstructuredGrid *input, vtkPolyData *output, - vtkIdType cellId; - vtkIdType newCellId; - vtkIdType npts; -- const vtkIdType *pts; -+ vtkIdType *pts; - for (cellId=0, Connectivity->InitTraversal(); - Connectivity->GetNextCell(npts,pts); - cellId++) -@@ -1921,7 +1921,7 @@ LoopOverLineCells(vtkUnstructuredGrid *input, vtkPolyData *output, - vtkIdType cellId; - vtkIdType newCellId; - vtkIdType npts; -- const vtkIdType *pts; -+ vtkIdType *pts; - for (cellId=0, Connectivity->InitTraversal(); - Connectivity->GetNextCell(npts,pts); - cellId++) -@@ -1982,7 +1982,7 @@ LoopOverPolygonCells(vtkUnstructuredGrid *input, vtkPolyData *output, - vtkIdType cellId; - vtkIdType newCellId; - vtkIdType npts; -- const vtkIdType *pts; -+ vtkIdType *pts; - for (cellId=0, Connectivity->InitTraversal(); - Connectivity->GetNextCell(npts,pts); - cellId++) -@@ -2040,7 +2040,7 @@ LoopOverStripCells(vtkUnstructuredGrid *input, vtkPolyData *output, - vtkIdType cellId; - vtkIdType newCellId; - vtkIdType npts; -- const vtkIdType *pts; -+ vtkIdType *pts; - for (cellId=0, Connectivity->InitTraversal(); - Connectivity->GetNextCell(npts,pts); - cellId++) From efa6d32df5f1d5d6a140661aca27d84c8c63bf02 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 12 Dec 2019 09:21:22 +0100 Subject: [PATCH 077/419] remove old patches --- ports/vtk/old/FindGDAL.cmake | 127 ------------------- ports/vtk/old/fix-find-lz4.patch | 20 --- ports/vtk/old/fix-find-lzma.patch | 16 --- ports/vtk/old/fix-proj4.patch | 175 --------------------------- ports/vtk/old/fix-pugixml-link.patch | 59 --------- ports/vtk/old/fix_ogg_linkage.patch | 12 -- ports/vtk/old/hdf5_static.patch | 22 ---- 7 files changed, 431 deletions(-) delete mode 100644 ports/vtk/old/FindGDAL.cmake delete mode 100644 ports/vtk/old/fix-find-lz4.patch delete mode 100644 ports/vtk/old/fix-find-lzma.patch delete mode 100644 ports/vtk/old/fix-proj4.patch delete mode 100644 ports/vtk/old/fix-pugixml-link.patch delete mode 100644 ports/vtk/old/fix_ogg_linkage.patch delete mode 100644 ports/vtk/old/hdf5_static.patch diff --git a/ports/vtk/old/FindGDAL.cmake b/ports/vtk/old/FindGDAL.cmake deleted file mode 100644 index e4f2f303be3bca..00000000000000 --- a/ports/vtk/old/FindGDAL.cmake +++ /dev/null @@ -1,127 +0,0 @@ -# Distributed under the OSI-approved BSD 3-Clause License. See accompanying -# file Copyright.txt or https://cmake.org/licensing for details. - -#.rst: -# FindGDAL -# -------- -# -# -# -# Locate gdal -# -# This module accepts the following environment variables: -# -# :: -# -# GDAL_DIR or GDAL_ROOT - Specify the location of GDAL -# -# -# -# This module defines the following CMake variables: -# -# :: -# -# GDAL_FOUND - True if libgdal is found -# GDAL_LIBRARY - A variable pointing to the GDAL library -# GDAL_INCLUDE_DIR - Where to find the headers - -# -# $GDALDIR is an environment variable that would -# correspond to the ./configure --prefix=$GDAL_DIR -# used in building gdal. -# -# Created by Eric Wing. I'm not a gdal user, but OpenSceneGraph uses it -# for osgTerrain so I whipped this module together for completeness. -# I actually don't know the conventions or where files are typically -# placed in distros. -# Any real gdal users are encouraged to correct this (but please don't -# break the OS X framework stuff when doing so which is what usually seems -# to happen). - -# This makes the presumption that you are include gdal.h like -# -#include "gdal.h" - -find_path(GDAL_INCLUDE_DIR gdal.h - HINTS - ENV GDAL_DIR - ENV GDAL_ROOT - PATH_SUFFIXES - include/gdal - include/GDAL - include - PATHS - ~/Library/Frameworks/gdal.framework/Headers - /Library/Frameworks/gdal.framework/Headers - /sw # Fink - /opt/local # DarwinPorts - /opt/csw # Blastwave - /opt -) - -if(UNIX) - # Use gdal-config to obtain the library version (this should hopefully - # allow us to -lgdal1.x.y where x.y are correct version) - # For some reason, libgdal development packages do not contain - # libgdal.so... - find_program(GDAL_CONFIG gdal-config - HINTS - ENV GDAL_DIR - ENV GDAL_ROOT - PATH_SUFFIXES bin - PATHS - /sw # Fink - /opt/local # DarwinPorts - /opt/csw # Blastwave - /opt - ) - - if(GDAL_CONFIG) - exec_program(${GDAL_CONFIG} ARGS --libs OUTPUT_VARIABLE GDAL_CONFIG_LIBS) - if(GDAL_CONFIG_LIBS) - string(REGEX MATCHALL "-l[^ ]+" _gdal_dashl ${GDAL_CONFIG_LIBS}) - string(REPLACE "-l" "" _gdal_lib "${_gdal_dashl}") - string(REGEX MATCHALL "-L[^ ]+" _gdal_dashL ${GDAL_CONFIG_LIBS}) - string(REPLACE "-L" "" _gdal_libpath "${_gdal_dashL}") - endif() - endif() -endif() - -find_library(GDAL_LIBRARY_RELEASE - NAMES ${_gdal_lib} gdal gdal_i gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL - HINTS - ENV GDAL_DIR - ENV GDAL_ROOT - ${_gdal_libpath} - PATH_SUFFIXES lib - PATHS - /sw - /opt/local - /opt/csw - /opt - /usr/freeware -) - -find_library(GDAL_LIBRARY_DEBUG - NAMES ${_gdal_lib} gdald gdald_i gdald1.5.0 gdald1.4.0 gdald1.3.2 GDALD - HINTS - ENV GDAL_DIR - ENV GDAL_ROOT - ${_gdal_libpath} - PATH_SUFFIXES lib - PATHS - /sw - /opt/local - /opt/csw - /opt - /usr/freeware -) - -include(SelectLibraryConfigurations) -select_library_configurations(GDAL) - -include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(GDAL DEFAULT_MSG GDAL_LIBRARY GDAL_INCLUDE_DIR) - -set(GDAL_LIBRARIES ${GDAL_LIBRARY}) -set(GDAL_INCLUDE_DIRS ${GDAL_INCLUDE_DIR}) diff --git a/ports/vtk/old/fix-find-lz4.patch b/ports/vtk/old/fix-find-lz4.patch deleted file mode 100644 index 488640de8b4116..00000000000000 --- a/ports/vtk/old/fix-find-lz4.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/CMake/FindLZ4.cmake b/CMake/FindLZ4.cmake -index 07343e1f79..b43a9af2c7 100644 ---- a/CMake/FindLZ4.cmake -+++ b/CMake/FindLZ4.cmake -@@ -1,7 +1,13 @@ -- --find_library(LZ4_LIBRARIES NAMES lz4) -+find_library(LZ4_LIBRARY NAMES lz4 PATH_SUFFIXES lib) -+find_library(LZ4_LIBRARY_DEBUG NAMES lz4d PATH_SUFFIXES debug/lib) - find_path(LZ4_INCLUDE_DIRS NAMES lz4.h) - -+if(NOT LZ4_LIBRARY_DEBUG) -+ set(LZ4_LIBRARY_DEBUG ${LZ4_LIBRARY}) -+endif(NOT LZ4_LIBRARY_DEBUG) -+ -+set(LZ4_LIBRARIES optimized ${LZ4_LIBRARY} debug ${LZ4_LIBRARY_DEBUG}) -+ - include(FindPackageHandleStandardArgs) - find_package_handle_standard_args(LZ4 - DEFAULT_MSG diff --git a/ports/vtk/old/fix-find-lzma.patch b/ports/vtk/old/fix-find-lzma.patch deleted file mode 100644 index b2e375fc44a702..00000000000000 --- a/ports/vtk/old/fix-find-lzma.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/CMake/FindLZMA.cmake b/CMake/FindLZMA.cmake -index 213ab18df1..1e290da4cb 100644 ---- a/CMake/FindLZMA.cmake -+++ b/CMake/FindLZMA.cmake -@@ -1,7 +1,10 @@ - --find_library(LZMA_LIBRARIES NAMES lzma) -+find_library(LZMA_LIBRARY_RELEASE NAMES lzma PATH_SUFFIXES lib) -+find_library(LZMA_LIBRARY_DEBUG NAMES lzmad PATH_SUFFIXES debug/lib) - find_path(LZMA_INCLUDE_DIRS NAMES lzma.h) - -+select_library_configurations(LZMA) -+ - include(FindPackageHandleStandardArgs) - find_package_handle_standard_args(LZMA - DEFAULT_MSG diff --git a/ports/vtk/old/fix-proj4.patch b/ports/vtk/old/fix-proj4.patch deleted file mode 100644 index ad49b1523e3aa2..00000000000000 --- a/ports/vtk/old/fix-proj4.patch +++ /dev/null @@ -1,175 +0,0 @@ -diff --git a/Geovis/Core/vtkGeoProjection.cxx b/Geovis/Core/vtkGeoProjection.cxx -index f3a8852..8240603 100644 ---- a/Geovis/Core/vtkGeoProjection.cxx -+++ b/Geovis/Core/vtkGeoProjection.cxx -@@ -72,6 +72,9 @@ public: - } - - std::map< std::string, std::string > OptionalParameters; -+#if PROJ_VERSION_MAJOR >= 5 -+ PJ_PROJ_INFO ProjInfo; -+#endif - }; - - //----------------------------------------------------------------------------- -@@ -80,7 +83,7 @@ int vtkGeoProjection::GetNumberOfProjections() - if ( vtkGeoProjectionNumProj < 0 ) - { - vtkGeoProjectionNumProj = 0; -- for ( const PJ_LIST* pj = pj_get_list_ref(); pj && pj->id; ++ pj ) -+ for ( const PJ_LIST* pj = proj_list_operations(); pj && pj->id; ++ pj ) - ++ vtkGeoProjectionNumProj; - } - return vtkGeoProjectionNumProj; -@@ -91,7 +94,7 @@ const char* vtkGeoProjection::GetProjectionName( int projection ) - if ( projection < 0 || projection >= vtkGeoProjection::GetNumberOfProjections() ) - return nullptr; - -- return pj_get_list_ref()[projection].id; -+ return proj_list_operations()[projection].id; - } - //----------------------------------------------------------------------------- - const char* vtkGeoProjection::GetProjectionDescription( int projection ) -@@ -99,7 +102,7 @@ const char* vtkGeoProjection::GetProjectionDescription( int projection ) - if ( projection < 0 || projection >= vtkGeoProjection::GetNumberOfProjections() ) - return nullptr; - -- return pj_get_list_ref()[projection].descr[0]; -+ return proj_list_operations()[projection].descr[0]; - } - //----------------------------------------------------------------------------- - vtkGeoProjection::vtkGeoProjection() -@@ -144,7 +147,7 @@ void vtkGeoProjection::PrintSelf( ostream& os, vtkIndent indent ) - int vtkGeoProjection::GetIndex() - { - int i = 0; -- for ( const PJ_LIST* proj = pj_get_list_ref(); proj && proj->id; ++ proj, ++ i ) -+ for ( const PJ_LIST* proj = proj_list_operations(); proj && proj->id; ++ proj, ++ i ) - { - if ( ! strcmp( proj->id, this->Name ) ) - { -@@ -161,7 +164,11 @@ const char* vtkGeoProjection::GetDescription() - { - return nullptr; - } -+#if PROJ_VERSION_MAJOR >= 5 -+ return this->Internals->ProjInfo.description; -+#else - return this->Projection->descr; -+#endif - } - //----------------------------------------------------------------------------- - projPJ vtkGeoProjection::GetProjection() -@@ -232,6 +239,9 @@ int vtkGeoProjection::UpdateProjection() - this->ProjectionMTime = this->GetMTime(); - if ( this->Projection ) - { -+#if PROJ_VERSION_MAJOR >= 5 -+ this->Internals->ProjInfo = proj_pj_info(this->Projection); -+#endif - return 0; - } - return 1; -diff --git a/Geovis/Core/vtkGeoTransform.cxx b/Geovis/Core/vtkGeoTransform.cxx -index aeeabc1..b80a8c0 100644 ---- a/Geovis/Core/vtkGeoTransform.cxx -+++ b/Geovis/Core/vtkGeoTransform.cxx -@@ -167,9 +167,17 @@ void vtkGeoTransform::InternalTransformPoints( double* x, vtkIdType numPts, int - double* coord = x; - for ( vtkIdType i = 0; i < numPts; ++ i ) - { -+#if PROJ_VERSION_MAJOR >= 5 -+ xy.x = coord[0]; xy.y = coord[1]; -+#else - xy.u = coord[0]; xy.v = coord[1]; -+#endif - lp = pj_inv( xy, src ); -+#if PROJ_VERSION_MAJOR >= 5 -+ coord[0] = lp.lam; coord[1] = lp.phi; -+#else - coord[0] = lp.u; coord[1] = lp.v; -+#endif - coord += stride; - } - } -@@ -191,9 +199,17 @@ void vtkGeoTransform::InternalTransformPoints( double* x, vtkIdType numPts, int - double* coord = x; - for ( vtkIdType i = 0; i < numPts; ++ i ) - { -+#if PROJ_VERSION_MAJOR >= 5 -+ lp.lam = coord[0]; lp.phi = coord[1]; -+#else - lp.u = coord[0]; lp.v = coord[1]; -+#endif - xy = pj_fwd( lp, dst ); -+#if PROJ_VERSION_MAJOR >= 5 -+ coord[0] = xy.x; coord[1] = xy.y; -+#else - coord[0] = xy.u; coord[1] = xy.v; -+#endif - coord += stride; - } - } -diff --git a/ThirdParty/libproj/CMakeLists.txt b/ThirdParty/libproj/CMakeLists.txt -index a19609e..e23e44b 100644 ---- a/ThirdParty/libproj/CMakeLists.txt -+++ b/ThirdParty/libproj/CMakeLists.txt -@@ -1,4 +1,9 @@ - vtk_module_third_party(LibPROJ - LIBRARIES vtklibproj -+ USE_VARIABLES LibPROJ_MAJOR_VERSION - INCLUDE_DIRS ${vtklibproj_SOURCE_DIR}/vtklibproj - ${vtklibproj_BINARY_DIR}/vtklibproj) -+ -+if (NOT VTK_MODULE_USE_EXTERNAL_VTK_libproj) -+ set(LibPROJ_MAJOR_VERSION "4") -+endif () -\ No newline at end of file -diff --git a/ThirdParty/libproj/vtk_libproj.h.in b/ThirdParty/libproj/vtk_libproj.h.in -index cd9edc3..d441a1a 100644 ---- a/ThirdParty/libproj/vtk_libproj.h.in -+++ b/ThirdParty/libproj/vtk_libproj.h.in -@@ -17,8 +17,23 @@ - - /* Use the libproj library configured for VTK. */ - #cmakedefine VTK_USE_SYSTEM_LIBPROJ -+ -+#define VTK_LibPROJ_MAJOR_VERSION @LibPROJ_MAJOR_VERSION@ -+ -+#if VTK_LibPROJ_MAJOR_VERSION < 5 -+# define PROJ_VERSION_MAJOR @LibPROJ_MAJOR_VERSION@ -+# define proj_list_operations pj_get_list_ref -+#endif - #ifdef VTK_USE_SYSTEM_LIBPROJ --# include -+# if VTK_LibPROJ_MAJOR_VERSION >= 5 -+# include -+# endif -+# if VTK_LibPROJ_MAJOR_VERSION < 6 -+# include -+# endif -+# if VTK_LibPROJ_MAJOR_VERSION >= 6 -+# define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H 1 -+# endif - # include - # include - #else -diff --git a/CMake/FindLibPROJ.cmake b/CMake/FindLibPROJ.cmake -index 2d8301d..d8d08cd 100644 ---- a/CMake/FindLibPROJ.cmake -+++ b/CMake/FindLibPROJ.cmake -@@ -5,6 +5,14 @@ - # LibPROJ_LIBRARIES to libproj4 and any dependent libraries - # If LibPROJ_REQUIRED is defined, then a fatal error message will be generated if libproj4 is not found - -+find_package(PROJ4 6 CONFIG REQUIRED) -+if (PROJ4_FOUND) -+ set(LibPROJ_FOUND 1) -+ set(LibPROJ_INCLUDE_DIR ${PROJ4_INCLUDE_DIRS}) -+ set(LibPROJ_LIBRARIES ${PROJ_LIBRARY}) -+ set(LibPROJ_MAJOR_VERSION 6) -+endif() -+ - if ( NOT LibPROJ_INCLUDE_DIR OR NOT LibPROJ_LIBRARIES OR NOT LibPROJ_FOUND ) - - if ( $ENV{LibPROJ_DIR} ) diff --git a/ports/vtk/old/fix-pugixml-link.patch b/ports/vtk/old/fix-pugixml-link.patch deleted file mode 100644 index 8dee44546fec71..00000000000000 --- a/ports/vtk/old/fix-pugixml-link.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff --git a/IO/CityGML/CMakeLists.txt b/IO/CityGML/CMakeLists.txt -index ce979ba..322e2de 100644 ---- a/IO/CityGML/CMakeLists.txt -+++ b/IO/CityGML/CMakeLists.txt -@@ -4,8 +4,8 @@ vtk_module_library(vtkIOCityGML ${Module_SRCS}) - # pugixml does not set _INCLUDE_DIRS or _LIBRARIES --if(VTK_USE_SYSTEM_PUGIXML AND NOT pugixml_INCLUDE_DIRS) -- find_package(pugixml REQUIRED) -+if(VTK_USE_SYSTEM_PUGIXML) -+ find_package(pugixml REQUIRED) - get_target_property(pugixml_INCLUDE_DIRS pugixml INTERFACE_INCLUDE_DIRECTORIES) -- get_target_property(pugixml_LIBRARIES pugixml LOCATION) -+ #get_target_property(pugixml_LIBRARIES pugixml LOCATION) # set by portfile! - include_directories(${pugixml_INCLUDE_DIRS}) - vtk_module_link_libraries(vtkIOCityGML LINK_PRIVATE ${pugixml_LIBRARIES}) - endif() -diff --git a/ThirdParty/pugixml/CMakeLists.txt b/ThirdParty/pugixml/CMakeLists.txt -index 19dcb774e..a3d0b3fba 100644 ---- a/ThirdParty/pugixml/CMakeLists.txt -+++ b/ThirdParty/pugixml/CMakeLists.txt -@@ -1,10 +1,22 @@ - vtk_module_third_party(pugixml - LIBRARIES vtkpugixml -- INCLUDE_DIRS ${vtkpugixml_SOURCE_DIR}/vtkpugixml -- ${vtkpugixml_BINARY_DIR}/vtkpugixml -- NO_ADD_SUBDIRECTORY) -+ INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/vtkpugixml -+ ${CMAKE_CURRENT_BINARY_DIR}/vtkpugixml -+ ) - --vtk_module_export_info() --add_subdirectory(vtkpugixml) -+#vtk_module_export_info() -+#if(NOT VTK_USE_SYSTEM_PUGIXML) -+# add_subdirectory(vtkpugixml) -+#endif() -+#vtk_target_export(vtkpugixml) - --vtk_target_export(vtkpugixml) -+configure_file( -+ "${CMAKE_CURRENT_SOURCE_DIR}/vtk_pugixml.h.in" -+ "${CMAKE_CURRENT_BINARY_DIR}/vtk_pugixml.h") -+ -+if (NOT VTK_INSTALL_NO_DEVELOPMENT) -+ install(FILES -+ "${CMAKE_CURRENT_BINARY_DIR}/vtk_pugixml.h" -+ DESTINATION "${VTK_INSTALL_INCLUDE_DIR}" -+ COMPONENT Development) -+endif() -diff --git a/ThirdParty/pugixml/module.cmake b/ThirdParty/pugixml/module.cmake -index 3a920d1d1..572dab7b1 100644 ---- a/ThirdParty/pugixml/module.cmake -+++ b/ThirdParty/pugixml/module.cmake -@@ -1 +1,5 @@ -+if (VTK_USE_SYSTEM_PUGIXML) -+ message(STATUS "PUGIXML-LIBS:${pugixml_LIBRARIES}") -+ set(vtkpugixml_LIBRARIES ${pugixml_LIBRARIES}) -+endif () - vtk_module(vtkpugixml EXCLUDE_FROM_WRAPPING) diff --git a/ports/vtk/old/fix_ogg_linkage.patch b/ports/vtk/old/fix_ogg_linkage.patch deleted file mode 100644 index c7f22f4c8f0369..00000000000000 --- a/ports/vtk/old/fix_ogg_linkage.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/IO/Movie/module.cmake b/IO/Movie/module.cmake -index 4275171..88204ad 100644 ---- a/IO/Movie/module.cmake -+++ b/IO/Movie/module.cmake -@@ -14,6 +14,7 @@ vtk_module(vtkIOMovie - vtkIO - DEPENDS - ${vtkIOMovie_vtkoggtheora} -+ vtkogg - vtkCommonExecutionModel - PRIVATE_DEPENDS - vtkCommonCore diff --git a/ports/vtk/old/hdf5_static.patch b/ports/vtk/old/hdf5_static.patch deleted file mode 100644 index 52ade3f082f9c2..00000000000000 --- a/ports/vtk/old/hdf5_static.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/CMake/FindHDF5.cmake b/CMake/FindHDF5.cmake -index 6d558e39..c301e165 100644 ---- a/CMake/FindHDF5.cmake -+++ b/CMake/FindHDF5.cmake -@@ -8,7 +8,16 @@ if(CMAKE_VERSION VERSION_LESS 3.6.1) - else() - include(${CMAKE_ROOT}/Modules/FindHDF5.cmake) - endif() -- -+#It would be better if VTK would actually use HDF5 & SZIP targets. -+#But current module load order is wrong which will lead to the target being used before it is defined! -+if("${HDF5_LIBRARIES}" MATCHES "libhdf5") -+ find_library(SZIP_LIBRARY_RELEASE NAMES sz libsz szip libszip NAMES_PER_DIR) -+ find_library(SZIP_LIBRARY_DEBUG NAMES sz_d libsz_d szip_d libszip_d NAMES_PER_DIR) -+ select_library_configurations(SZIP) -+ list(APPEND HDF5_LIBRARIES "${SZIP_LIBRARIES}") -+ find_package(ZLIB) -+ list(APPEND HDF5_LIBRARIES "${ZLIB_LIBRARIES}") -+endif() - if(HDF5_FOUND AND (HDF5_IS_PARALLEL OR HDF5_ENABLE_PARALLEL)) - include(vtkMPI) - if(MPI_C_INCLUDE_PATH) From 1e20e99923c846610305d24723dd4f0424d2bde3 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 12 Dec 2019 13:36:48 +0100 Subject: [PATCH 078/419] remove undef for correct linakge of python --- ports/vtk/NoUndefDebug.patch | 13 +++++++++++++ ports/vtk/portfile.cmake | 1 + 2 files changed, 14 insertions(+) create mode 100644 ports/vtk/NoUndefDebug.patch diff --git a/ports/vtk/NoUndefDebug.patch b/ports/vtk/NoUndefDebug.patch new file mode 100644 index 00000000000000..3fc8f5de8cd558 --- /dev/null +++ b/ports/vtk/NoUndefDebug.patch @@ -0,0 +1,13 @@ +diff --git a/Utilities/Python/vtkPython.h b/Utilities/Python/vtkPython.h +index 166f24104..79ae1d371 100644 +--- a/Utilities/Python/vtkPython.h ++++ b/Utilities/Python/vtkPython.h +@@ -50,7 +50,7 @@ + # include + # include + # include +-# undef _DEBUG ++ + # if defined(_MSC_VER) + # define _CRT_NOFORCE_MANIFEST 1 + # endif diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 7d86c4ea69b117..fcefd42aa690f9 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -88,6 +88,7 @@ vcpkg_from_github( vtkm.patch # To include an external VTKm build (v.1.3 required) exportalldependinfo.patch # This one is already in master and is seems to be required by paraview to wrap the client server code pythonwrapper.patch # + NoUndefDebug.patch # Last patch TODO: Patch out internal loguru ) From fb99d7b0d29366207cfed6e96ef93372cfabd90e Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 12 Dec 2019 16:32:23 +0100 Subject: [PATCH 079/419] fix post build validation --- ports/paraview/portfile.cmake | 44 ++++++++++++++++++++++++++++++++--- 1 file changed, 41 insertions(+), 3 deletions(-) diff --git a/ports/paraview/portfile.cmake b/ports/paraview/portfile.cmake index b319e3e7690e03..7ca9d822ebb898 100644 --- a/ports/paraview/portfile.cmake +++ b/ports/paraview/portfile.cmake @@ -113,10 +113,48 @@ vcpkg_install_cmake(ADD_BIN_TO_PATH) # # Moves all .cmake files from /debug/share/paraview/ to /share/paraview/ # # See /docs/maintainers/vcpkg_fixup_cmake_targets.md for more details -# vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/paraview) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/paraview-5.7) -# # Handle copyright -# file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/paraview RENAME copyright) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +set(TOOLVER pv5.7) +set(TOOLS paraview + pvbatch + pvdataserver + pvpython + pvrenderserver + pvserver + smTestDriver + vtkProcessXML + vtkWrapClientServer) + +foreach(tool ${TOOLS}) + # Remove debug tools + set(filename ${CURRENT_PACKAGES_DIR}/debug/bin/${tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}) + if(EXISTS ${filename}) + file(REMOVE ${filename}) + endif() + set(filename ${CURRENT_PACKAGES_DIR}/debug/bin/${tool}-${TOOLVER}${VCPKG_TARGET_EXECUTABLE_SUFFIX}) + if(EXISTS ${filename}) + file(REMOVE ${filename}) + endif() + + # Move release tools + set(filename ${CURRENT_PACKAGES_DIR}/bin/${tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}) + if(EXISTS ${filename}) + file(INSTALL ${filename} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) + file(REMOVE ${filename}) + endif() + set(filename ${CURRENT_PACKAGES_DIR}/bin/${tool}-${TOOLVER}${VCPKG_TARGET_EXECUTABLE_SUFFIX}) + if(EXISTS ${filename}) + file(INSTALL ${filename} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) + file(REMOVE ${filename}) + endif() +endforeach() +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) +# # Handle copyright + file(INSTALL ${SOURCE_PATH}/Copyright.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/paraview RENAME Copyright.txt) # Which one is the correct one? + file(INSTALL ${SOURCE_PATH}/License_v1.2.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/paraview RENAME copyright) # # Post-build test for cmake libraries # vcpkg_test_cmake(PACKAGE_NAME paraview) From 6f4696bec4f3a9700076552b65e0ee352bbdc280 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 12 Dec 2019 16:57:35 +0100 Subject: [PATCH 080/419] add fontconfig on linux so CI is less flaky in a full rebuild --- ports/qt5-base/CONTROL | 2 +- ports/qt5-base/portfile.cmake | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL index 4609b7e3f03f7b..11ee357a155fec 100644 --- a/ports/qt5-base/CONTROL +++ b/ports/qt5-base/CONTROL @@ -2,7 +2,7 @@ Source: qt5-base Version: 5.12.5-4 Homepage: https://www.qt.io/ Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components. -Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl, angle (!windows), egl-registry, icu (!uwp) +Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl, angle (!windows), egl-registry, icu (!uwp), fontconfig (!windows) Feature: latest Description: Build latest qt version (5.13.1) instead of LTS diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 11a01d0c6e8046..9baf570929e35e 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -106,6 +106,11 @@ find_library(SQLITE_RELEASE NAMES sqlite3 PATHS "${CURRENT_INSTALLED_DIR}/lib" N find_library(SQLITE_DEBUG NAMES sqlite3 sqlite3d PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) find_library(ICU_RELEASE NAMES icuuc libicuuc PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(ICU_DEBUG NAMES icuucd libicuucd iccuc libicuuc PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(FONTCONFIG_RELEASE NAMES fontconfig PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(FONTCONFIG_DEBUG NAMES fontconfig PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(EXPAT_RELEASE NAMES expat PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(EXPAT_DEBUG NAMES expat PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) + #Dependent libraries find_library(BZ2_RELEASE bz2 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(BZ2_DEBUG bz2 bz2d PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) @@ -122,7 +127,7 @@ set(RELEASE_OPTIONS "FREETYPE_LIBS=${FREETYPE_RELEASE} ${BZ2_RELEASE} ${LIBPNG_RELEASE} ${ZLIB_RELEASE}" "ICU_LIBS=${ICU_RELEASE}" "QMAKE_LIBS_PRIVATE+=${BZ2_RELEASE}" - "QMAKE_LIBS_PRIVATE+=${LIBPNG_RELEASE}" + "QMAKE_LIBS_PRIVATE+=${LIBPNG_RELEASE}" ) set(DEBUG_OPTIONS "LIBJPEG_LIBS=${JPEG_DEBUG}" @@ -159,6 +164,7 @@ if(VCPKG_TARGET_IS_WINDOWS) "OPENSSL_LIBS=${SSL_DEBUG} ${EAY_DEBUG} ws2_32.lib secur32.lib advapi32.lib shell32.lib crypt32.lib user32.lib gdi32.lib" ) elseif(VCPKG_TARGET_IS_LINUX) + list(APPEND CORE_OPTIONS -fontconfig) if (NOT EXISTS "/usr/include/GL/glu.h") message(FATAL_ERROR "qt5 requires libgl1-mesa-dev and libglu1-mesa-dev, please use your distribution's package manager to install them.\nExample: \"apt-get install libgl1-mesa-dev libglu1-mesa-dev\"") endif() @@ -167,14 +173,17 @@ elseif(VCPKG_TARGET_IS_LINUX) "SQLITE_LIBS=${SQLITE_RELEASE} -ldl -lpthread" "HARFBUZZ_LIBS=${HARFBUZZ_RELEASE}" "OPENSSL_LIBS=${SSL_RELEASE} ${EAY_RELEASE} -ldl -lpthread" + "FONTCONFIG_LIBS=${FONTCONFIG_RELEASE} ${FREETYPE_RELEASE} ${EXPAT_RELEASE}" ) list(APPEND DEBUG_OPTIONS "PSQL_LIBS=${PSQL_DEBUG} ${SSL_DEBUG} ${EAY_DEBUG} -ldl -lpthread" "SQLITE_LIBS=${SQLITE_DEBUG} -ldl -lpthread" "HARFBUZZ_LIBS=${HARFBUZZ_DEBUG}" "OPENSSL_LIBS=${SSL_DEBUG} ${EAY_DEBUG} -ldl -lpthread" + "FONTCONFIG_LIBS=${FONTCONFIG_DEBUG} ${FREETYPE_DEBUG} ${EXPAT_DEBUG}" ) elseif(VCPKG_TARGET_IS_OSX) + list(APPEND CORE_OPTIONS -fontconfig) if(DEFINED VCPKG_OSX_DEPLOYMENT_TARGET) set(ENV{QMAKE_MACOSX_DEPLOYMENT_TARGET} ${VCPKG_OSX_DEPLOYMENT_TARGET}) else() @@ -202,12 +211,14 @@ elseif(VCPKG_TARGET_IS_OSX) "SQLITE_LIBS=${SQLITE_RELEASE} -ldl -lpthread" "HARFBUZZ_LIBS=${HARFBUZZ_RELEASE} -framework ApplicationServices" "OPENSSL_LIBS=${SSL_RELEASE} ${EAY_RELEASE} -ldl -lpthread" + "FONTCONFIG_LIBS=${FONTCONFIG_RELEASE} ${FREETYPE_RELEASE} ${EXPAT_RELEASE}" ) list(APPEND DEBUG_OPTIONS "PSQL_LIBS=${PSQL_DEBUG} ${SSL_DEBUG} ${EAY_DEBUG} -ldl -lpthread" "SQLITE_LIBS=${SQLITE_DEBUG} -ldl -lpthread" "HARFBUZZ_LIBS=${HARFBUZZ_DEBUG} -framework ApplicationServices" "OPENSSL_LIBS=${SSL_DEBUG} ${EAY_DEBUG} -ldl -lpthread" + "FONTCONFIG_LIBS=${FONTCONFIG_DEBUG} ${FREETYPE_DEBUG} ${EXPAT_DEBUG}" ) endif() From f526cc066f2461faf14715bdd826f545a42a812d Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 12 Dec 2019 17:03:56 +0100 Subject: [PATCH 081/419] fix linkage dependent qt5-imageformats libs --- ports/qt5-imageformats/CONTROL | 4 ++-- ports/qt5-imageformats/portfile.cmake | 13 +++++++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ports/qt5-imageformats/CONTROL b/ports/qt5-imageformats/CONTROL index 1fe00cbdcd57a8..24108f974215b8 100644 --- a/ports/qt5-imageformats/CONTROL +++ b/ports/qt5-imageformats/CONTROL @@ -1,4 +1,4 @@ Source: qt5-imageformats -Version: 5.12.5-1 +Version: 5.12.5-2 Description: Qt5 Image Formats Module - Plugins for additional image formats: TIFF, MNG, TGA, WBMP -Build-Depends: qt5-base, tiff, libwebp +Build-Depends: qt5-base, tiff, libwebp, jasper diff --git a/ports/qt5-imageformats/portfile.cmake b/ports/qt5-imageformats/portfile.cmake index ad7f37070f3630..91e83883a2cd43 100644 --- a/ports/qt5-imageformats/portfile.cmake +++ b/ports/qt5-imageformats/portfile.cmake @@ -5,11 +5,18 @@ include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) list(APPEND CORE_OPTIONS -system-tiff -system-webp + -jasper + -no-mng # must be explicitly disabled to not automatically pick up mng -verbose) find_library(TIFF_RELEASE NAMES tiff PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) # Depends on lzma find_library(TIFF_DEBUG NAMES tiffd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(JASPER_RELEASE NAMES jasper PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(JASPER_DEBUG NAMES jasperd jasper libjasperd libjasper PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(FREEGLUT_RELEASE NAMES freeglut glut PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(FREEGLUT_DEBUG NAMES freeglutd freeglut glutd glut PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) + find_library(WEBP_RELEASE NAMES webp PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(WEBP_DEBUG NAMES webpd webp PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) find_library(WEBPDEMUX_RELEASE NAMES webpdemux PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) @@ -22,7 +29,9 @@ find_library(LZMA_RELEASE lzma PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_P find_library(LZMA_DEBUG lzmad lzma PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) set(OPT_REL "TIFF_LIBS=${TIFF_RELEASE} ${LZMA_RELEASE}" - "WEBP_LIBS=${WEBP_RELEASE} ${WEBPDEMUX_RELEASE}") + "WEBP_LIBS=${WEBP_RELEASE} ${WEBPDEMUX_RELEASE}" + "JASPER_LIBS=${JASPER_RELEASE} ${FREEGLUT_RELEASE}") # This will still fail if LIBWEBP is installed with all available features due to the missing additional dependencies set(OPT_DBG "TIFF_LIBS=${TIFF_DEBUG} ${LZMA_DEBUG}" - "WEBP_LIBS=${WEBP_DEBUG} ${WEBPDEMUX_DEBUG}") + "WEBP_LIBS=${WEBP_DEBUG} ${WEBPDEMUX_DEBUG}" + "JASPER_LIBS=${JASPER_DEBUG} ${FREEGLUT_DEBUG}") qt_submodule_installation(BUILD_OPTIONS ${CORE_OPTIONS} BUILD_OPTIONS_RELEASE ${OPT_REL} BUILD_OPTIONS_DEBUG ${OPT_DBG}) \ No newline at end of file From ba9ac274c4e6a224fb2e66c3eab331a79dd63829 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 12 Dec 2019 17:08:48 +0100 Subject: [PATCH 082/419] remove the remaining debug tools --- ports/paraview/portfile.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ports/paraview/portfile.cmake b/ports/paraview/portfile.cmake index 7ca9d822ebb898..caccdaa3cbcd48 100644 --- a/ports/paraview/portfile.cmake +++ b/ports/paraview/portfile.cmake @@ -139,6 +139,10 @@ foreach(tool ${TOOLS}) if(EXISTS ${filename}) file(REMOVE ${filename}) endif() + set(filename ${CURRENT_PACKAGES_DIR}/debug/bin/${tool}-${TOOLVER}d${VCPKG_TARGET_EXECUTABLE_SUFFIX}) + if(EXISTS ${filename}) + file(REMOVE ${filename}) + endif() # Move release tools set(filename ${CURRENT_PACKAGES_DIR}/bin/${tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}) From d32f561a2509a4b35da3f134a94bce1406d371ff Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 12 Dec 2019 21:15:33 +0100 Subject: [PATCH 083/419] Fix Wrapper for Linux and add other platform libs to Qt5::Core --- ports/qt5-base/vcpkg-cmake-wrapper.cmake | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/ports/qt5-base/vcpkg-cmake-wrapper.cmake b/ports/qt5-base/vcpkg-cmake-wrapper.cmake index bb922622806df9..799eeb919242fd 100644 --- a/ports/qt5-base/vcpkg-cmake-wrapper.cmake +++ b/ports/qt5-base/vcpkg-cmake-wrapper.cmake @@ -2,10 +2,16 @@ _find_package(${ARGS}) function(add_qt_library _target) foreach(_lib IN LISTS ARGN) - find_library(${_lib}_LIBRARY_DEBUG NAMES ${_lib}d PATH_SUFFIXES debug/plugins/platforms) - find_library(${_lib}_LIBRARY_RELEASE NAMES ${_lib} PATH_SUFFIXES plugins/platforms) - set_property(TARGET ${_target} APPEND PROPERTY INTERFACE_LINK_LIBRARIES - \$<\$>:${${_lib}_LIBRARY_RELEASE}>\$<\$:${${_lib}_LIBRARY_DEBUG}>) + #The fact that we are within this file means we are using the VCPKG toolchain. Has such we only need to search in VCPKG paths! + find_library(${_lib}_LIBRARY_DEBUG NAMES ${_lib}d ${_lib} NAMES_PER_DIR PATH_SUFFIXES plugins/platforms PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH) + find_library(${_lib}_LIBRARY_RELEASE NAMES ${_lib} NAMES_PER_DIR PATH_SUFFIXES plugins/platforms PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH) + if(${_lib}_LIBRARY_RELEASE) + list(APPEND interface_lib \$<\$>:${${_lib}_LIBRARY_RELEASE}>) + endif() + if(${_lib}_LIBRARY_DEBUG) + list(APPEND interface_lib \$<\$:${${_lib}_LIBRARY_DEBUG}>) + endif() + set_property(TARGET ${_target} APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${interface_lib}) endforeach() endfunction() @@ -37,7 +43,7 @@ if("${_target_type}" STREQUAL "STATIC_LIBRARY") set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES Netapi32.lib Ws2_32.lib Mincore.lib Winmm.lib Iphlpapi.lib Wtsapi32.lib Dwmapi.lib Imm32.lib) - add_qt_library(Qt5::Core Qt5WindowsUIAutomationSupport qwindows qdirect2d) + add_qt_library(Qt5::Core Qt5WindowsUIAutomationSupport qwindows qdirect2d qminimal qoffscreen) elseif(APPLE) set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES From 88f18d16252e57a68f0664b28657adfdf1bbf238 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 12 Dec 2019 21:15:52 +0100 Subject: [PATCH 084/419] fix plugin properties in cmake files --- ports/qt5-base/fixcmake.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ports/qt5-base/fixcmake.py b/ports/qt5-base/fixcmake.py index afb127560a0e28..ea74cce0a6b746 100644 --- a/ports/qt5-base/fixcmake.py +++ b/ports/qt5-base/fixcmake.py @@ -18,6 +18,7 @@ exepattern = re.compile("_install_prefix}/bin/[a-z]+(.exe|)") toolexepattern = re.compile("_install_prefix}/tools/qt5/bin/[a-z]+(.exe|)") tooldllpattern = re.compile("_install_prefix}/tools/qt5/bin/Qt5.*d+(.dll|.so)") + populatepluginpattern = re.compile("_populate_[^_]+_plugin_properties\([^[:space:]]+ RELEASE ") for line in openedfile: if "_install_prefix}/tools/qt5/${LIB_LOCATION}" in line: builder += " if (${Configuration} STREQUAL \"RELEASE\")" @@ -60,6 +61,9 @@ builder += " set_target_properties(Qt5::WinMain PROPERTIES\n" builder += " IMPORTED_LOCATION_DEBUG ${imported_location_debug}\n" builder += " )\n" + elif populatepluginpattern.search(line) != None: + builder += line + "\n" + builder += line.replace("RELEASE", "") elif dllpattern.search(line) != None: builder += line.replace("/bin/", "/debug/bin/") elif libpattern.search(line) != None: From 8fce3037f11fd5a6da57dfcfb37cb389c21001b2 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 12 Dec 2019 23:50:17 +0100 Subject: [PATCH 085/419] fix cmake files. --- ports/qt5-base/cmake/qt_fix_cmake.cmake | 8 +++++++- ports/qt5-base/fixcmake.py | 18 +++++++++++------- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/ports/qt5-base/cmake/qt_fix_cmake.cmake b/ports/qt5-base/cmake/qt_fix_cmake.cmake index 6da5deb8e1491e..f435566c659e05 100644 --- a/ports/qt5-base/cmake/qt_fix_cmake.cmake +++ b/ports/qt5-base/cmake/qt_fix_cmake.cmake @@ -13,7 +13,13 @@ function(qt_fix_cmake PACKAGE_DIR_TO_FIX PORT_TO_FIX) LOGNAME fix-cmake ) endif() - + if(EXISTS ${PACKAGE_DIR_TO_FIX}/share/cmake) + vcpkg_execute_required_process( + COMMAND ${PYTHON2} ${CURRENT_INSTALLED_DIR}/share/qt5/fixcmake.py ${PORT_TO_FIX} + WORKING_DIRECTORY ${PACKAGE_DIR_TO_FIX}/share/cmake + LOGNAME fix-cmake + ) + endif() #Install cmake files if(EXISTS ${PACKAGE_DIR_TO_FIX}/lib/cmake) file(MAKE_DIRECTORY ${PACKAGE_DIR_TO_FIX}/share) diff --git a/ports/qt5-base/fixcmake.py b/ports/qt5-base/fixcmake.py index ea74cce0a6b746..2419f65195326e 100644 --- a/ports/qt5-base/fixcmake.py +++ b/ports/qt5-base/fixcmake.py @@ -13,12 +13,13 @@ for f in files: openedfile = open(f, "r") builder = "" - dllpattern = re.compile("_install_prefix}/bin/Qt5.*d+(.dll|.so)") - libpattern = re.compile("_install_prefix}/lib/Qt5.*d+(.lib|.a)") + dllpatterndebug = re.compile("_install_prefix}/bin/Qt5.*d+(.dll|.so)") + libpatterndebug = re.compile("_install_prefix}/lib/Qt5.*d+(.lib|.a)") exepattern = re.compile("_install_prefix}/bin/[a-z]+(.exe|)") toolexepattern = re.compile("_install_prefix}/tools/qt5/bin/[a-z]+(.exe|)") tooldllpattern = re.compile("_install_prefix}/tools/qt5/bin/Qt5.*d+(.dll|.so)") - populatepluginpattern = re.compile("_populate_[^_]+_plugin_properties\([^[:space:]]+ RELEASE ") + populatepluginpattern = re.compile("_populate_[^_]+_plugin_properties\([^ ]+ RELEASE") + populatetargetpattern = re.compile("_populate_[^_]+_target_properties\(RELEASE ") for line in openedfile: if "_install_prefix}/tools/qt5/${LIB_LOCATION}" in line: builder += " if (${Configuration} STREQUAL \"RELEASE\")" @@ -62,11 +63,14 @@ builder += " IMPORTED_LOCATION_DEBUG ${imported_location_debug}\n" builder += " )\n" elif populatepluginpattern.search(line) != None: - builder += line + "\n" - builder += line.replace("RELEASE", "") - elif dllpattern.search(line) != None: + builder += line + builder += line.replace("RELEASE", "DEBUG").replace(".dll", "d.dll") + elif populatetargetpattern.search(line) != None: + builder += line + builder += line.replace("RELEASE", "DEBUG").replace(".dll", "d.dll").replace(".lib", "d.lib") + elif dllpatterndebug.search(line) != None: builder += line.replace("/bin/", "/debug/bin/") - elif libpattern.search(line) != None: + elif libpatterndebug.search(line) != None: builder += line.replace("/lib/", "/debug/lib/") elif tooldllpattern.search(line) != None: builder += line.replace("/tools/qt5/bin", "/debug/bin/") From 0a9d8382b9f5511b45b891604ca679fe9f65be30 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 12 Dec 2019 23:58:53 +0100 Subject: [PATCH 086/419] fix missing plugin qminimal deployment into tools dir --- ports/qt5-tools/CONTROL | 2 +- ports/qt5-tools/portfile.cmake | 5 ++++- ports/qt5-xmlpatterns/CONTROL | 2 +- ports/qt5-xmlpatterns/portfile.cmake | 5 ++++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/qt5-tools/CONTROL b/ports/qt5-tools/CONTROL index ad3c67bc5620f8..bfa94474c61323 100644 --- a/ports/qt5-tools/CONTROL +++ b/ports/qt5-tools/CONTROL @@ -1,4 +1,4 @@ Source: qt5-tools -Version: 5.12.5-2 +Version: 5.12.5-3 Description: Qt5 Tools Module; Includes deployment tools and helpers, Qt Designer, Assistant, and other applications Build-Depends: qt5-base, qt5-declarative, qt5-activeqt (windows) diff --git a/ports/qt5-tools/portfile.cmake b/ports/qt5-tools/portfile.cmake index 214726759f3cf1..fdbfa8d8ef3f13 100644 --- a/ports/qt5-tools/portfile.cmake +++ b/ports/qt5-tools/portfile.cmake @@ -1,2 +1,5 @@ include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) -qt_submodule_installation() \ No newline at end of file +qt_submodule_installation() +if(EXISTS "${CURRENT_INSTALLED_DIR}/plugins/platforms/qminimal${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}") + file(INSTALL "${CURRENT_INSTALLED_DIR}/plugins/platforms/qminimal${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/plugins/platforms") +endif() \ No newline at end of file diff --git a/ports/qt5-xmlpatterns/CONTROL b/ports/qt5-xmlpatterns/CONTROL index 6e7b3d711a3093..15a67649806f77 100644 --- a/ports/qt5-xmlpatterns/CONTROL +++ b/ports/qt5-xmlpatterns/CONTROL @@ -1,4 +1,4 @@ Source: qt5-xmlpatterns -Version: 5.12.5 +Version: 5.12.5-1 Description: Qt5 XML Patterns Module - Support for XPath, XQuery, XSLT and XML schema validation Build-Depends: qt5-base, qt5-declarative diff --git a/ports/qt5-xmlpatterns/portfile.cmake b/ports/qt5-xmlpatterns/portfile.cmake index 214726759f3cf1..fdbfa8d8ef3f13 100644 --- a/ports/qt5-xmlpatterns/portfile.cmake +++ b/ports/qt5-xmlpatterns/portfile.cmake @@ -1,2 +1,5 @@ include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) -qt_submodule_installation() \ No newline at end of file +qt_submodule_installation() +if(EXISTS "${CURRENT_INSTALLED_DIR}/plugins/platforms/qminimal${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}") + file(INSTALL "${CURRENT_INSTALLED_DIR}/plugins/platforms/qminimal${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/plugins/platforms") +endif() \ No newline at end of file From f57228da813fa0a81d49c43472a78ef3787ae7bb Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 13 Dec 2019 00:10:44 +0100 Subject: [PATCH 087/419] change wrapper slightly --- ports/qt5-base/vcpkg-cmake-wrapper.cmake | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ports/qt5-base/vcpkg-cmake-wrapper.cmake b/ports/qt5-base/vcpkg-cmake-wrapper.cmake index 799eeb919242fd..512c712a19fd1f 100644 --- a/ports/qt5-base/vcpkg-cmake-wrapper.cmake +++ b/ports/qt5-base/vcpkg-cmake-wrapper.cmake @@ -43,8 +43,12 @@ if("${_target_type}" STREQUAL "STATIC_LIBRARY") set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES Netapi32.lib Ws2_32.lib Mincore.lib Winmm.lib Iphlpapi.lib Wtsapi32.lib Dwmapi.lib Imm32.lib) - add_qt_library(Qt5::Core Qt5WindowsUIAutomationSupport qwindows qdirect2d qminimal qoffscreen) - + add_qt_library(Qt5::Core Qt5WindowsUIAutomationSupport qwindows qdirect2d) + elseif(UNIX) + add_qt_library(Qt5::Core + Qt5GraphicsSupport + Qt5ClipboardSupport + Qt5AccessibilitySupport) elseif(APPLE) set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES "-weak_framework DiskArbitration" "-weak_framework IOKit" "-weak_framework Foundation" "-weak_framework CoreServices" From 7b3b5ca6e7f4d90142e0eb7974907e70f3afe0bc Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 13 Dec 2019 00:12:46 +0100 Subject: [PATCH 088/419] UNIX also means APPLE so it needs to be excluded --- ports/qt5-base/vcpkg-cmake-wrapper.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/qt5-base/vcpkg-cmake-wrapper.cmake b/ports/qt5-base/vcpkg-cmake-wrapper.cmake index 512c712a19fd1f..5a2bb11146a8ae 100644 --- a/ports/qt5-base/vcpkg-cmake-wrapper.cmake +++ b/ports/qt5-base/vcpkg-cmake-wrapper.cmake @@ -44,7 +44,7 @@ if("${_target_type}" STREQUAL "STATIC_LIBRARY") Netapi32.lib Ws2_32.lib Mincore.lib Winmm.lib Iphlpapi.lib Wtsapi32.lib Dwmapi.lib Imm32.lib) add_qt_library(Qt5::Core Qt5WindowsUIAutomationSupport qwindows qdirect2d) - elseif(UNIX) + elseif(UNIX AND NOT APPLE) add_qt_library(Qt5::Core Qt5GraphicsSupport Qt5ClipboardSupport From ded1a9b849675cdf730325aebd7871cb29f4636e Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 13 Dec 2019 13:55:27 +0100 Subject: [PATCH 089/419] fix the static windows build --- ports/qt5-base/fixcmake.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/qt5-base/fixcmake.py b/ports/qt5-base/fixcmake.py index 2419f65195326e..b6e41468039712 100644 --- a/ports/qt5-base/fixcmake.py +++ b/ports/qt5-base/fixcmake.py @@ -64,7 +64,7 @@ builder += " )\n" elif populatepluginpattern.search(line) != None: builder += line - builder += line.replace("RELEASE", "DEBUG").replace(".dll", "d.dll") + builder += line.replace("RELEASE", "DEBUG").replace(".dll", "d.dll").replace(".lib", "d.lib") elif populatetargetpattern.search(line) != None: builder += line builder += line.replace("RELEASE", "DEBUG").replace(".dll", "d.dll").replace(".lib", "d.lib") From a3690a1d47594f99e2c1cb815416b90502436029 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 13 Dec 2019 14:13:43 +0100 Subject: [PATCH 090/419] mark the parts of fixcmake which require further work to work with single configuration builds --- ports/qt5-base/fixcmake.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/ports/qt5-base/fixcmake.py b/ports/qt5-base/fixcmake.py index b6e41468039712..6f677327c1ca4d 100644 --- a/ports/qt5-base/fixcmake.py +++ b/ports/qt5-base/fixcmake.py @@ -24,31 +24,34 @@ if "_install_prefix}/tools/qt5/${LIB_LOCATION}" in line: builder += " if (${Configuration} STREQUAL \"RELEASE\")" builder += "\n " + line.replace("/tools/qt5/bin", "/bin/") - builder += " else()" - builder += "\n " + line.replace("/tools/qt5/debug/bin", "/debug/bin/") + builder += " else()" #This requires a release and debug build since Qt will check that the file exists! + #It would be better to use an elseif here with a EXISTS check but that requires a more complicated regex to build the complete filepath since each module uses its own _(qtmodule)_install_prefix + #so single configuration builds of Qt are currently not supported. Thus => + #TODO: Make single configuration builds of Qt work correctly! + builder += "\n " + line.replace("/tools/qt5/debug/bin", "/debug/bin/") builder += " endif()\n" elif "_install_prefix}/bin/${LIB_LOCATION}" in line: builder += " if (${Configuration} STREQUAL \"RELEASE\")" builder += "\n " + line - builder += " else()" - builder += "\n " + line.replace("/bin/", "/debug/bin/") + builder += " else()" #This requires a release and debug build! + builder += "\n " + line.replace("/bin/", "/debug/bin/") builder += " endif()\n" elif "_install_prefix}/lib/${LIB_LOCATION}" in line: builder += " if (${Configuration} STREQUAL \"RELEASE\")" builder += "\n " + line - builder += " else()" + builder += " else()" #This requires a release and debug build! builder += "\n " + line.replace("/lib/", "/debug/lib/") builder += " endif()\n" elif "_install_prefix}/lib/${IMPLIB_LOCATION}" in line: builder += " if (${Configuration} STREQUAL \"RELEASE\")" builder += "\n " + line - builder += " else()" + builder += " else()" #This requires a release and debug build! builder += "\n " + line.replace("/lib/", "/debug/lib/") builder += " endif()\n" elif "_install_prefix}/plugins/${PLUGIN_LOCATION}" in line: builder += " if (${Configuration} STREQUAL \"RELEASE\")" builder += "\n " + line - builder += " else()" + builder += " else()" #This requires a release and debug build! builder += "\n " + line.replace("/plugins/", "/debug/plugins/") builder += " endif()\n" elif "_install_prefix}/lib/qtmaind.lib" in line: From 1c220fcdf9198319db0778e9b2097266999ae931 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 13 Dec 2019 14:20:12 +0100 Subject: [PATCH 091/419] update vtk to not depend on all of qt5 --- ports/vtk/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL index ada3f135e7951f..4777044220c566 100644 --- a/ports/vtk/CONTROL +++ b/ports/vtk/CONTROL @@ -10,7 +10,7 @@ Build-Depends: sdl2, openvr Feature: qt Description: Qt functionality for VTK -Build-Depends: qt5 +Build-Depends: qt5-xmlpatterns, qt5-tools, qt5-imageformats Feature: mpi Description: MPI functionality for VTK From eb71623c6362940b55ba665a5457c5d6937e4a60 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 13 Dec 2019 14:20:24 +0100 Subject: [PATCH 092/419] install static python files --- ports/vtk/portfile.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index fcefd42aa690f9..699949cfc90252 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -254,7 +254,10 @@ if("paraview" IN_LIST FEATURES) file(INSTALL ${SOURCE_PATH}/Filters/Statistics/vtkStatisticsAlgorithmPrivate.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/vtk-8.90) file(INSTALL ${SOURCE_PATH}/Rendering/OpenGL2/vtkCompositePolyDataMapper2Internal.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/vtk-8.90) file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Rendering/OpenGL2/vtkTextureObjectVS.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/vtk-8.90) - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/CMakeFiles/static_python/vtkpythonmodules.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/vtk-8.90) + #file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/CMakeFiles/static_python/vtkpythonmodules.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/vtk-8.90) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/CMakeFiles/static_python DESTINATION ${CURRENT_PACKAGES_DIR}/include/vtk-8.90) + endif() endif() #TODO remove one get_filename_component(_vtk_module_import_prefix "${_vtk_module_import_prefix}" DIRECTORY) from vtk-prefix.cmake and VTK-vtk-module-properties and vtk-python.cmake From 2913c73bba9bee77c1e8f74380c7083e875e0ad4 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 13 Dec 2019 14:24:27 +0100 Subject: [PATCH 093/419] Update ci.baseline.txt make qt5-tools pass for CI testing --- scripts/ci.baseline.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 5b7db263a84dec..08dc10713e8961 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1378,8 +1378,8 @@ qt5-macextras:x64-linux=fail qt5-macextras:x64-windows=fail qt5-macextras:x64-windows-static=fail qt5-macextras:x86-windows=fail -qt5-tools:x64-linux=ignore -qt5-tools:x64-windows-static=ignore +qt5-tools:x64-linux=pass +qt5-tools:x64-windows-static=pass qt5-winextras:x64-linux=fail qt5-winextras:x64-osx=fail quickfast:x64-linux=ignore From 60b6278721edf46354f71e761ca105410beb4425 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 13 Dec 2019 14:49:20 +0100 Subject: [PATCH 094/419] patch protobuf to config mode because cmakes findProtobuf is wrong --- ports/paraview/portfile.cmake | 1 + ports/paraview/protobuf.patch | 14 ++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 ports/paraview/protobuf.patch diff --git a/ports/paraview/portfile.cmake b/ports/paraview/portfile.cmake index caccdaa3cbcd48..55d399af8ce0b7 100644 --- a/ports/paraview/portfile.cmake +++ b/ports/paraview/portfile.cmake @@ -40,6 +40,7 @@ vcpkg_from_github( PATCHES paraview.patch second.patch + protobuf.patch ) #Get VisItBridge Plugin diff --git a/ports/paraview/protobuf.patch b/ports/paraview/protobuf.patch new file mode 100644 index 00000000000000..e3463015cf41e4 --- /dev/null +++ b/ports/paraview/protobuf.patch @@ -0,0 +1,14 @@ +diff --git a/ThirdParty/protobuf/CMakeLists.txt b/ThirdParty/protobuf/CMakeLists.txt +index aab091468..97b5db4f4 100644 +--- a/ThirdParty/protobuf/CMakeLists.txt ++++ b/ThirdParty/protobuf/CMakeLists.txt +@@ -42,7 +42,8 @@ vtk_module_third_party( + PACKAGE Protobuf + VERSION "3.4" + TARGETS protobuf::libprotobuf +- STANDARD_INCLUDE_DIRS) ++ STANDARD_INCLUDE_DIRS ++ CONFIG_MODE) + + if (VTK_MODULE_USE_EXTERNAL_ParaView_protobuf) + # promote protobuf::protoc to GLOBAL to allow to call protobuf_generate from other directories From ba8fd23e1c88bad82e8e2e9a53b287254f1dd3f4 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 13 Dec 2019 21:17:50 +0100 Subject: [PATCH 095/419] fix last regression --- ports/qt5-base/vcpkg-cmake-wrapper.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/qt5-base/vcpkg-cmake-wrapper.cmake b/ports/qt5-base/vcpkg-cmake-wrapper.cmake index 5a2bb11146a8ae..b4b3cda30642fa 100644 --- a/ports/qt5-base/vcpkg-cmake-wrapper.cmake +++ b/ports/qt5-base/vcpkg-cmake-wrapper.cmake @@ -3,8 +3,8 @@ _find_package(${ARGS}) function(add_qt_library _target) foreach(_lib IN LISTS ARGN) #The fact that we are within this file means we are using the VCPKG toolchain. Has such we only need to search in VCPKG paths! - find_library(${_lib}_LIBRARY_DEBUG NAMES ${_lib}d ${_lib} NAMES_PER_DIR PATH_SUFFIXES plugins/platforms PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH) - find_library(${_lib}_LIBRARY_RELEASE NAMES ${_lib} NAMES_PER_DIR PATH_SUFFIXES plugins/platforms PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH) + find_library(${_lib}_LIBRARY_DEBUG NAMES ${_lib}d ${_lib} NAMES_PER_DIR PATH_SUFFIXES lib plugins/platforms PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH) + find_library(${_lib}_LIBRARY_RELEASE NAMES ${_lib} NAMES_PER_DIR PATH_SUFFIXES lib plugins/platforms PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH) if(${_lib}_LIBRARY_RELEASE) list(APPEND interface_lib \$<\$>:${${_lib}_LIBRARY_RELEASE}>) endif() From 6d60f19563e6430622dca6f051714cdc2c6ce247 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 14 Dec 2019 00:12:05 +0100 Subject: [PATCH 096/419] trying to fix static paraview build --- ports/paraview/portfile.cmake | 5 ++ ports/paraview/removedoublesymbols.patch | 89 ++++++++++++++++++++++++ ports/paraview/removeunusedsymbols.patch | 43 ++++++++++++ 3 files changed, 137 insertions(+) create mode 100644 ports/paraview/removedoublesymbols.patch create mode 100644 ports/paraview/removeunusedsymbols.patch diff --git a/ports/paraview/portfile.cmake b/ports/paraview/portfile.cmake index 55d399af8ce0b7..cc3bb8e643875a 100644 --- a/ports/paraview/portfile.cmake +++ b/ports/paraview/portfile.cmake @@ -43,6 +43,9 @@ vcpkg_from_github( protobuf.patch ) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + list(APPEND VisItPatches removedoublesymbols.patch) +endif() #Get VisItBridge Plugin vcpkg_from_gitlab( OUT_SOURCE_PATH VISITIT_SOURCE_PATH @@ -52,6 +55,8 @@ vcpkg_from_gitlab( SHA512 49ab6e32051a9cb328f5694bca7445610d80bdedddc7ac3d48970f57be1c5969578a0501b12f48a2fb332f109f79f8df189e78530bb4af75e73b0d48d7124884 PATCHES VisIt.patch + removeunusedsymbols.patch # These also get remove in master of ParaView + ${VisItPatches} ) #Get QtTesting Plugin vcpkg_from_gitlab( diff --git a/ports/paraview/removedoublesymbols.patch b/ports/paraview/removedoublesymbols.patch new file mode 100644 index 00000000000000..70df9b0e8afaa3 --- /dev/null +++ b/ports/paraview/removedoublesymbols.patch @@ -0,0 +1,89 @@ +diff --git a/Library/VisItLib/visit_vtk/lightweight/vtkUnstructuredGridFacelistFilter.C b/Library/VisItLib/visit_vtk/lightweight/vtkUnstructuredGridFacelistFilter.C +index db64a0534..0d987d8e7 100644 +--- a/Library/VisItLib/visit_vtk/lightweight/vtkUnstructuredGridFacelistFilter.C ++++ b/Library/VisItLib/visit_vtk/lightweight/vtkUnstructuredGridFacelistFilter.C +@@ -69,7 +69,10 @@ + // + // Forward declare some of types used to hash faces. + // +-class Quad; ++namespace hidden { ++ class Quad; ++} ++using hidden::Quad; + class QuadMemoryManager; + class Tri; + class TriMemoryManager; +@@ -322,43 +325,43 @@ class HashEntryList + // Creation: October 21, 2002 + // + // **************************************************************************** ++namespace hidden { ++ class Quad ++ { ++ friend class Tri; + +-class Quad +-{ +- friend class Tri; +- +- public: +- Quad() { ordering_case = 255; }; +- +- vtkIdType AssignNodes(const vtkIdType *); +- bool Equals(Quad *); +- bool Equals(Tri *); +- void AddInRemainingTriangle(Tri *, int); +- inline void ReRegisterMemory(void) +- { +- hashEntryList->qmm.ReRegisterQuad(this); +- } ++ public: ++ Quad() { ordering_case = 255; }; + +- inline void SetOriginalZone(const int &oz) { orig_zone = oz; }; +- inline int GetOriginalZone(void) { return orig_zone; }; ++ vtkIdType AssignNodes(const vtkIdType *); ++ bool Equals(Quad *); ++ bool Equals(Tri *); ++ void AddInRemainingTriangle(Tri *, int); ++ inline void ReRegisterMemory(void) ++ { ++ hashEntryList->qmm.ReRegisterQuad(this); ++ } + +- void OutputCell(int,vtkPolyData *, vtkCellData *, vtkCellData *); ++ inline void SetOriginalZone(const int &oz) { orig_zone = oz; }; ++ inline int GetOriginalZone(void) { return orig_zone; }; + +- inline void RegisterHashEntryList(HashEntryList *hel) +- { hashEntryList = hel; }; +- inline void SetNumberOfPoints(int np) { npts = np; }; ++ void OutputCell(int,vtkPolyData *, vtkCellData *, vtkCellData *); + +- protected: +- unsigned char ordering_case; +- vtkIdType nodes[3]; +- vtkIdType orig_zone; ++ inline void RegisterHashEntryList(HashEntryList *hel) ++ { hashEntryList = hel; }; ++ inline void SetNumberOfPoints(int np) { npts = np; }; + +- HashEntryList *hashEntryList; +- int npts; ++ protected: ++ unsigned char ordering_case; ++ vtkIdType nodes[3]; ++ vtkIdType orig_zone; + +- void AddInRemainingTriangle(int, int); +-}; ++ HashEntryList *hashEntryList; ++ int npts; + ++ void AddInRemainingTriangle(int, int); ++ }; ++} + // + // We will be re-ordering the nodes into numerical order. This enumerated + // type will allow the ordering to be preserved. diff --git a/ports/paraview/removeunusedsymbols.patch b/ports/paraview/removeunusedsymbols.patch new file mode 100644 index 00000000000000..a7c5a6d3284882 --- /dev/null +++ b/ports/paraview/removeunusedsymbols.patch @@ -0,0 +1,43 @@ +diff --git a/Library/VisItLib/common/plugin/PluginManager.C b/Library/VisItLib/common/plugin/PluginManager.C +index 7096293f0..b2e00b585 100644 +--- a/Library/VisItLib/common/plugin/PluginManager.C ++++ b/Library/VisItLib/common/plugin/PluginManager.C +@@ -83,9 +83,9 @@ using std::sort; + #define MAX_PLUGINERROR 500 + + #ifdef VISIT_STATIC +-extern void *fake_dlsym(const string &); +-extern void StaticGetSupportedLibs(std::vector > &, +- const string &); ++//extern void *fake_dlsym(const string &); ++//extern void StaticGetSupportedLibs(std::vector > &, ++// const string &); + #endif + + // **************************************************************************** +@@ -513,7 +513,7 @@ void + PluginManager::GetPluginList(vector > &libs) + { + #ifdef VISIT_STATIC +- StaticGetSupportedLibs(libs, managerName); ++ //StaticGetSupportedLibs(libs, managerName); + #else + // Read the files in the plugin directory. + vector< vector > > files; +@@ -1690,11 +1690,11 @@ PluginManager::PluginSymbol(const string &symbol, bool noError) + + #if defined(VISIT_STATIC) + // Static +- retval = fake_dlsym(symbolName); +- if (retval == NULL) +- { +- debug1 << "fake_dlsym was not able to return " << symbolName << endl; +- } ++ // retval = fake_dlsym(symbolName); ++ // if (retval == NULL) ++ // { ++ // debug1 << "fake_dlsym was not able to return " << symbolName << endl; ++ // } + #else + // Dynamic + #if defined(_WIN32) From 5be3d66cd6d0b86d11e74ce3ee3e6402d2cf0efd Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 14 Dec 2019 00:14:30 +0100 Subject: [PATCH 097/419] link UxTheme do fix paraview static build --- ports/qt5-base/vcpkg-cmake-wrapper.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ports/qt5-base/vcpkg-cmake-wrapper.cmake b/ports/qt5-base/vcpkg-cmake-wrapper.cmake index b4b3cda30642fa..dd9a9327fed964 100644 --- a/ports/qt5-base/vcpkg-cmake-wrapper.cmake +++ b/ports/qt5-base/vcpkg-cmake-wrapper.cmake @@ -31,6 +31,10 @@ if("${_target_type}" STREQUAL "STATIC_LIBRARY") ZLIB::ZLIB JPEG::JPEG PNG::PNG Freetype::Freetype sqlite3 harfbuzz::harfbuzz double-conversion::double-conversion OpenSSL::SSL OpenSSL::Crypto PostgreSQL::PostgreSQL ) + if(NOT WINDOWS_STORE) + set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES + UxTheme.lib) # Should probably be added to Qt5:Gui and not core but currently we only have that one wrapper + endif() add_qt_library(Qt5::Core pcre2-16 From 10f7ad6229e148fc3cbf3127ff46e0735e7e415f Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 14 Dec 2019 20:29:36 +0100 Subject: [PATCH 098/419] break auto fontconfig in configure script to fix qt5-tools --- ports/qt5-base/patches/gui_configure.patch | 9 +++++++++ ports/qt5-base/portfile.cmake | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ports/qt5-base/patches/gui_configure.patch b/ports/qt5-base/patches/gui_configure.patch index 31c29dbeb77c73..35dabe3014022c 100644 --- a/ports/qt5-base/patches/gui_configure.patch +++ b/ports/qt5-base/patches/gui_configure.patch @@ -14,3 +14,12 @@ index c51e3ceee..7f7e206b6 100644 ], "use": [ { "lib": "zlib", "condition": "features.system-zlib" } +@@ -262,7 +262,7 @@ + "headers": "fontconfig/fontconfig.h", + "sources": [ + { "type": "pkgConfig", "args": "fontconfig" }, +- { "type": "freetype", "libs": "-lfontconfig" } ++ { "type": "freetype", "libs": "-lbreakfontconfig" } + ], + "use": "freetype" + }, diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 9baf570929e35e..086d5c0b6b075b 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -37,7 +37,7 @@ qt_download_submodule( OUT_SOURCE_PATH SOURCE_PATH patches/winmain_pro.patch #Moves qtmain to manual-link patches/windows_prf.patch #fixes the qtmain dependency due to the above move patches/qt_app.patch #Moves the target location of qt5 host apps to always install into the host dir. - patches/gui_configure.patch #Patches the gui configure.json to break freetype autodetection because it does not include its dependencies. + patches/gui_configure.patch #Patches the gui configure.json to break freetype/fontconfig autodetection because it does not include its dependencies. #patches/static_opengl.patch #Use this patch if you really want to statically link angle on windows (e.g. using -opengl es2 and -static). #Be carefull since it requires definining _GDI32_ for all dependent projects due to redefinition errors in the #the windows supplied gl.h header and the angle gl.h otherwise. From a576bf26db4c364bc2b91b6f80003814bf935868 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 14 Dec 2019 20:30:43 +0100 Subject: [PATCH 099/419] update baseline --- scripts/ci.baseline.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 08dc10713e8961..ba968d1fbdd3ef 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -307,7 +307,6 @@ cudnn:arm-uwp=fail cudnn:x64-uwp=fail cudnn:x64-windows-static=fail cudnn:x86-windows=fail -cutelyst2:x64-linux=fail cutelyst2:x64-osx=fail darknet:arm-uwp=fail darknet:x64-uwp=fail From ac8b8dca046453daabf2a333bbf5739735605bca Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 14 Dec 2019 20:44:16 +0100 Subject: [PATCH 100/419] enable verbose to debug ci --- ports/qt5-base/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 086d5c0b6b075b..b1d98afbff2560 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -67,7 +67,7 @@ set(CORE_OPTIONS # ENV ANGLE_DIR to external angle source dir. (Will always be compiled with Qt) #-optimized-tools #-force-debug-info - #-verbose + -verbose ) ## 3rd Party Libs From 2a7f4a006061498a8810924436e3c9e905922bc3 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 14 Dec 2019 21:01:18 +0100 Subject: [PATCH 101/419] try to help it instead of breaking it --- ports/qt5-base/patches/gui_configure.patch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ports/qt5-base/patches/gui_configure.patch b/ports/qt5-base/patches/gui_configure.patch index 35dabe3014022c..7b529e5624f63e 100644 --- a/ports/qt5-base/patches/gui_configure.patch +++ b/ports/qt5-base/patches/gui_configure.patch @@ -17,9 +17,10 @@ index c51e3ceee..7f7e206b6 100644 @@ -262,7 +262,7 @@ "headers": "fontconfig/fontconfig.h", "sources": [ - { "type": "pkgConfig", "args": "fontconfig" }, +- { "type": "pkgConfig", "args": "fontconfig" }, ++ { "type": "pkgConfig", "args": "breakfontconfig" }, - { "type": "freetype", "libs": "-lfontconfig" } -+ { "type": "freetype", "libs": "-lbreakfontconfig" } ++ { "type": "freetype", "libs": "-lfontconfig -lexpat" } ], "use": "freetype" }, From 713dc30dd678a5bd37c69ac91b15d51c39148282 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 14 Dec 2019 21:35:18 +0100 Subject: [PATCH 102/419] completly link icu --- ports/qt5-base/portfile.cmake | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index b1d98afbff2560..92719d476bcdde 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -104,8 +104,22 @@ find_library(HARFBUZZ_RELEASE NAMES harfbuzz PATHS "${CURRENT_INSTALLED_DIR}/lib find_library(HARFBUZZ_DEBUG NAMES harfbuzz PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) find_library(SQLITE_RELEASE NAMES sqlite3 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) # Depends on openssl and zlib(linux) find_library(SQLITE_DEBUG NAMES sqlite3 sqlite3d PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -find_library(ICU_RELEASE NAMES icuuc libicuuc PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(ICU_DEBUG NAMES icuucd libicuucd iccuc libicuuc PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) + +find_library(ICUUC_RELEASE NAMES icuuc libicuuc PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(ICUUC_DEBUG NAMES icuucd libicuucd iccuc libicuuc PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(ICUTU_RELEASE NAMES icutu libicutu PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(ICUTU_DEBUG NAMES icutud libicutud iccutu libicutu PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(ICULX_RELEASE NAMES iculx libiculx PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(ICULX_DEBUG NAMES iculxd libiculxd icculx libiculx PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(ICUIO_RELEASE NAMES icuio libicuio PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(ICUIO_DEBUG NAMES icuiod libicuiod iccuio libicuio PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(ICUIN_RELEASE NAMES icui18n libicui18n PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(ICUIN_DEBUG NAMES icui18nd libicui18nd iccui18n libicui18n PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(ICUDATA_RELEASE NAMES icudata libicudata PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(ICUDATA_DEBUG NAMES icudatad libicudatad iccudata libicudata PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +set(ICU_RELEASE ${ICUUC_RELEASE} ${ICUTU_RELEASE} ${ICULX_RELEASE} ${ICUIO_RELEASE} ${ICUIN_RELEASE} ${ICUDATA_RELEASE}) +set(ICU_DEBUG ${ICUUC_DEBUG} ${ICUTU_DEBUG} ${ICULX_DEBUG} ${ICUIO_DEBUG} ${ICUIN_DEBUG} ${ICUDATA_DEBUG}) + find_library(FONTCONFIG_RELEASE NAMES fontconfig PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(FONTCONFIG_DEBUG NAMES fontconfig PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) find_library(EXPAT_RELEASE NAMES expat PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) From a9a2b8f7cecacdd23857cfeac232d6f7e3af57c7 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 14 Dec 2019 21:36:07 +0100 Subject: [PATCH 103/419] try to fix fontconfig configure --- ports/qt5-base/patches/gui_configure.patch | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ports/qt5-base/patches/gui_configure.patch b/ports/qt5-base/patches/gui_configure.patch index 7b529e5624f63e..6106bad07a7130 100644 --- a/ports/qt5-base/patches/gui_configure.patch +++ b/ports/qt5-base/patches/gui_configure.patch @@ -14,13 +14,17 @@ index c51e3ceee..7f7e206b6 100644 ], "use": [ { "lib": "zlib", "condition": "features.system-zlib" } -@@ -262,7 +262,7 @@ +@@ -262,7 +262,11 @@ "headers": "fontconfig/fontconfig.h", "sources": [ - { "type": "pkgConfig", "args": "fontconfig" }, + { "type": "pkgConfig", "args": "breakfontconfig" }, - { "type": "freetype", "libs": "-lfontconfig" } -+ { "type": "freetype", "libs": "-lfontconfig -lexpat" } ++ { "type": "freetype", "libs": "-lbreakautofind" }, ++ { "type": "fontconfig", "libs": "-lfontconfig -lexpat" }, ++ { "libs": "-lfontconfig -lexpat" }, ++ { "libs": "-llibfontconfig -llibexpat" }, ++ "-lfontconfig" ], "use": "freetype" }, From 9c0215b1cf1980fbe422c8f2c10f2f67447de3ba Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 14 Dec 2019 21:43:59 +0100 Subject: [PATCH 104/419] fix configure call. cannot be called with a list! --- ports/qt5-base/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 92719d476bcdde..9c44ab3332932a 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -117,8 +117,8 @@ find_library(ICUIN_RELEASE NAMES icui18n libicui18n PATHS "${CURRENT_INSTALLED_D find_library(ICUIN_DEBUG NAMES icui18nd libicui18nd iccui18n libicui18n PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) find_library(ICUDATA_RELEASE NAMES icudata libicudata PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(ICUDATA_DEBUG NAMES icudatad libicudatad iccudata libicudata PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -set(ICU_RELEASE ${ICUUC_RELEASE} ${ICUTU_RELEASE} ${ICULX_RELEASE} ${ICUIO_RELEASE} ${ICUIN_RELEASE} ${ICUDATA_RELEASE}) -set(ICU_DEBUG ${ICUUC_DEBUG} ${ICUTU_DEBUG} ${ICULX_DEBUG} ${ICUIO_DEBUG} ${ICUIN_DEBUG} ${ICUDATA_DEBUG}) +set(ICU_RELEASE "${ICUUC_RELEASE} ${ICUTU_RELEASE} ${ICULX_RELEASE} ${ICUIO_RELEASE} ${ICUIN_RELEASE} ${ICUDATA_RELEASE}") +set(ICU_DEBUG "${ICUUC_DEBUG} ${ICUTU_DEBUG} ${ICULX_DEBUG} ${ICUIO_DEBUG} ${ICUIN_DEBUG} ${ICUDATA_DEBUG}") find_library(FONTCONFIG_RELEASE NAMES fontconfig PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(FONTCONFIG_DEBUG NAMES fontconfig PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) From 12ce7a6205ede5d69e3c65c5cc25986970ec4e91 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 14 Dec 2019 21:51:43 +0100 Subject: [PATCH 105/419] remove invalid line from patch --- ports/qt5-base/patches/gui_configure.patch | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ports/qt5-base/patches/gui_configure.patch b/ports/qt5-base/patches/gui_configure.patch index 6106bad07a7130..7a283dc623e085 100644 --- a/ports/qt5-base/patches/gui_configure.patch +++ b/ports/qt5-base/patches/gui_configure.patch @@ -14,14 +14,13 @@ index c51e3ceee..7f7e206b6 100644 ], "use": [ { "lib": "zlib", "condition": "features.system-zlib" } -@@ -262,7 +262,11 @@ +@@ -262,7 +262,10 @@ "headers": "fontconfig/fontconfig.h", "sources": [ - { "type": "pkgConfig", "args": "fontconfig" }, + { "type": "pkgConfig", "args": "breakfontconfig" }, - { "type": "freetype", "libs": "-lfontconfig" } + { "type": "freetype", "libs": "-lbreakautofind" }, -+ { "type": "fontconfig", "libs": "-lfontconfig -lexpat" }, + { "libs": "-lfontconfig -lexpat" }, + { "libs": "-llibfontconfig -llibexpat" }, + "-lfontconfig" From 673606fee90768b308443f30beea776cad31faf5 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 14 Dec 2019 22:15:54 +0100 Subject: [PATCH 106/419] force icu and reduce the required icu libs according to the configure script --- ports/qt5-base/portfile.cmake | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 9c44ab3332932a..785ab6e27f89ed 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -80,6 +80,7 @@ list(APPEND CORE_OPTIONS -system-doubleconversion -system-sqlite -system-harfbuzz + -icu -no-angle) # Qt does not need to build angle. VCPKG will build angle! if(QT_OPENSSL_LINK) @@ -107,14 +108,14 @@ find_library(SQLITE_DEBUG NAMES sqlite3 sqlite3d PATHS "${CURRENT_INSTALLED_DIR} find_library(ICUUC_RELEASE NAMES icuuc libicuuc PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(ICUUC_DEBUG NAMES icuucd libicuucd iccuc libicuuc PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -find_library(ICUTU_RELEASE NAMES icutu libicutu PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(ICUTU_DEBUG NAMES icutud libicutud iccutu libicutu PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -find_library(ICULX_RELEASE NAMES iculx libiculx PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(ICULX_DEBUG NAMES iculxd libiculxd icculx libiculx PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -find_library(ICUIO_RELEASE NAMES icuio libicuio PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(ICUIO_DEBUG NAMES icuiod libicuiod iccuio libicuio PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -find_library(ICUIN_RELEASE NAMES icui18n libicui18n PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(ICUIN_DEBUG NAMES icui18nd libicui18nd iccui18n libicui18n PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +#find_library(ICUTU_RELEASE NAMES icutu libicutu PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +#find_library(ICUTU_DEBUG NAMES icutud libicutud iccutu libicutu PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +#find_library(ICULX_RELEASE NAMES iculx libiculx PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +#find_library(ICULX_DEBUG NAMES iculxd libiculxd icculx libiculx PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +#find_library(ICUIO_RELEASE NAMES icuio libicuio PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +#find_library(ICUIO_DEBUG NAMES icuiod libicuiod iccuio libicuio PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +#find_library(ICUIN_RELEASE NAMES icui18n libicui18n PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +#find_library(ICUIN_DEBUG NAMES icui18nd libicui18nd iccui18n libicui18n PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) find_library(ICUDATA_RELEASE NAMES icudata libicudata PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(ICUDATA_DEBUG NAMES icudatad libicudatad iccudata libicudata PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) set(ICU_RELEASE "${ICUUC_RELEASE} ${ICUTU_RELEASE} ${ICULX_RELEASE} ${ICUIO_RELEASE} ${ICUIN_RELEASE} ${ICUDATA_RELEASE}") From 1e088017d14ce42e5d0dd2a4c97cee513708d946 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 14 Dec 2019 22:40:42 +0100 Subject: [PATCH 107/419] fix icu linkage --- ports/qt5-base/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 785ab6e27f89ed..5de523f95c758e 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -114,8 +114,8 @@ find_library(ICUUC_DEBUG NAMES icuucd libicuucd iccuc libicuuc PATHS "${CURRENT_ #find_library(ICULX_DEBUG NAMES iculxd libiculxd icculx libiculx PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) #find_library(ICUIO_RELEASE NAMES icuio libicuio PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) #find_library(ICUIO_DEBUG NAMES icuiod libicuiod iccuio libicuio PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -#find_library(ICUIN_RELEASE NAMES icui18n libicui18n PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -#find_library(ICUIN_DEBUG NAMES icui18nd libicui18nd iccui18n libicui18n PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(ICUIN_RELEASE NAMES icui18n libicui18n icuin PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(ICUIN_DEBUG NAMES icui18nd libicui18nd iccui18n libicui18n icuin icuind PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) find_library(ICUDATA_RELEASE NAMES icudata libicudata PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(ICUDATA_DEBUG NAMES icudatad libicudatad iccudata libicudata PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) set(ICU_RELEASE "${ICUUC_RELEASE} ${ICUTU_RELEASE} ${ICULX_RELEASE} ${ICUIO_RELEASE} ${ICUIN_RELEASE} ${ICUDATA_RELEASE}") From e05248e178bb2a3fdd9b7347c0abbfb47945271f Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 14 Dec 2019 22:51:48 +0100 Subject: [PATCH 108/419] add more icu dependencies and names for windows --- ports/qt5-base/portfile.cmake | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 5de523f95c758e..8cf0828fbbdd41 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -108,16 +108,16 @@ find_library(SQLITE_DEBUG NAMES sqlite3 sqlite3d PATHS "${CURRENT_INSTALLED_DIR} find_library(ICUUC_RELEASE NAMES icuuc libicuuc PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(ICUUC_DEBUG NAMES icuucd libicuucd iccuc libicuuc PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -#find_library(ICUTU_RELEASE NAMES icutu libicutu PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -#find_library(ICUTU_DEBUG NAMES icutud libicutud iccutu libicutu PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(ICUTU_RELEASE NAMES icutu libicutu PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(ICUTU_DEBUG NAMES icutud libicutud iccutu libicutu PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) #find_library(ICULX_RELEASE NAMES iculx libiculx PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) #find_library(ICULX_DEBUG NAMES iculxd libiculxd icculx libiculx PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -#find_library(ICUIO_RELEASE NAMES icuio libicuio PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -#find_library(ICUIO_DEBUG NAMES icuiod libicuiod iccuio libicuio PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(ICUIO_RELEASE NAMES icuio libicuio PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(ICUIO_DEBUG NAMES icuiod libicuiod iccuio libicuio PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) find_library(ICUIN_RELEASE NAMES icui18n libicui18n icuin PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(ICUIN_DEBUG NAMES icui18nd libicui18nd iccui18n libicui18n icuin icuind PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -find_library(ICUDATA_RELEASE NAMES icudata libicudata PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(ICUDATA_DEBUG NAMES icudatad libicudatad iccudata libicudata PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(ICUDATA_RELEASE NAMES icudata libicudata icudt PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(ICUDATA_DEBUG NAMES icudatad libicudatad iccudata libicudata icudtd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) set(ICU_RELEASE "${ICUUC_RELEASE} ${ICUTU_RELEASE} ${ICULX_RELEASE} ${ICUIO_RELEASE} ${ICUIN_RELEASE} ${ICUDATA_RELEASE}") set(ICU_DEBUG "${ICUUC_DEBUG} ${ICUTU_DEBUG} ${ICULX_DEBUG} ${ICUIO_DEBUG} ${ICUIN_DEBUG} ${ICUDATA_DEBUG}") From 4558ae2972103b98c58b723a35491c1ebd68e57b Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 14 Dec 2019 22:59:20 +0100 Subject: [PATCH 109/419] add more icu libs. Seems like all are needed --- ports/qt5-base/portfile.cmake | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 8cf0828fbbdd41..63c959152d38ac 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -110,8 +110,10 @@ find_library(ICUUC_RELEASE NAMES icuuc libicuuc PATHS "${CURRENT_INSTALLED_DIR}/ find_library(ICUUC_DEBUG NAMES icuucd libicuucd iccuc libicuuc PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) find_library(ICUTU_RELEASE NAMES icutu libicutu PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(ICUTU_DEBUG NAMES icutud libicutud iccutu libicutu PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -#find_library(ICULX_RELEASE NAMES iculx libiculx PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -#find_library(ICULX_DEBUG NAMES iculxd libiculxd icculx libiculx PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +if(VCPKG_TARGET_IS_LINUX) + find_library(ICULX_RELEASE NAMES iculx libiculx PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) + find_library(ICULX_DEBUG NAMES iculxd libiculxd icculx libiculx PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +endif() find_library(ICUIO_RELEASE NAMES icuio libicuio PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(ICUIO_DEBUG NAMES icuiod libicuiod iccuio libicuio PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) find_library(ICUIN_RELEASE NAMES icui18n libicui18n icuin PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) From f8b91a067b412613a9a15917e4d056c0342e5011 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 14 Dec 2019 23:07:19 +0100 Subject: [PATCH 110/419] fix typo --- ports/qt5-base/portfile.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 63c959152d38ac..5551cf491e3373 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -107,19 +107,19 @@ find_library(SQLITE_RELEASE NAMES sqlite3 PATHS "${CURRENT_INSTALLED_DIR}/lib" N find_library(SQLITE_DEBUG NAMES sqlite3 sqlite3d PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) find_library(ICUUC_RELEASE NAMES icuuc libicuuc PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(ICUUC_DEBUG NAMES icuucd libicuucd iccuc libicuuc PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(ICUUC_DEBUG NAMES icuucd libicuucd icuuc libicuuc PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) find_library(ICUTU_RELEASE NAMES icutu libicutu PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(ICUTU_DEBUG NAMES icutud libicutud iccutu libicutu PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) if(VCPKG_TARGET_IS_LINUX) find_library(ICULX_RELEASE NAMES iculx libiculx PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) - find_library(ICULX_DEBUG NAMES iculxd libiculxd icculx libiculx PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) + find_library(ICULX_DEBUG NAMES iculxd libiculxd iculx libiculx PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) endif() find_library(ICUIO_RELEASE NAMES icuio libicuio PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(ICUIO_DEBUG NAMES icuiod libicuiod iccuio libicuio PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(ICUIO_DEBUG NAMES icuiod libicuiod icuio libicuio PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) find_library(ICUIN_RELEASE NAMES icui18n libicui18n icuin PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(ICUIN_DEBUG NAMES icui18nd libicui18nd iccui18n libicui18n icuin icuind PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(ICUIN_DEBUG NAMES icui18nd libicui18nd icui18n libicui18n icuin icuind PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) find_library(ICUDATA_RELEASE NAMES icudata libicudata icudt PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(ICUDATA_DEBUG NAMES icudatad libicudatad iccudata libicudata icudtd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(ICUDATA_DEBUG NAMES icudatad libicudatad icudata libicudata icudtd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) set(ICU_RELEASE "${ICUUC_RELEASE} ${ICUTU_RELEASE} ${ICULX_RELEASE} ${ICUIO_RELEASE} ${ICUIN_RELEASE} ${ICUDATA_RELEASE}") set(ICU_DEBUG "${ICUUC_DEBUG} ${ICUTU_DEBUG} ${ICULX_DEBUG} ${ICUIO_DEBUG} ${ICUIN_DEBUG} ${ICUDATA_DEBUG}") From 49b07cec385836adaf0f8e363b1b989446292d80 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 14 Dec 2019 23:16:47 +0100 Subject: [PATCH 111/419] print icu libs in debug --- ports/qt5-base/portfile.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 5551cf491e3373..21660bbd533a98 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -114,6 +114,8 @@ if(VCPKG_TARGET_IS_LINUX) find_library(ICULX_RELEASE NAMES iculx libiculx PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(ICULX_DEBUG NAMES iculxd libiculxd iculx libiculx PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) endif() +file(GLOB ICUNAMES "${CURRENT_INSTALLED_DIR}/debug/lib/*icu*.a") +message(FATAL_ERROR "ICUNAMES: ${ICUNAMES}") find_library(ICUIO_RELEASE NAMES icuio libicuio PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(ICUIO_DEBUG NAMES icuiod libicuiod icuio libicuio PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) find_library(ICUIN_RELEASE NAMES icui18n libicui18n icuin PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) From f97125a7fc53f3964872b444f1861de963e50a7d Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 14 Dec 2019 23:20:44 +0100 Subject: [PATCH 112/419] check releasenames --- ports/qt5-base/portfile.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 21660bbd533a98..f35d62246c7cec 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -110,11 +110,11 @@ find_library(ICUUC_RELEASE NAMES icuuc libicuuc PATHS "${CURRENT_INSTALLED_DIR}/ find_library(ICUUC_DEBUG NAMES icuucd libicuucd icuuc libicuuc PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) find_library(ICUTU_RELEASE NAMES icutu libicutu PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(ICUTU_DEBUG NAMES icutud libicutud iccutu libicutu PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -if(VCPKG_TARGET_IS_LINUX) - find_library(ICULX_RELEASE NAMES iculx libiculx PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) - find_library(ICULX_DEBUG NAMES iculxd libiculxd iculx libiculx PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -endif() -file(GLOB ICUNAMES "${CURRENT_INSTALLED_DIR}/debug/lib/*icu*.a") +#if(VCPKG_TARGET_IS_LINUX) +# find_library(ICULX_RELEASE NAMES iculx libiculx PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +# find_library(ICULX_DEBUG NAMES iculxd libiculxd iculx libiculx PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +#endif() +file(GLOB ICUNAMES "${CURRENT_INSTALLED_DIR}/lib/*icu*.a") message(FATAL_ERROR "ICUNAMES: ${ICUNAMES}") find_library(ICUIO_RELEASE NAMES icuio libicuio PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(ICUIO_DEBUG NAMES icuiod libicuiod icuio libicuio PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) From 920d0bd2965c82ea35097788144ce4867b69d65e Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 14 Dec 2019 23:25:40 +0100 Subject: [PATCH 113/419] try again --- ports/qt5-base/portfile.cmake | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index f35d62246c7cec..298816e598106a 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -110,12 +110,11 @@ find_library(ICUUC_RELEASE NAMES icuuc libicuuc PATHS "${CURRENT_INSTALLED_DIR}/ find_library(ICUUC_DEBUG NAMES icuucd libicuucd icuuc libicuuc PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) find_library(ICUTU_RELEASE NAMES icutu libicutu PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(ICUTU_DEBUG NAMES icutud libicutud iccutu libicutu PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -#if(VCPKG_TARGET_IS_LINUX) + +# Was installed in WSL but not on CI machine # find_library(ICULX_RELEASE NAMES iculx libiculx PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) # find_library(ICULX_DEBUG NAMES iculxd libiculxd iculx libiculx PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -#endif() -file(GLOB ICUNAMES "${CURRENT_INSTALLED_DIR}/lib/*icu*.a") -message(FATAL_ERROR "ICUNAMES: ${ICUNAMES}") + find_library(ICUIO_RELEASE NAMES icuio libicuio PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(ICUIO_DEBUG NAMES icuiod libicuiod icuio libicuio PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) find_library(ICUIN_RELEASE NAMES icui18n libicui18n icuin PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) From 219bd25808552e06a890c91c28573468c4141891 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 14 Dec 2019 23:34:51 +0100 Subject: [PATCH 114/419] change link order --- ports/qt5-base/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 298816e598106a..e408be61db903d 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -121,8 +121,8 @@ find_library(ICUIN_RELEASE NAMES icui18n libicui18n icuin PATHS "${CURRENT_INSTA find_library(ICUIN_DEBUG NAMES icui18nd libicui18nd icui18n libicui18n icuin icuind PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) find_library(ICUDATA_RELEASE NAMES icudata libicudata icudt PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(ICUDATA_DEBUG NAMES icudatad libicudatad icudata libicudata icudtd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -set(ICU_RELEASE "${ICUUC_RELEASE} ${ICUTU_RELEASE} ${ICULX_RELEASE} ${ICUIO_RELEASE} ${ICUIN_RELEASE} ${ICUDATA_RELEASE}") -set(ICU_DEBUG "${ICUUC_DEBUG} ${ICUTU_DEBUG} ${ICULX_DEBUG} ${ICUIO_DEBUG} ${ICUIN_DEBUG} ${ICUDATA_DEBUG}") +set(ICU_RELEASE "${ICUIN_RELEASE} ${ICUTU_RELEASE} ${ICULX_RELEASE} ${ICUUC_RELEASE} ${ICUIO_RELEASE} ${ICUDATA_RELEASE}") +set(ICU_DEBUG "${ICUIN_DEBUG} ${ICUTU_DEBUG} ${ICULX_DEBUG} ${ICUUC_DEBUG} ${ICUIO_DEBUG} ${ICUDATA_DEBUG}") find_library(FONTCONFIG_RELEASE NAMES fontconfig PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(FONTCONFIG_DEBUG NAMES fontconfig PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) From 44158ae66c3a05c984cf9729f2e410cab3ade38f Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sun, 15 Dec 2019 10:11:47 +0100 Subject: [PATCH 115/419] add icu to wrapper --- ports/qt5-base/vcpkg-cmake-wrapper.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ports/qt5-base/vcpkg-cmake-wrapper.cmake b/ports/qt5-base/vcpkg-cmake-wrapper.cmake index b4b3cda30642fa..1f048e3272a1ba 100644 --- a/ports/qt5-base/vcpkg-cmake-wrapper.cmake +++ b/ports/qt5-base/vcpkg-cmake-wrapper.cmake @@ -34,6 +34,9 @@ if("${_target_type}" STREQUAL "STATIC_LIBRARY") add_qt_library(Qt5::Core pcre2-16 + icuin icui18n + icutu icuuc icuio + icudt icudata Qt5ThemeSupport Qt5EventDispatcherSupport Qt5PlatformCompositorSupport From 1dc35a4f6d04a541064cd58d3f4b1596c5f8f939 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sun, 15 Dec 2019 10:11:54 +0100 Subject: [PATCH 116/419] fix typo --- ports/qt5-base/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index e408be61db903d..1a2b5b9cd2de13 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -109,7 +109,7 @@ find_library(SQLITE_DEBUG NAMES sqlite3 sqlite3d PATHS "${CURRENT_INSTALLED_DIR} find_library(ICUUC_RELEASE NAMES icuuc libicuuc PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(ICUUC_DEBUG NAMES icuucd libicuucd icuuc libicuuc PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) find_library(ICUTU_RELEASE NAMES icutu libicutu PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(ICUTU_DEBUG NAMES icutud libicutud iccutu libicutu PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(ICUTU_DEBUG NAMES icutud libicutud icutu libicutu PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) # Was installed in WSL but not on CI machine # find_library(ICULX_RELEASE NAMES iculx libiculx PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) From 34b5f72771619e85a6bfe83a18dea235d89991df Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sun, 15 Dec 2019 10:19:43 +0100 Subject: [PATCH 117/419] patch icu configure for static windows builds --- ports/qt5-base/patches/icu.patch | 15 +++++++++++++++ ports/qt5-base/portfile.cmake | 1 + 2 files changed, 16 insertions(+) create mode 100644 ports/qt5-base/patches/icu.patch diff --git a/ports/qt5-base/patches/icu.patch b/ports/qt5-base/patches/icu.patch new file mode 100644 index 00000000000000..6efdd08c3a1a04 --- /dev/null +++ b/ports/qt5-base/patches/icu.patch @@ -0,0 +1,15 @@ +diff --git a/src/corelib/configure.json b/src/corelib/configure.json +index de8d26a12..7847a46fa 100644 +--- a/src/corelib/configure.json ++++ b/src/corelib/configure.json +@@ -107,8 +107,8 @@ + "sources": [ + { + "builds": { +- "debug": "-lsicuind -lsicuucd -lsicudtd", +- "release": "-lsicuin -lsicuuc -lsicudt" ++ "debug": "-licuind -licuucd -licudtd", ++ "release": "-licuin -licuuc -licudt" + }, + "condition": "config.win32 && !features.shared" + }, diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 1a2b5b9cd2de13..4f494126a3fb46 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -38,6 +38,7 @@ qt_download_submodule( OUT_SOURCE_PATH SOURCE_PATH patches/windows_prf.patch #fixes the qtmain dependency due to the above move patches/qt_app.patch #Moves the target location of qt5 host apps to always install into the host dir. patches/gui_configure.patch #Patches the gui configure.json to break freetype/fontconfig autodetection because it does not include its dependencies. + patches/icu.patch #Help configure find static icu builds in vcpkg on windows #patches/static_opengl.patch #Use this patch if you really want to statically link angle on windows (e.g. using -opengl es2 and -static). #Be carefull since it requires definining _GDI32_ for all dependent projects due to redefinition errors in the #the windows supplied gl.h header and the angle gl.h otherwise. From 3ea1c2943605da6c512f5891629b6f0116345ec5 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sun, 15 Dec 2019 14:08:10 +0100 Subject: [PATCH 118/419] add other icu libraries to the icu patch --- ports/qt5-base/patches/icu.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/qt5-base/patches/icu.patch b/ports/qt5-base/patches/icu.patch index 6efdd08c3a1a04..191e2d74e27c65 100644 --- a/ports/qt5-base/patches/icu.patch +++ b/ports/qt5-base/patches/icu.patch @@ -8,8 +8,8 @@ index de8d26a12..7847a46fa 100644 "builds": { - "debug": "-lsicuind -lsicuucd -lsicudtd", - "release": "-lsicuin -lsicuuc -lsicudt" -+ "debug": "-licuind -licuucd -licudtd", -+ "release": "-licuin -licuuc -licudt" ++ "debug": "-licuind -licutud -licuucd -licuiod -licudtd", ++ "release": "-licuin -licutu -licuuc -licuio -licudt" }, "condition": "config.win32 && !features.shared" }, From 0f6574782e61d9a5ca36f4123d896864d91faa77 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sun, 15 Dec 2019 14:35:12 +0100 Subject: [PATCH 119/419] fix icu in x64-windows-static --- ports/qt5-base/patches/icu.patch | 17 +++++++++++++---- ports/qt5-base/portfile.cmake | 5 +++++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/ports/qt5-base/patches/icu.patch b/ports/qt5-base/patches/icu.patch index 191e2d74e27c65..16c13b0c36ce27 100644 --- a/ports/qt5-base/patches/icu.patch +++ b/ports/qt5-base/patches/icu.patch @@ -1,15 +1,24 @@ diff --git a/src/corelib/configure.json b/src/corelib/configure.json -index de8d26a12..7847a46fa 100644 +index de8d26a12..068b80c51 100644 --- a/src/corelib/configure.json +++ b/src/corelib/configure.json -@@ -107,8 +107,8 @@ +@@ -106,13 +106,17 @@ + "headers": [ "unicode/utypes.h", "unicode/ucol.h", "unicode/ustring.h" ], "sources": [ { ++ "libs": "", "builds": { - "debug": "-lsicuind -lsicuucd -lsicudtd", - "release": "-lsicuin -lsicuuc -lsicudt" -+ "debug": "-licuind -licutud -licuucd -licuiod -licudtd", -+ "release": "-licuin -licutu -licuuc -licuio -licudt" ++ "debug": "-licuind -licuucd -licudtd", ++ "release": "-licuin -licuuc -licudt" }, "condition": "config.win32 && !features.shared" }, ++ { "libs": "-licuind -licuucd -licudtd", "condition": "config.win32 && !features.shared"}, ++ { "libs": "-licuin -licuuc -licudt", "condition": "config.win32 && !features.shared"}, + { "libs": "-licuin -licuuc -licudt", "condition": "config.win32 && features.shared" }, ++ { "libs": "-licuind -licuucd -licudtd", "condition": "config.win32 && features.shared" }, + { "libs": "-licui18n -licuuc -licudata", "condition": "!config.win32" } + ], + "use": [ diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 4f494126a3fb46..443d462e11d01c 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -124,6 +124,11 @@ find_library(ICUDATA_RELEASE NAMES icudata libicudata icudt PATHS "${CURRENT_INS find_library(ICUDATA_DEBUG NAMES icudatad libicudatad icudata libicudata icudtd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) set(ICU_RELEASE "${ICUIN_RELEASE} ${ICUTU_RELEASE} ${ICULX_RELEASE} ${ICUUC_RELEASE} ${ICUIO_RELEASE} ${ICUDATA_RELEASE}") set(ICU_DEBUG "${ICUIN_DEBUG} ${ICUTU_DEBUG} ${ICULX_DEBUG} ${ICUUC_DEBUG} ${ICUIO_DEBUG} ${ICUDATA_DEBUG}") +if(VCPKG_TARGET_IS_WINDOWS) + set(ICU_RELEASE "${ICU_RELEASE} Advapi32.lib") + set(ICU_DEBUG "${ICU_DEBUG} Advapi32.lib" ) +endif() + find_library(FONTCONFIG_RELEASE NAMES fontconfig PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(FONTCONFIG_DEBUG NAMES fontconfig PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) From 7425e86ffa47e280a299ebeedfff5784fbd9fa43 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sun, 15 Dec 2019 22:22:57 +0100 Subject: [PATCH 120/419] remove vtk from baseline --- scripts/ci.baseline.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 35d11b2892d6e1..bfd5b3b37e0a93 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1687,7 +1687,6 @@ vlpp:arm64-windows=fail vlpp:arm-uwp=fail vlpp:x64-osx=fail vlpp:x64-uwp=fail -vtk:x64-linux=fail vulkan:arm64-windows=fail vulkan:arm-uwp=fail vulkan:x64-linux=fail From 516e76a531fa52074628f32454e45184130d0687 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sun, 15 Dec 2019 22:23:23 +0100 Subject: [PATCH 121/419] retry in CI --- ports/paraview/portfile.cmake | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/ports/paraview/portfile.cmake b/ports/paraview/portfile.cmake index cc3bb8e643875a..e412d53ba9f447 100644 --- a/ports/paraview/portfile.cmake +++ b/ports/paraview/portfile.cmake @@ -107,6 +107,9 @@ vcpkg_configure_cmake( "-DPython3_LIBRARY_DEBUG=${CURRENT_INSTALLED_DIR}/debug/lib/python37_d.lib" "-DPython3_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include/python3.7" "-DPython3_EXECUTABLE=${PYTHON3}" + "-DPYTHON3_EXECUTABLE=${PYTHON3}" + "-DPython_EXECUTABLE=${PYTHON3}" + "-DPYTHON_EXECUTABLE=${PYTHON3}" #-DPARAVIEW_ENABLE_FFMPEG:BOOL=OFF # OPTIONS_RELEASE -DOPTIMIZE=1 @@ -168,3 +171,10 @@ vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) file(INSTALL ${SOURCE_PATH}/License_v1.2.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/paraview RENAME copyright) # # Post-build test for cmake libraries # vcpkg_test_cmake(PACKAGE_NAME paraview) + + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(RENAME ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/lib) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/lib) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() \ No newline at end of file From ef5b16a72dc07dd3b9115fa3a1419077575f39a3 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sun, 15 Dec 2019 23:32:52 +0100 Subject: [PATCH 122/419] update baseline. VTK builds in local WSL so it should work in CI --- scripts/ci.baseline.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index ba968d1fbdd3ef..fa82b4ac175db8 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1688,7 +1688,6 @@ vlpp:arm64-windows=fail vlpp:arm-uwp=fail vlpp:x64-osx=fail vlpp:x64-uwp=fail -vtk:x64-linux=fail vulkan:arm64-windows=fail vulkan:arm-uwp=fail vulkan:x64-linux=fail From 832ac09a1fffd9dc553ad87d3e1009abccab2951 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sun, 15 Dec 2019 23:36:21 +0100 Subject: [PATCH 123/419] update VTK control to force rebuild --- ports/vtk/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL index 990e2aa329fea9..f0731b24c42a3a 100644 --- a/ports/vtk/CONTROL +++ b/ports/vtk/CONTROL @@ -1,5 +1,5 @@ Source: vtk -Version: 8.2.0-9 +Version: 8.2.0-10 Description: Software system for 3D computer graphics, image processing, and visualization Homepage: https://github.com/Kitware/VTK Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, libtheora, eigen3, double-conversion, pugixml, libharu, sqlite3, netcdf-c From 59fc67e8f5f647fbdb74d822dd11ef21b00f4dc2 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 16 Dec 2019 09:20:40 +0100 Subject: [PATCH 124/419] remove qt5-tools=pass from baseline --- scripts/ci.baseline.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index fa82b4ac175db8..cb35aca381bee5 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1377,8 +1377,6 @@ qt5-macextras:x64-linux=fail qt5-macextras:x64-windows=fail qt5-macextras:x64-windows-static=fail qt5-macextras:x86-windows=fail -qt5-tools:x64-linux=pass -qt5-tools:x64-windows-static=pass qt5-winextras:x64-linux=fail qt5-winextras:x64-osx=fail quickfast:x64-linux=ignore From a5d6154cf8ed4fbc19bc993c1f3e9a7df94a0d29 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 16 Dec 2019 11:23:48 +0100 Subject: [PATCH 125/419] update baseline; vtk/paraview make vtkm a feature; paraview make python a feature and hopefully trick findPython --- ports/paraview/CONTROL | 10 +++- ports/paraview/portfile.cmake | 86 +++++++++++++++++++++++++---------- ports/vtk/CONTROL | 8 +++- ports/vtk/portfile.cmake | 12 +++-- scripts/ci.baseline.txt | 5 ++ 5 files changed, 89 insertions(+), 32 deletions(-) diff --git a/ports/paraview/CONTROL b/ports/paraview/CONTROL index 16c700ddfdb400..503552ce005380 100644 --- a/ports/paraview/CONTROL +++ b/ports/paraview/CONTROL @@ -3,7 +3,15 @@ Version: 5.7.0 Homepage: https://www.paraview.org/ Description: VTK-based Data Analysis and Visualization Application Build-Depends: vtk[paraview], protobuf, cgns, boost-core, boost-format, boost-algorithm -Default-Features: +Default-Features: python + +Feature: vtkm +Description: enables vtkm for the build of paraview +Build-Depends: vtk[vtkm] + +Feature: python +Description: enables the build of python wrappers +Build-Depends: vtk[python] Feature: all_modules Description: enables the build of all paraview modules diff --git a/ports/paraview/portfile.cmake b/ports/paraview/portfile.cmake index e412d53ba9f447..bf5c88e0f4239b 100644 --- a/ports/paraview/portfile.cmake +++ b/ports/paraview/portfile.cmake @@ -67,7 +67,6 @@ vcpkg_from_gitlab( SHA512 34ad7c97720366dd66c011aecbaf7103ebcc128223673140d42db32c6eb419c805da204ac9afe73dae4c9b2ef9acfc4ec1b927271351fde51c9df7c44d09bf6e ) -#file(REMOVE_RECURSE ${SOURCE_PATH}/Utilities/VisItBridge) file(COPY ${VISITIT_SOURCE_PATH}/ DESTINATION ${SOURCE_PATH}/Utilities/VisItBridge) file(COPY ${QTTESTING_SOURCE_PATH}/ DESTINATION ${SOURCE_PATH}/ThirdParty/QtTesting/vtkqttesting) #file(REMOVE_RECURSE ${SOURCE_PATH}/ThirdPary/protobuf/vtkprotobuf) @@ -81,9 +80,39 @@ file(COPY ${QTTESTING_SOURCE_PATH}/ DESTINATION ${SOURCE_PATH}/ThirdParty/QtTest # tbb ROCKSDB_IGNORE_PACKAGE_TBB # ) -vcpkg_find_acquire_program(PYTHON3) -#get_filename_component(PYTHON3_EXE_PATH ${PYTHON3} DIRECTORY) -#vcpkg_add_to_path(PREPEND "${PYTHON3_EXE_PATH}") +if("python" IN_LIST FEATURES) + vcpkg_find_acquire_program(PYTHON3) + list(APPEND ADDITIONAL_OPTIONS + -DPARAVIEW_ENABLE_PYTHON:BOOL=ON + -DVTK_PYTHON_VERSION=3 + -DPython3_FIND_REGISTRY=NEVER + "-DPython3_FOUND=YES" + "-DPYTHON3_FOUND=YES" + "-DPYTHON_FOUND=YES" + "-DPython3_LIBRARY_RELEASE=${CURRENT_INSTALLED_DIR}/lib/python37.lib" + "-DPython3_LIBRARY_DEBUG=${CURRENT_INSTALLED_DIR}/debug/lib/python37_d.lib" + "-DPython3_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include/python3.7" + "-DPython3_EXECUTABLE=${PYTHON3}" + "-DPYTHON3_EXECUTABLE=${PYTHON3}" + "-DPython_EXECUTABLE=${PYTHON3}" + "-DPYTHON_EXECUTABLE=${PYTHON3}" + ) + #VTK_PYTHON_SITE_PACKAGES_SUFFIX should be set to the install dir of the site-packages +else() + list(APPEND ADDITIONAL_OPTIONS + -DPARAVIEW_ENABLE_PYTHON:BOOL=OFF + ) +endif() + +if("vtkm" IN_LIST FEATURES) + list(APPEND ADDITIONAL_OPTIONS + -DPARAVIEW_USE_VTKM:BOOL=ON # VTK-m port is missing but this is a requirement to build VisItLib + ) +else() + list(APPEND ADDITIONAL_OPTIONS + -DPARAVIEW_USE_VTKM:BOOL=OFF # VTK-m port is missing but this is a requirement to build VisItLib + ) +endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} @@ -91,37 +120,27 @@ vcpkg_configure_cmake( OPTIONS -DPARAVIEW_USE_EXTERNAL:BOOL=ON -DPARAVIEW_USE_EXTERNAL_VTK:BOOL=ON - -DPARAVIEW_ENABLE_PYTHON:BOOL=ON - -DPARAVIEW_USE_VTKM:BOOL=ON # VTK-m port is missing but this is a requirement to build VisItLib -DPARAVIEW_ENABLE_VISITBRIDGE:BOOL=ON -DPARAVIEW_ENABLE_CATALYST:BOOL=ON -DVTK_MODULE_ENABLE_ParaView_qttesting=YES -DPARAVIEW_ENABLE_EMBEDDED_DOCUMENTATION=OFF -DPARAVIEW_USE_QTHELP=OFF + + #A little bit of help in finding the boost headers -DBoost_INCLUDE_DIR:PATH="${CURRENT_INSTALLED_DIR}/include" + + # Workarounds for CMake issues -DHAVE_SYS_TYPES_H=0 ## For some strange reason the test first succeeds and then fails the second time around -DWORDS_BIGENDIAN=0 ## Tests fails in VisItCommon.cmake for some unknown reason this is just a workaround since most systems are little endian. - # Help find Python3 correctly - "-DPython3_LIBRARY_RELEASE=${CURRENT_INSTALLED_DIR}/lib/python37.lib" - "-DPython3_LIBRARY_DEBUG=${CURRENT_INSTALLED_DIR}/debug/lib/python37_d.lib" - "-DPython3_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include/python3.7" - "-DPython3_EXECUTABLE=${PYTHON3}" - "-DPYTHON3_EXECUTABLE=${PYTHON3}" - "-DPython_EXECUTABLE=${PYTHON3}" - "-DPYTHON_EXECUTABLE=${PYTHON3}" + #-DPARAVIEW_ENABLE_FFMPEG:BOOL=OFF - # OPTIONS_RELEASE -DOPTIMIZE=1 - # OPTIONS_DEBUG -DDEBUGGABLE=1 + ##VTK_MODULE_USE_EXTERNAL_ ) -#TODO. Patch .cmake from FindPythonModules in CMakeLists.txt away -#VTK_MODULE_USE_EXTERNAL_ -vcpkg_install_cmake(ADD_BIN_TO_PATH) +vcpkg_install_cmake(ADD_BIN_TO_PATH) # Bin to path required since paraview will use some self build tools -# # Moves all .cmake files from /debug/share/paraview/ to /share/paraview/ -# # See /docs/maintainers/vcpkg_fixup_cmake_targets.md for more details vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/paraview-5.7) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) @@ -173,8 +192,27 @@ vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) # vcpkg_test_cmake(PACKAGE_NAME paraview) -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(RENAME ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/lib) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + macro(move_bin_to_lib name) + if(EXISTS ${CURRENT_PACKAGES_DIR}/bin/${name}) + file(RENAME "${CURRENT_PACKAGES_DIR}/bin/${name}" "${CURRENT_PACKAGES_DIR}/lib/${name}") + endif() + if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/bin/${name}) + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/${name}" "${CURRENT_PACKAGES_DIR}/debug/lib/${name}") + endif() + endmacro() + + set(to_move Lib paraview-5.7 paraview-config) + foreach(name ${to_move}) + move_bin_to_lib(${name}) + endforeach() + + file(GLOB_RECURSE cmake_files ${CURRENT_PACKAGES_DIR}/share/${PORT}/*.cmake) + foreach(cmake_file ${cmake_files}) + file(READ "${cmake_file}" _contents) + STRING(REPLACE "/bin/" "/lib/" _contents "${_contents}") + file(WRITE "${cmake_file}" "${_contents}") + endforeach() + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) endif() \ No newline at end of file diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL index 4777044220c566..2df22650fa7e2c 100644 --- a/ports/vtk/CONTROL +++ b/ports/vtk/CONTROL @@ -2,7 +2,11 @@ Source: vtk Version: 8.90-PV-v5.7 Description: Software system for 3D computer graphics, image processing, and visualization Homepage: https://github.com/Kitware/VTK -Build-Depends: vtk-m, zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, liblzma, libtheora, eigen3, double-conversion, pugixml, libharu[notiffsymbols], sqlite3, netcdf-c, utfcpp, libogg +Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, liblzma, libtheora, eigen3, double-conversion, pugixml, libharu[notiffsymbols], sqlite3, netcdf-c, utfcpp, libogg + +Feature: vtkm +Description: Build with vtk-m accelerator and module. +Build-Depends: vtk-m Feature: openvr Description: OpenVR functionality for VTK @@ -26,7 +30,7 @@ Build-Depends: atlmfc (windows) Feature: paraview Description: Build vtk modules required by paraview -Build-Depends: vtk[qt, python], vtk[atlmfc] (windows) +Build-Depends: vtk[qt], vtk[atlmfc] (windows) Feature: all Description: Build vtk modules required by paraview diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 699949cfc90252..87c19cc2df61b4 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -25,6 +25,13 @@ else() -DVTK_BUILD_QT_DESIGNER_PLUGIN=OFF) endif() +if("vtkm" IN_LIST FEATURES) + list(APPEND ADDITIONAL_OPTIONS + -DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKm=YES + -DVTK_MODULE_ENABLE_VTK_vtkm=YES + ) +endif() + if("python" IN_LIST FEATURES) vcpkg_find_acquire_program(PYTHON3) list(APPEND ADDITIONAL_OPTIONS @@ -41,7 +48,6 @@ if("python" IN_LIST FEATURES) endif() if("paraview" IN_LIST FEATURES) - vcpkg_find_acquire_program(PYTHON3) list(APPEND ADDITIONAL_OPTIONS -DVTK_MODULE_ENABLE_VTK_FiltersParallelStatistics=YES -DVTK_MODULE_ENABLE_VTK_IOParallelExodus=YES @@ -122,13 +128,9 @@ vcpkg_configure_cmake( -DVTK_GROUP_ENABLE_StandAlone=YES -DVTK_GROUP_ENABLE_Rendering=YES -DVTK_GROUP_ENABLE_Views=YES - -DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKm=YES - -DVTK_MODULE_ENABLE_VTK_vtkm=YES # Select modules / groups to install -DVTK_USE_EXTERNAL:BOOL=ON -DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps:BOOL=OFF # Not yet in VCPKG - - ${ADDITIONAL_OPTIONS} ) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index bfd5b3b37e0a93..adadebb74eb89a 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1695,6 +1695,11 @@ vulkan:x64-uwp=fail vulkan:x64-windows=fail vulkan:x64-windows-static=fail vulkan:x86-windows=fail +# vtk-m cannot be build on x86, ARM or uwp +vtk-m:x86-windows=skip +vtk-m:arm64-windows=skip +vtk-m:x64-uwp=skip +vtk-m:arm-uwp=skip # Conflicts with latest openjpeg port (vxl ships with an old version of openjpeg) # conflicts with qt5-location vxl:arm64-windows = skip From a1fe38d874cef0e031cec1f1f735387c2fed1513 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 16 Dec 2019 13:31:05 +0100 Subject: [PATCH 126/419] change patch a bit. unrecognized modules are probably not needed! --- ports/paraview/paraview.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/paraview/paraview.patch b/ports/paraview/paraview.patch index e7077856e6a576..2a436b81b6e12c 100644 --- a/ports/paraview/paraview.patch +++ b/ports/paraview/paraview.patch @@ -76,21 +76,21 @@ index 588da1883..28af52f7a 100644 + endif() + else() + list(APPEND _to_remove ${mod}) -+ list(APPEND vtk_modules ${mod}) ++ #list(APPEND vtk_modules ${mod}) #probably do not need to add unrecognized_modules to the wrapper + endif() + endforeach() + message(STATUS "UNRECOGNIZED:${paraview_unrecognized_modules}") + list(REMOVE_ITEM paraview_unrecognized_modules ${_to_remove}) + message(STATUS "REJECTED MODULES: ${paraview_rejected_modules}") -+ message(STATUS "UNRECOGNIZED WITHOUT REJECTED AND KNOWN TARGETS (should be empty): ${paraview_unrecognized_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}) + message(STATUS "Unnecessary MODULES: ${_unnecessary_moduls}") -+ if(paraview_unrecognized_modules OR modules_notarget) ++ if(modules_notarget) + message(FATAL_ERROR + "The following modules were requested or required, but not found: " -+ "${modules_notarget};${paraview_unrecognized_modules}.") ++ "${modules_notarget}") + endif() + list(REMOVE_DUPLICATES vtk_modules) endif () From 850e6cc712bcfabcbb9b5e327775ba1d7e0343c4 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 16 Dec 2019 13:32:18 +0100 Subject: [PATCH 127/419] fix second patch --- ports/paraview/second.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/paraview/second.patch b/ports/paraview/second.patch index 2abd9f2d22b1ba..e3feaecd221fa8 100644 --- a/ports/paraview/second.patch +++ b/ports/paraview/second.patch @@ -15,7 +15,7 @@ index a39d533df..8683c81d3 100644 endforeach() foreach(mod ${paraview_unrecognized_modules}) @@ -760,6 +765,35 @@ if (PARAVIEW_USE_EXTERNAL_VTK) - "${modules_notarget};${paraview_unrecognized_modules}.") + "${modules_notarget}") endif() list(REMOVE_DUPLICATES vtk_modules) + macro(search_dependent_targets) From 8f14d1cb398353b32319fa20b3bf7b7866c612b2 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 16 Dec 2019 14:02:16 +0100 Subject: [PATCH 128/419] forgot to add addoptional options to portfile --- ports/paraview/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/paraview/portfile.cmake b/ports/paraview/portfile.cmake index bf5c88e0f4239b..2be922f260a53a 100644 --- a/ports/paraview/portfile.cmake +++ b/ports/paraview/portfile.cmake @@ -132,7 +132,7 @@ vcpkg_configure_cmake( # Workarounds for CMake issues -DHAVE_SYS_TYPES_H=0 ## For some strange reason the test first succeeds and then fails the second time around -DWORDS_BIGENDIAN=0 ## Tests fails in VisItCommon.cmake for some unknown reason this is just a workaround since most systems are little endian. - + ${ADDITIONAL_OPTIONS} #-DPARAVIEW_ENABLE_FFMPEG:BOOL=OFF From 186138065e8f2d7d54df5e30f69e60582c849d6f Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 16 Dec 2019 14:17:48 +0100 Subject: [PATCH 129/419] cannot get python to work in CI. Drop it as a feature for now --- ports/paraview/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/paraview/CONTROL b/ports/paraview/CONTROL index 503552ce005380..52d78ab407650a 100644 --- a/ports/paraview/CONTROL +++ b/ports/paraview/CONTROL @@ -3,7 +3,7 @@ Version: 5.7.0 Homepage: https://www.paraview.org/ Description: VTK-based Data Analysis and Visualization Application Build-Depends: vtk[paraview], protobuf, cgns, boost-core, boost-format, boost-algorithm -Default-Features: python +Default-Features: Feature: vtkm Description: enables vtkm for the build of paraview From e8575887499b90316da12c78d3cb4ff023b3e5b2 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 16 Dec 2019 17:04:06 +0100 Subject: [PATCH 130/419] Actiavte feature only if python is also enabled --- ports/vtk/portfile.cmake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 87c19cc2df61b4..8f31c32e75256a 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -60,11 +60,16 @@ if("paraview" IN_LIST FEATURES) -DVTK_MODULE_ENABLE_VTK_IOTRUCHAS=YES -DVTK_MODULE_ENABLE_VTK_IOVPIC=YES -DVTK_MODULE_ENABLE_VTK_RenderingLICOpenGL2=YES - -DVTK_MODULE_ENABLE_VTK_RenderingMatplotlib=YES -DVTK_MODULE_ENABLE_VTK_RenderingAnnotation=YES ) endif() +if("python" IN_LIST FEATURES AND "paraview" IN_LIST FEATURES) + list(APPEND ADDITIONAL_OPTIONS + -DVTK_MODULE_ENABLE_VTK_RenderingMatplotlib=YES + ) +endif() + if("mpi" IN_LIST FEATURES) set(VTK_GROUP_ENABLE_MPI NO) endif() From b924ed14422510adc8e059b3fe5597889a384888 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 16 Dec 2019 22:02:51 +0100 Subject: [PATCH 131/419] instal static python headers only if they exist --- ports/vtk/portfile.cmake | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 8f31c32e75256a..70915cf3def9df 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -261,12 +261,14 @@ if("paraview" IN_LIST FEATURES) file(INSTALL ${SOURCE_PATH}/Filters/Statistics/vtkStatisticsAlgorithmPrivate.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/vtk-8.90) file(INSTALL ${SOURCE_PATH}/Rendering/OpenGL2/vtkCompositePolyDataMapper2Internal.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/vtk-8.90) file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Rendering/OpenGL2/vtkTextureObjectVS.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/vtk-8.90) - #file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/CMakeFiles/static_python/vtkpythonmodules.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/vtk-8.90) - if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + if(EXISTS ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/CMakeFiles/static_python) #python headers file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/CMakeFiles/static_python DESTINATION ${CURRENT_PACKAGES_DIR}/include/vtk-8.90) endif() endif() - + #TODO remove one get_filename_component(_vtk_module_import_prefix "${_vtk_module_import_prefix}" DIRECTORY) from vtk-prefix.cmake and VTK-vtk-module-properties and vtk-python.cmake set(filenames_fix_prefix vtk-prefix VTK-vtk-module-properties vtk-python) foreach(name ${filenames_fix_prefix}) From 68728688abf6d9edf9e0e73850757e9c96377c96 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 17 Dec 2019 00:35:30 +0100 Subject: [PATCH 132/419] added plugin patch --- ports/paraview/portfile.cmake | 1 + ports/paraview/qt_plugin.patch | 49 ++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 ports/paraview/qt_plugin.patch diff --git a/ports/paraview/portfile.cmake b/ports/paraview/portfile.cmake index 2be922f260a53a..d3f5c8a362876c 100644 --- a/ports/paraview/portfile.cmake +++ b/ports/paraview/portfile.cmake @@ -41,6 +41,7 @@ vcpkg_from_github( paraview.patch second.patch protobuf.patch + qt_plugin.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") diff --git a/ports/paraview/qt_plugin.patch b/ports/paraview/qt_plugin.patch new file mode 100644 index 00000000000000..e03edcecd5e3fd --- /dev/null +++ b/ports/paraview/qt_plugin.patch @@ -0,0 +1,49 @@ +diff --git a/7acd25790d-2617ee1c2c-org/Qt/Widgets/CMakeLists.txt b/7acd25790d-2617ee1c2c/Qt/Widgets/CMakeLists.txt +index 93000c493..5f2a06752 100644 +--- a/7acd25790d-2617ee1c2c-org/Qt/Widgets/CMakeLists.txt ++++ b/7acd25790d-2617ee1c2c/Qt/Widgets/CMakeLists.txt +@@ -139,17 +139,42 @@ set(CMAKE_AUTORCC 1) + set(CMAKE_AUTOUIC 1) + set(CMAKE_AUTOUIC_SEARCH_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/Resources/UI") + ++## ++if(NOT PARAVIEW_BUILD_SHARED_LIBS) # Should be a check if Qt is built statically and not ParaView ++ list(APPEND qt_components Svg Sql) # added due to svg rescources, sql due to VTK::GUISupportQtSQL ++ set(qt_plugin_list) ++ foreach(qt_component ${qt_components}) ++ list(APPEND qt_plugin_list ${Qt5${qt_component}_PLUGINS}) ++ message(STATUS "QtPlugin List: ${qt_plugin_list}") ++ endforeach() ++ set(qt_plugin_source "${CMAKE_CURRENT_BINARY_DIR}/qt_static_plugins.cxx") ++ if(EXISTS "${qt_plugin_source}") ++ file(REMOVE "${qt_plugin_source}") ++ endif() ++ set(qt_source_text "#ifdef QT_STATIC\n") ++ foreach(qt_plugin ${qt_plugin_list}) ++ STRING(REGEX REPLACE "[^:]+::" "" qt_plugin_name "${qt_plugin}") ++ message(STATUS "RAW PLUGIN NAME: ${qt_plugin_name}") ++ string(APPEND qt_source_text "Q_IMPORT_PLUGIN(${qt_plugin_name})\n") ++ endforeach() ++ string(APPEND qt_source_text "#endif\n") ++ file(WRITE "${qt_plugin_source}" "${qt_source_text}") ++endif() ++## ++ + vtk_module_add_module(ParaView::pqWidgets + CLASSES ${classes} + SOURCES ${ui_files} +- ${resource_files}) ++ ${resource_files} ++ ${qt_plugin_source}) + vtk_module_link(ParaView::pqWidgets + PUBLIC + Qt5::Core + Qt5::Gui + Qt5::Widgets + PRIVATE +- Qt5::Network) ++ Qt5::Network ++ ${qt_plugin_list}) + + if (APPLE) + vtk_module_link(ParaView::pqWidgets From 3cfc2313cb8039e3e97376f9b3161df94cab6a0a Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 17 Dec 2019 00:50:31 +0100 Subject: [PATCH 133/419] forgot to fix the paths in the patch --- ports/paraview/qt_plugin.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/paraview/qt_plugin.patch b/ports/paraview/qt_plugin.patch index e03edcecd5e3fd..1cbf14b7666552 100644 --- a/ports/paraview/qt_plugin.patch +++ b/ports/paraview/qt_plugin.patch @@ -1,7 +1,7 @@ -diff --git a/7acd25790d-2617ee1c2c-org/Qt/Widgets/CMakeLists.txt b/7acd25790d-2617ee1c2c/Qt/Widgets/CMakeLists.txt +diff --git a/Qt/Widgets/CMakeLists.txt b/Qt/Widgets/CMakeLists.txt index 93000c493..5f2a06752 100644 ---- a/7acd25790d-2617ee1c2c-org/Qt/Widgets/CMakeLists.txt -+++ b/7acd25790d-2617ee1c2c/Qt/Widgets/CMakeLists.txt +--- a/Qt/Widgets/CMakeLists.txt ++++ b/Qt/Widgets/CMakeLists.txt @@ -139,17 +139,42 @@ set(CMAKE_AUTORCC 1) set(CMAKE_AUTOUIC 1) set(CMAKE_AUTOUIC_SEARCH_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/Resources/UI") From 29e0eb06dad77da225bf4be962a4723be9af572f Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 17 Dec 2019 13:22:57 +0100 Subject: [PATCH 134/419] add missing include --- ports/paraview/qt_plugin.patch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ports/paraview/qt_plugin.patch b/ports/paraview/qt_plugin.patch index 1cbf14b7666552..2f4763c4908e00 100644 --- a/ports/paraview/qt_plugin.patch +++ b/ports/paraview/qt_plugin.patch @@ -2,7 +2,7 @@ diff --git a/Qt/Widgets/CMakeLists.txt b/Qt/Widgets/CMakeLists.txt index 93000c493..5f2a06752 100644 --- a/Qt/Widgets/CMakeLists.txt +++ b/Qt/Widgets/CMakeLists.txt -@@ -139,17 +139,42 @@ set(CMAKE_AUTORCC 1) +@@ -139,17 +139,43 @@ set(CMAKE_AUTORCC 1) set(CMAKE_AUTOUIC 1) set(CMAKE_AUTOUIC_SEARCH_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/Resources/UI") @@ -18,11 +18,12 @@ index 93000c493..5f2a06752 100644 + if(EXISTS "${qt_plugin_source}") + file(REMOVE "${qt_plugin_source}") + endif() ++ set(qt_source_text "#include \n") + set(qt_source_text "#ifdef QT_STATIC\n") + foreach(qt_plugin ${qt_plugin_list}) + STRING(REGEX REPLACE "[^:]+::" "" qt_plugin_name "${qt_plugin}") + message(STATUS "RAW PLUGIN NAME: ${qt_plugin_name}") -+ string(APPEND qt_source_text "Q_IMPORT_PLUGIN(${qt_plugin_name})\n") ++ string(APPEND qt_source_text " Q_IMPORT_PLUGIN(${qt_plugin_name})\n") + endforeach() + string(APPEND qt_source_text "#endif\n") + file(WRITE "${qt_plugin_source}" "${qt_source_text}") From 806e1ece7eb30e168086e03ed3274237d090e368 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 18 Dec 2019 12:50:49 +0100 Subject: [PATCH 135/419] fix netcdf targets and configure errors --- .../fix_config_errors_and_targets.patch | 44 +++++++++++++++++++ ports/netcdf-c/portfile.cmake | 26 +++++++++-- 2 files changed, 66 insertions(+), 4 deletions(-) create mode 100644 ports/netcdf-c/fix_config_errors_and_targets.patch diff --git a/ports/netcdf-c/fix_config_errors_and_targets.patch b/ports/netcdf-c/fix_config_errors_and_targets.patch new file mode 100644 index 00000000000000..a500e0844f1d12 --- /dev/null +++ b/ports/netcdf-c/fix_config_errors_and_targets.patch @@ -0,0 +1,44 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 96fbaf979..e5089ad4f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -261,7 +261,7 @@ ENDIF() + INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) + INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/oc2) + INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/libsrc) +-SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_SOURCE_DIR}/libsrc) ++list(APPEND CMAKE_REQUIRED_INCLUDES ${CMAKE_SOURCE_DIR}/libsrc) + + ################################ + # End Compiler Configuration +@@ -726,7 +726,7 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) + FIND_LIBRARY(SZIP NAMES szip sz) + IF(SZIP) + SET(HAVE_H5Z_SZIP 1) +- SET(SZIP_LIBRARY ${SZIP}) ++ #SET(SZIP_LIBRARY ${SZIP}) + SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${SZIP}) + ELSE() + MESSAGE(FATAL_ERROR "HDF5 Requires SZIP, but cannot find libszip or libsz.") +diff --git a/liblib/CMakeLists.txt b/liblib/CMakeLists.txt +index 6a81a4801..74173c1d3 100644 +--- a/liblib/CMakeLists.txt ++++ b/liblib/CMakeLists.txt +@@ -61,7 +61,7 @@ SET(TLL_LIBS "") + SET(TLL_LIBS ${TLL_LIBS} ${HAVE_LIBM} ${ZLIB_LIBRARY}) + + # Add extra dependencies specified via NC_EXTRA_DEPS +-SET(TLL_LIBS ${TLL_LIBS} ${EXTRA_DEPS}) ++#SET(TLL_LIBS ${TLL_LIBS} ${EXTRA_DEPS}) + + IF(HAVE_LIBDL) + SET(TLL_LIBS ${LIBDL} ${TLL_LIBS}) +@@ -100,7 +102,7 @@ IF(ENABLE_PNETCDF AND PNETCDF) + ENDIF() + + IF(TLL_LIBS) +- LIST(REMOVE_DUPLICATES TLL_LIBS) ++ #LIST(REMOVE_DUPLICATES TLL_LIBS) //removes deuplicate debug/optimize + ENDIF() + + TARGET_LINK_LIBRARIES(netcdf ${TLL_LIBS}) diff --git a/ports/netcdf-c/portfile.cmake b/ports/netcdf-c/portfile.cmake index f3a80ee48ef271..e74d13e217a60e 100644 --- a/ports/netcdf-c/portfile.cmake +++ b/ports/netcdf-c/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Unidata/netcdf-c @@ -14,6 +12,7 @@ vcpkg_from_github( hdf5_2.patch fix-build-error-on-linux.patch hdf5_3.patch + fix_config_errors_and_targets.patch ) #Remove outdated find modules @@ -25,10 +24,17 @@ if(VCPKG_CRT_LINKAGE STREQUAL "static") else() set(NC_USE_STATIC_CRT OFF) endif() +#NC_EXTRA_DEPS +find_library(ZLIB_RELEASE NAMES z zlib PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(ZLIB_DEBUG NAMES z zlib zd zlibd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(SZIP_RELEASE NAMES libsz libszip szip sz PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(SZIP_DEBUG NAMES libsz libszip szip sz libsz_D libszip_D szip_D sz_D szip_debug PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +#find_library(CURL_RELEASE NAMES curl libcurl PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +#find_library(CURL_DEBUG NAMES curl_d libcurl_d curld libcurld curl libcurl PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - DISABLE_PARALLEL_CONFIGURE + DISABLE_PARALLEL_CONFIGURE # netcdf-c configures in the source! PREFER_NINJA OPTIONS -DBUILD_UTILITIES=OFF @@ -41,10 +47,22 @@ vcpkg_configure_cmake( -DDISABLE_INSTALL_DEPENDENCIES=ON -DNC_USE_STATIC_CRT=${NC_USE_STATIC_CRT} -DConfigPackageLocation=share/netcdf + "-DNC_EXTRA_DEPS=zlib szip" #The functions checks done by cmake are actual failing due to missing external symbols. This should fix it. + "-DCURL_INCLUDE_DIRS=${CURRENT_INSTALLED_DIR}/include" + "-DCMAKE_REQUIRED_INCLUDES=${CURRENT_INSTALLED_DIR}/include" # the curl variable make the curl checks succesful + "-DSZIP_LIBRARY:STRING=debug\\\\\\\\\\\;${SZIP_DEBUG}\\\\\\\\\\\;optimized\\\\\\\\\\\;${SZIP_RELEASE}" + OPTIONS_RELEASE + "-Dzlib_DEP=${ZLIB_RELEASE}" + "-Dszip_DEP=${SZIP_RELEASE}" + "-DSZIP=${SZIP_RELEASE}" + OPTIONS_DEBUG + "-Dzlib_DEP=${ZLIB_DEBUG}" + "-Dszip_DEP=${SZIP_DEBUG}" + "-DSZIP=${SZIP_DEBUG}" ) vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/netcdf) +vcpkg_fixup_cmake_targets(CONFIG_PATH share/netcdf TARGET_PATH share/netcdf) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/bin) From 06488742ba157416c926f976e254c553d190c786 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 18 Dec 2019 12:52:32 +0100 Subject: [PATCH 136/419] fix netcdf configure errors and generated targets --- .../fix_config_errors_and_targets.patch | 44 +++++++++++++++++++ ports/netcdf-c/portfile.cmake | 26 +++++++++-- 2 files changed, 66 insertions(+), 4 deletions(-) create mode 100644 ports/netcdf-c/fix_config_errors_and_targets.patch diff --git a/ports/netcdf-c/fix_config_errors_and_targets.patch b/ports/netcdf-c/fix_config_errors_and_targets.patch new file mode 100644 index 00000000000000..a500e0844f1d12 --- /dev/null +++ b/ports/netcdf-c/fix_config_errors_and_targets.patch @@ -0,0 +1,44 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 96fbaf979..e5089ad4f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -261,7 +261,7 @@ ENDIF() + INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) + INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/oc2) + INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/libsrc) +-SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_SOURCE_DIR}/libsrc) ++list(APPEND CMAKE_REQUIRED_INCLUDES ${CMAKE_SOURCE_DIR}/libsrc) + + ################################ + # End Compiler Configuration +@@ -726,7 +726,7 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) + FIND_LIBRARY(SZIP NAMES szip sz) + IF(SZIP) + SET(HAVE_H5Z_SZIP 1) +- SET(SZIP_LIBRARY ${SZIP}) ++ #SET(SZIP_LIBRARY ${SZIP}) + SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${SZIP}) + ELSE() + MESSAGE(FATAL_ERROR "HDF5 Requires SZIP, but cannot find libszip or libsz.") +diff --git a/liblib/CMakeLists.txt b/liblib/CMakeLists.txt +index 6a81a4801..74173c1d3 100644 +--- a/liblib/CMakeLists.txt ++++ b/liblib/CMakeLists.txt +@@ -61,7 +61,7 @@ SET(TLL_LIBS "") + SET(TLL_LIBS ${TLL_LIBS} ${HAVE_LIBM} ${ZLIB_LIBRARY}) + + # Add extra dependencies specified via NC_EXTRA_DEPS +-SET(TLL_LIBS ${TLL_LIBS} ${EXTRA_DEPS}) ++#SET(TLL_LIBS ${TLL_LIBS} ${EXTRA_DEPS}) + + IF(HAVE_LIBDL) + SET(TLL_LIBS ${LIBDL} ${TLL_LIBS}) +@@ -100,7 +102,7 @@ IF(ENABLE_PNETCDF AND PNETCDF) + ENDIF() + + IF(TLL_LIBS) +- LIST(REMOVE_DUPLICATES TLL_LIBS) ++ #LIST(REMOVE_DUPLICATES TLL_LIBS) //removes deuplicate debug/optimize + ENDIF() + + TARGET_LINK_LIBRARIES(netcdf ${TLL_LIBS}) diff --git a/ports/netcdf-c/portfile.cmake b/ports/netcdf-c/portfile.cmake index f3a80ee48ef271..e74d13e217a60e 100644 --- a/ports/netcdf-c/portfile.cmake +++ b/ports/netcdf-c/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Unidata/netcdf-c @@ -14,6 +12,7 @@ vcpkg_from_github( hdf5_2.patch fix-build-error-on-linux.patch hdf5_3.patch + fix_config_errors_and_targets.patch ) #Remove outdated find modules @@ -25,10 +24,17 @@ if(VCPKG_CRT_LINKAGE STREQUAL "static") else() set(NC_USE_STATIC_CRT OFF) endif() +#NC_EXTRA_DEPS +find_library(ZLIB_RELEASE NAMES z zlib PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(ZLIB_DEBUG NAMES z zlib zd zlibd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(SZIP_RELEASE NAMES libsz libszip szip sz PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(SZIP_DEBUG NAMES libsz libszip szip sz libsz_D libszip_D szip_D sz_D szip_debug PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +#find_library(CURL_RELEASE NAMES curl libcurl PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +#find_library(CURL_DEBUG NAMES curl_d libcurl_d curld libcurld curl libcurl PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - DISABLE_PARALLEL_CONFIGURE + DISABLE_PARALLEL_CONFIGURE # netcdf-c configures in the source! PREFER_NINJA OPTIONS -DBUILD_UTILITIES=OFF @@ -41,10 +47,22 @@ vcpkg_configure_cmake( -DDISABLE_INSTALL_DEPENDENCIES=ON -DNC_USE_STATIC_CRT=${NC_USE_STATIC_CRT} -DConfigPackageLocation=share/netcdf + "-DNC_EXTRA_DEPS=zlib szip" #The functions checks done by cmake are actual failing due to missing external symbols. This should fix it. + "-DCURL_INCLUDE_DIRS=${CURRENT_INSTALLED_DIR}/include" + "-DCMAKE_REQUIRED_INCLUDES=${CURRENT_INSTALLED_DIR}/include" # the curl variable make the curl checks succesful + "-DSZIP_LIBRARY:STRING=debug\\\\\\\\\\\;${SZIP_DEBUG}\\\\\\\\\\\;optimized\\\\\\\\\\\;${SZIP_RELEASE}" + OPTIONS_RELEASE + "-Dzlib_DEP=${ZLIB_RELEASE}" + "-Dszip_DEP=${SZIP_RELEASE}" + "-DSZIP=${SZIP_RELEASE}" + OPTIONS_DEBUG + "-Dzlib_DEP=${ZLIB_DEBUG}" + "-Dszip_DEP=${SZIP_DEBUG}" + "-DSZIP=${SZIP_DEBUG}" ) vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/netcdf) +vcpkg_fixup_cmake_targets(CONFIG_PATH share/netcdf TARGET_PATH share/netcdf) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/bin) From 45b77440353a874397959a316f86959776dfa447 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 18 Dec 2019 13:10:27 +0100 Subject: [PATCH 137/419] remove target_path since cmake searches in name* --- ports/netcdf-c/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/netcdf-c/portfile.cmake b/ports/netcdf-c/portfile.cmake index e74d13e217a60e..325d40cb2a2663 100644 --- a/ports/netcdf-c/portfile.cmake +++ b/ports/netcdf-c/portfile.cmake @@ -62,7 +62,7 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/netcdf TARGET_PATH share/netcdf) +vcpkg_fixup_cmake_targets(CONFIG_PATH share/netcdf) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/bin) From 0cdff9b6f335fd32bf90e75cbe7f74dcd04b51c6 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 18 Dec 2019 22:06:00 +0100 Subject: [PATCH 138/419] bump control --- ports/netcdf-c/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/netcdf-c/CONTROL b/ports/netcdf-c/CONTROL index a918e902056e26..ff9940e2bc2894 100644 --- a/ports/netcdf-c/CONTROL +++ b/ports/netcdf-c/CONTROL @@ -1,5 +1,5 @@ Source: netcdf-c -Version: 4.7.0-5 +Version: 4.7.0-6 Build-Depends: hdf5, curl Homepage: https://github.com/Unidata/netcdf-c Description: a set of self-describing, machine-independent data formats that support the creation, access, and sharing of array-oriented scientific data. From b752659a889081a854e62a77520fa97a1b407dca Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 19 Dec 2019 15:21:08 +0100 Subject: [PATCH 139/419] remove unnecessary target path --- ports/netcdf-c/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/netcdf-c/portfile.cmake b/ports/netcdf-c/portfile.cmake index e74d13e217a60e..325d40cb2a2663 100644 --- a/ports/netcdf-c/portfile.cmake +++ b/ports/netcdf-c/portfile.cmake @@ -62,7 +62,7 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/netcdf TARGET_PATH share/netcdf) +vcpkg_fixup_cmake_targets(CONFIG_PATH share/netcdf) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/bin) From 136e89405d4cb0b3bad8c270656b85c02c4f31b7 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 19 Dec 2019 15:21:35 +0100 Subject: [PATCH 140/419] fix static builds of paraview qts wrapper still needs a bit of work --- ports/paraview/portfile.cmake | 3 +- ports/paraview/qt_static_plugins.patch | 69 ++++++++++++++++++++++++ ports/qt5-base/vcpkg-cmake-wrapper.cmake | 4 +- 3 files changed, 74 insertions(+), 2 deletions(-) create mode 100644 ports/paraview/qt_static_plugins.patch diff --git a/ports/paraview/portfile.cmake b/ports/paraview/portfile.cmake index d3f5c8a362876c..ed9c1b49406b15 100644 --- a/ports/paraview/portfile.cmake +++ b/ports/paraview/portfile.cmake @@ -41,7 +41,8 @@ vcpkg_from_github( paraview.patch second.patch protobuf.patch - qt_plugin.patch + #qt_plugin.patch + qt_static_plugins.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") diff --git a/ports/paraview/qt_static_plugins.patch b/ports/paraview/qt_static_plugins.patch new file mode 100644 index 00000000000000..b8ad559acb6087 --- /dev/null +++ b/ports/paraview/qt_static_plugins.patch @@ -0,0 +1,69 @@ +diff --git a/CMake/ParaViewClient.cmake b/CMake/ParaViewClient.cmake +index 31beb7e20..d4bb36844 100644 +--- a/CMake/ParaViewClient.cmake ++++ b/CMake/ParaViewClient.cmake +@@ -263,7 +263,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(Qt5 REQUIRED QUIET COMPONENTS Core Widgets Svg Network Sql DBus) + + # 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 +@@ -322,11 +322,35 @@ IDI_ICON1 ICON \"${_paraview_client_APPLICATION_ICON}\"\n") + FILES + ${_paraview_client_resource_files}) + endif () ++ ++ if(NOT PARAVIEW_BUILD_SHARED_LIBS) # Should be a check if Qt is built statically and not ParaView ++ list(APPEND qt_components Svg Widgets Gui) # added due to svg rescources, sql due to VTK::GUISupportQtSQL ++ set(qt_plugin_list) ++ foreach(qt_component ${qt_components}) ++ list(APPEND qt_plugin_list ${Qt5${qt_component}_PLUGINS}) ++ message(STATUS "QtPlugin List: ${qt_plugin_list}") ++ endforeach() ++ set(qt_plugin_source "${CMAKE_CURRENT_BINARY_DIR}/qt_static_plugins.cxx") ++ if(EXISTS "${qt_plugin_source}") ++ file(REMOVE "${qt_plugin_source}") ++ endif() ++ set(qt_source_text "#include \n") ++ string(APPEND qt_source_text "#ifdef QT_STATIC\n") ++ foreach(qt_plugin ${qt_plugin_list}) ++ STRING(REGEX REPLACE "[^:]+::" "" qt_plugin_name "${qt_plugin}") ++ message(STATUS "RAW PLUGIN NAME: ${qt_plugin_name}") ++ string(APPEND qt_source_text " Q_IMPORT_PLUGIN(${qt_plugin_name})\n") ++ endforeach() ++ string(APPEND qt_source_text "#endif\n") ++ file(WRITE "${qt_plugin_source}" "${qt_source_text}") ++ endif() ++ + add_executable("${_paraview_client_NAME}" ${_paraview_client_executable_flags} + ${_paraview_client_SOURCES} + ${_paraview_client_resource_files} + ${_paraview_client_source_files} +- ${_paraview_client_extra_sources}) ++ ${_paraview_client_extra_sources} ++ ${qt_plugin_source}) + if (DEFINED _paraview_client_NAMESPACE) + add_executable("${_paraview_client_NAMESPACE}::${_paraview_client_NAME}" ALIAS "${_paraview_client_NAME}") + endif () +@@ -338,9 +362,17 @@ IDI_ICON1 ICON \"${_paraview_client_APPLICATION_ICON}\"\n") + "$") + target_link_libraries("${_paraview_client_NAME}" + PRIVATE ++ Qt5::Core # needed in VCPKG due to the extra Wrapper ++ Qt5::Svg ## added ++ Qt5::Sql ## added ++ Qt5::Network ## added ++ Qt5::Gui ## added ++ Qt5::DBus ##added + Qt5::Widgets + ParaView::pqApplicationComponents +- VTK::vtksys) ++ VTK::vtksys ++ ${qt_plugin_list} ++ ) + + if (DEFINED _paraview_client_PLUGINS_TARGET) + target_link_libraries("${_paraview_client_NAME}" diff --git a/ports/qt5-base/vcpkg-cmake-wrapper.cmake b/ports/qt5-base/vcpkg-cmake-wrapper.cmake index 8b5d05aac7a32f..21dd8e06a4e57e 100644 --- a/ports/qt5-base/vcpkg-cmake-wrapper.cmake +++ b/ports/qt5-base/vcpkg-cmake-wrapper.cmake @@ -33,11 +33,13 @@ if("${_target_type}" STREQUAL "STATIC_LIBRARY") ) if(NOT WINDOWS_STORE) set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES - UxTheme.lib) # Should probably be added to Qt5:Gui and not core but currently we only have that one wrapper + UxTheme.lib d2d1.lib Dwrite.lib d3d11.lib) # Should probably be added to Qt5:Gui and not core but currently we only have that one wrapper endif() add_qt_library(Qt5::Core pcre2-16 + jasper + webp webpdemux webpdecoder icuin icui18n icutu icuuc icuio icudt icudata From eb9725cebd713f098302b2b1be06c06f5178d85d Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 19 Dec 2019 15:23:10 +0100 Subject: [PATCH 141/419] add a message for debugging --- ports/paraview/qt_static_plugins.patch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ports/paraview/qt_static_plugins.patch b/ports/paraview/qt_static_plugins.patch index b8ad559acb6087..6e56699e153fb2 100644 --- a/ports/paraview/qt_static_plugins.patch +++ b/ports/paraview/qt_static_plugins.patch @@ -11,7 +11,7 @@ index 31beb7e20..d4bb36844 100644 # 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 -@@ -322,11 +322,35 @@ IDI_ICON1 ICON \"${_paraview_client_APPLICATION_ICON}\"\n") +@@ -322,11 +322,36 @@ IDI_ICON1 ICON \"${_paraview_client_APPLICATION_ICON}\"\n") FILES ${_paraview_client_resource_files}) endif () @@ -19,7 +19,8 @@ index 31beb7e20..d4bb36844 100644 + if(NOT PARAVIEW_BUILD_SHARED_LIBS) # Should be a check if Qt is built statically and not ParaView + list(APPEND qt_components Svg Widgets Gui) # added due to svg rescources, sql due to VTK::GUISupportQtSQL + set(qt_plugin_list) -+ foreach(qt_component ${qt_components}) ++ foreach(qt_component ${qt_components}) ++ message(STATUS "Qt5${qt_component}_PLUGINS: ${Qt5${qt_component}_PLUGINS}") + list(APPEND qt_plugin_list ${Qt5${qt_component}_PLUGINS}) + message(STATUS "QtPlugin List: ${qt_plugin_list}") + endforeach() From 184c41b86734cfc600a6546a58d11ef0ae90cf49 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 19 Dec 2019 23:15:56 +0100 Subject: [PATCH 142/419] fix vtks find postgrsql --- ports/vtk/FindPostgreSQL.cmake | 269 +++++++++++++++++++++++++++++++++ ports/vtk/portfile.cmake | 3 + 2 files changed, 272 insertions(+) create mode 100644 ports/vtk/FindPostgreSQL.cmake diff --git a/ports/vtk/FindPostgreSQL.cmake b/ports/vtk/FindPostgreSQL.cmake new file mode 100644 index 00000000000000..913c8b9ae2653b --- /dev/null +++ b/ports/vtk/FindPostgreSQL.cmake @@ -0,0 +1,269 @@ +# Distributed under the OSI-approved BSD 3-Clause License. See accompanying +# file Copyright.txt or https://cmake.org/licensing for details. + +#[=======================================================================[.rst: +FindPostgreSQL +-------------- + +Find the PostgreSQL installation. + +IMPORTED Targets +^^^^^^^^^^^^^^^^ + +This module defines :prop_tgt:`IMPORTED` target ``PostgreSQL::PostgreSQL`` +if PostgreSQL has been found. + +Result Variables +^^^^^^^^^^^^^^^^ + +This module will set the following variables in your project: + +``PostgreSQL_FOUND`` + True if PostgreSQL is found. +``PostgreSQL_LIBRARIES`` + the PostgreSQL libraries needed for linking +``PostgreSQL_INCLUDE_DIRS`` + the directories of the PostgreSQL headers +``PostgreSQL_LIBRARY_DIRS`` + the link directories for PostgreSQL libraries +``PostgreSQL_VERSION_STRING`` + the version of PostgreSQL found +#]=======================================================================] + +# ---------------------------------------------------------------------------- +# History: +# This module is derived from the module originally found in the VTK source tree. +# +# ---------------------------------------------------------------------------- +# Note: +# PostgreSQL_ADDITIONAL_VERSIONS is a variable that can be used to set the +# version number of the implementation of PostgreSQL. +# In Windows the default installation of PostgreSQL uses that as part of the path. +# E.g C:\Program Files\PostgreSQL\8.4. +# Currently, the following version numbers are known to this module: +# "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0" +# +# To use this variable just do something like this: +# set(PostgreSQL_ADDITIONAL_VERSIONS "9.2" "8.4.4") +# before calling find_package(PostgreSQL) in your CMakeLists.txt file. +# This will mean that the versions you set here will be found first in the order +# specified before the default ones are searched. +# +# ---------------------------------------------------------------------------- +# You may need to manually set: +# PostgreSQL_INCLUDE_DIR - the path to where the PostgreSQL include files are. +# PostgreSQL_LIBRARY_DIR - The path to where the PostgreSQL library files are. +# If FindPostgreSQL.cmake cannot find the include files or the library files. +# +# ---------------------------------------------------------------------------- +# The following variables are set if PostgreSQL is found: +# PostgreSQL_FOUND - Set to true when PostgreSQL is found. +# PostgreSQL_INCLUDE_DIRS - Include directories for PostgreSQL +# PostgreSQL_LIBRARY_DIRS - Link directories for PostgreSQL libraries +# PostgreSQL_LIBRARIES - The PostgreSQL libraries. +# +# The ``PostgreSQL::PostgreSQL`` imported target is also created. +# +# ---------------------------------------------------------------------------- +# If you have installed PostgreSQL in a non-standard location. +# (Please note that in the following comments, it is assumed that +# points to the root directory of the include directory of PostgreSQL.) +# Then you have three options. +# 1) After CMake runs, set PostgreSQL_INCLUDE_DIR to /include and +# PostgreSQL_LIBRARY_DIR to wherever the library pq (or libpq in windows) is +# 2) Use CMAKE_INCLUDE_PATH to set a path to /PostgreSQL<-version>. This will allow find_path() +# to locate PostgreSQL_INCLUDE_DIR by utilizing the PATH_SUFFIXES option. e.g. In your CMakeLists.txt file +# set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} "/include") +# 3) Set an environment variable called ${PostgreSQL_ROOT} that points to the root of where you have +# installed PostgreSQL, e.g. . +# +# ---------------------------------------------------------------------------- + +set(PostgreSQL_INCLUDE_PATH_DESCRIPTION "top-level directory containing the PostgreSQL include directories. E.g /usr/local/include/PostgreSQL/8.4 or C:/Program Files/PostgreSQL/8.4/include") +set(PostgreSQL_INCLUDE_DIR_MESSAGE "Set the PostgreSQL_INCLUDE_DIR cmake cache entry to the ${PostgreSQL_INCLUDE_PATH_DESCRIPTION}") +set(PostgreSQL_LIBRARY_PATH_DESCRIPTION "top-level directory containing the PostgreSQL libraries.") +set(PostgreSQL_LIBRARY_DIR_MESSAGE "Set the PostgreSQL_LIBRARY_DIR cmake cache entry to the ${PostgreSQL_LIBRARY_PATH_DESCRIPTION}") +set(PostgreSQL_ROOT_DIR_MESSAGE "Set the PostgreSQL_ROOT system variable to where PostgreSQL is found on the machine E.g C:/Program Files/PostgreSQL/8.4") + + +set(PostgreSQL_KNOWN_VERSIONS ${PostgreSQL_ADDITIONAL_VERSIONS} + "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0") + +# Define additional search paths for root directories. +set( PostgreSQL_ROOT_DIRECTORIES + ENV PostgreSQL_ROOT + ${PostgreSQL_ROOT} +) +foreach(suffix ${PostgreSQL_KNOWN_VERSIONS}) + if(WIN32) + list(APPEND PostgreSQL_LIBRARY_ADDITIONAL_SEARCH_SUFFIXES + "PostgreSQL/${suffix}/lib") + list(APPEND PostgreSQL_INCLUDE_ADDITIONAL_SEARCH_SUFFIXES + "PostgreSQL/${suffix}/include") + list(APPEND PostgreSQL_TYPE_ADDITIONAL_SEARCH_SUFFIXES + "PostgreSQL/${suffix}/include/server") + endif() + if(UNIX) + list(APPEND PostgreSQL_LIBRARY_ADDITIONAL_SEARCH_SUFFIXES + "pgsql-${suffix}/lib") + list(APPEND PostgreSQL_INCLUDE_ADDITIONAL_SEARCH_SUFFIXES + "pgsql-${suffix}/include") + list(APPEND PostgreSQL_TYPE_ADDITIONAL_SEARCH_SUFFIXES + "postgresql/${suffix}/server" + "pgsql-${suffix}/include/server") + endif() +endforeach() + +# +# Look for an installation. +# +find_path(PostgreSQL_INCLUDE_DIR + NAMES libpq-fe.h + PATHS + # Look in other places. + ${PostgreSQL_ROOT_DIRECTORIES} + PATH_SUFFIXES + pgsql + postgresql + include + ${PostgreSQL_INCLUDE_ADDITIONAL_SEARCH_SUFFIXES} + # Help the user find it if we cannot. + DOC "The ${PostgreSQL_INCLUDE_DIR_MESSAGE}" +) + +find_path(PostgreSQL_TYPE_INCLUDE_DIR + NAMES catalog/pg_type.h + PATHS + # Look in other places. + ${PostgreSQL_ROOT_DIRECTORIES} + PATH_SUFFIXES + postgresql + pgsql/server + postgresql/server + include/server + ${PostgreSQL_TYPE_ADDITIONAL_SEARCH_SUFFIXES} + # Help the user find it if we cannot. + DOC "The ${PostgreSQL_INCLUDE_DIR_MESSAGE}" +) + +# The PostgreSQL library. +set (PostgreSQL_LIBRARY_TO_FIND pq) +# Setting some more prefixes for the library +set (PostgreSQL_LIB_PREFIX "") +if ( WIN32 ) + set (PostgreSQL_LIB_PREFIX ${PostgreSQL_LIB_PREFIX} "lib") + set (PostgreSQL_LIBRARY_TO_FIND ${PostgreSQL_LIB_PREFIX}${PostgreSQL_LIBRARY_TO_FIND}) +endif() + +function(__postgresql_find_library _name) + find_library(${_name} + NAMES ${ARGN} + PATHS + ${PostgreSQL_ROOT_DIRECTORIES} + PATH_SUFFIXES + lib + ${PostgreSQL_LIBRARY_ADDITIONAL_SEARCH_SUFFIXES} + # Help the user find it if we cannot. + DOC "The ${PostgreSQL_LIBRARY_DIR_MESSAGE}" + ) +endfunction() + +# For compatibility with versions prior to this multi-config search, honor +# any PostgreSQL_LIBRARY that is already specified and skip the search. +if(PostgreSQL_LIBRARY) + set(PostgreSQL_LIBRARIES "${PostgreSQL_LIBRARY}") + get_filename_component(PostgreSQL_LIBRARY_DIR "${PostgreSQL_LIBRARY}" PATH) +else() + __postgresql_find_library(PostgreSQL_LIBRARY_RELEASE ${PostgreSQL_LIBRARY_TO_FIND}) + __postgresql_find_library(PostgreSQL_LIBRARY_DEBUG ${PostgreSQL_LIBRARY_TO_FIND}d) + include(SelectLibraryConfigurations) + select_library_configurations(PostgreSQL) + mark_as_advanced(PostgreSQL_LIBRARY_RELEASE PostgreSQL_LIBRARY_DEBUG) + if(PostgreSQL_LIBRARY_RELEASE) + get_filename_component(PostgreSQL_LIBRARY_DIR "${PostgreSQL_LIBRARY_RELEASE}" PATH) + elseif(PostgreSQL_LIBRARY_DEBUG) + get_filename_component(PostgreSQL_LIBRARY_DIR "${PostgreSQL_LIBRARY_DEBUG}" PATH) + else() + set(PostgreSQL_LIBRARY_DIR "") + endif() +endif() + +if (PostgreSQL_INCLUDE_DIR) + # Some platforms include multiple pg_config.hs for multi-lib configurations + # This is a temporary workaround. A better solution would be to compile + # a dummy c file and extract the value of the symbol. + file(GLOB _PG_CONFIG_HEADERS "${PostgreSQL_INCLUDE_DIR}/pg_config*.h") + foreach(_PG_CONFIG_HEADER ${_PG_CONFIG_HEADERS}) + if(EXISTS "${_PG_CONFIG_HEADER}") + file(STRINGS "${_PG_CONFIG_HEADER}" pgsql_version_str + REGEX "^#define[\t ]+PG_VERSION_NUM[\t ]+.*") + if(pgsql_version_str) + string(REGEX REPLACE "^#define[\t ]+PG_VERSION_NUM[\t ]+([0-9]*).*" + "\\1" _PostgreSQL_VERSION_NUM "${pgsql_version_str}") + break() + endif() + endif() + endforeach() + if (_PostgreSQL_VERSION_NUM) + math(EXPR _PostgreSQL_major_version "${_PostgreSQL_VERSION_NUM} / 10000") + math(EXPR _PostgreSQL_minor_version "${_PostgreSQL_VERSION_NUM} % 10000") + set(PostgreSQL_VERSION_STRING "${_PostgreSQL_major_version}.${_PostgreSQL_minor_version}") + unset(_PostgreSQL_major_version) + unset(_PostgreSQL_minor_version) + else () + foreach(_PG_CONFIG_HEADER ${_PG_CONFIG_HEADERS}) + if(EXISTS "${_PG_CONFIG_HEADER}") + file(STRINGS "${_PG_CONFIG_HEADER}" pgsql_version_str + REGEX "^#define[\t ]+PG_VERSION[\t ]+\".*\"") + if(pgsql_version_str) + string(REGEX REPLACE "^#define[\t ]+PG_VERSION[\t ]+\"([^\"]*)\".*" + "\\1" PostgreSQL_VERSION_STRING "${pgsql_version_str}") + break() + endif() + endif() + endforeach() + endif () + unset(_PostgreSQL_VERSION_NUM) + unset(pgsql_version_str) +endif() + +# Did we find anything? +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(PostgreSQL + REQUIRED_VARS PostgreSQL_LIBRARY PostgreSQL_INCLUDE_DIR PostgreSQL_TYPE_INCLUDE_DIR + VERSION_VAR PostgreSQL_VERSION_STRING) +set(PostgreSQL_FOUND ${POSTGRESQL_FOUND}) + +function(__postgresql_import_library _target _var _config) + if(_config) + set(_config_suffix "_${_config}") + else() + set(_config_suffix "") + endif() + + set(_lib "${${_var}${_config_suffix}}") + if(EXISTS "${_lib}") + if(_config) + set_property(TARGET ${_target} APPEND PROPERTY + IMPORTED_CONFIGURATIONS ${_config}) + endif() + set_target_properties(${_target} PROPERTIES + IMPORTED_LOCATION${_config_suffix} "${_lib}") + endif() +endfunction() + +# Now try to get the include and library path. +if(PostgreSQL_FOUND) + if (NOT TARGET PostgreSQL::PostgreSQL) + add_library(PostgreSQL::PostgreSQL UNKNOWN IMPORTED) + set_target_properties(PostgreSQL::PostgreSQL PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${PostgreSQL_INCLUDE_DIR};${PostgreSQL_TYPE_INCLUDE_DIR}") + __postgresql_import_library(PostgreSQL::PostgreSQL PostgreSQL_LIBRARY "") + __postgresql_import_library(PostgreSQL::PostgreSQL PostgreSQL_LIBRARY "RELEASE") + __postgresql_import_library(PostgreSQL::PostgreSQL PostgreSQL_LIBRARY "DEBUG") + endif () + set(PostgreSQL_INCLUDE_DIRS ${PostgreSQL_INCLUDE_DIR} ${PostgreSQL_TYPE_INCLUDE_DIR} ) + set(PostgreSQL_LIBRARY_DIRS ${PostgreSQL_LIBRARY_DIR} ) +endif() + +mark_as_advanced(PostgreSQL_INCLUDE_DIR PostgreSQL_TYPE_INCLUDE_DIR) diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 70915cf3def9df..a11cdeb00cebe7 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -103,6 +103,9 @@ vcpkg_from_github( # Last patch TODO: Patch out internal loguru ) +# ============================================================================= +#Overwrite outdated modules if they have not been patched: +file(COPY "${CURRENT_PORT_DIR}/FindPostgreSQL.cmake" DESTINATION "${SOURCE_PATH}/CMake") # ============================================================================= if(VTK_WITH_ALL_MODULES) From 22f341f69503c182a78638f542b87e39af22c533 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 19 Dec 2019 23:16:13 +0100 Subject: [PATCH 143/419] fix hdf5 targets linking wrongly against szip --- ports/hdf5/portfile.cmake | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ports/hdf5/portfile.cmake b/ports/hdf5/portfile.cmake index d94b203d0ee82b..d7a817f4c3256e 100644 --- a/ports/hdf5/portfile.cmake +++ b/ports/hdf5/portfile.cmake @@ -35,6 +35,9 @@ if(FEATURES MATCHES "tools" AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") list(APPEND FEATURE_OPTIONS -DBUILD_STATIC_EXECS=ON) endif() +find_library(SZIP_RELEASE NAMES libsz libszip szip sz PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(SZIP_DEBUG NAMES libsz libszip szip sz libsz_D libszip_D szip_D sz_D szip_debug PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH}/hdf5-1.10.5 DISABLE_PARALLEL_CONFIGURE @@ -46,6 +49,8 @@ vcpkg_configure_cmake( -DHDF5_ENABLE_SZIP_ENCODING=${HDF5_ENABLE_SZIP_SUPPORT} -DHDF5_INSTALL_DATA_DIR=share/hdf5/data -DHDF5_INSTALL_CMAKE_DIR=share + "-DSZIP_LIBRARY_DEBUG:PATH=${SZIP_DEBUG}" + "-DSZIP_LIBRARY_RELEASE:PATH=${SZIP_RELEASE}" ) vcpkg_install_cmake(${COMPONENT}) From 966577effd4eb1d7e40222872feb1cd28403d626 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 20 Dec 2019 20:36:44 +0100 Subject: [PATCH 144/419] add qt5-x11extras for vtk --- ports/qt5-base/cmake/qt_port_hashes.cmake | 1 + ports/qt5-x11extras/CONTROL | 4 ++++ ports/qt5-x11extras/portfile.cmake | 2 ++ ports/vtk/CONTROL | 2 +- 4 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 ports/qt5-x11extras/CONTROL create mode 100644 ports/qt5-x11extras/portfile.cmake diff --git a/ports/qt5-base/cmake/qt_port_hashes.cmake b/ports/qt5-base/cmake/qt_port_hashes.cmake index d3ad2a0ee12035..85bd531bccbd26 100644 --- a/ports/qt5-base/cmake/qt_port_hashes.cmake +++ b/ports/qt5-base/cmake/qt_port_hashes.cmake @@ -40,6 +40,7 @@ set(QT_HASH_qt5-websockets 970ad232ad1258630404d5e7347721505a780497e177 set(QT_HASH_qt5-webview 310beedf88cefc05458e99838e7cb71971aa24ba6c460ff3da804c2ab7f56167ca1067ddca71ee29ced32ea974fe405261f24c8bbcac0c7b69063d7c4e38a4de) set(QT_HASH_qt5-winextras 053ca5f60c7946f6409ef34094b4a7d1431039407a5195e539e8edfda795da20fc695ceec58ae0df15e4dcc597047518d06a424d11fb4aaf6ae82f1d4badab33) set(QT_HASH_qt5-xmlpatterns 30b25e152970bfe51fcdeffa43d11dd51496e5ea6a5da644b13fa0ce4835302ebec651c1ecdcf9590c6689598cea9bd63748aab4ee0ec69f9155dc310a7c04c3) +set(QT_HASH_qt5-x11extras 1e83c2d350f423053fe07c41a8b889391100df93dd50f700e98116c36b3dbad9637a618765daf97b82b7ffcd0687fc52c9590d9ce48c2a9204f1edc6d2cae248) if(QT_UPDATE_VERSION) message(STATUS "Running Qt in automatic version port update mode!") diff --git a/ports/qt5-x11extras/CONTROL b/ports/qt5-x11extras/CONTROL new file mode 100644 index 00000000000000..d09435d19afeb0 --- /dev/null +++ b/ports/qt5-x11extras/CONTROL @@ -0,0 +1,4 @@ +Source: qt5-x11extras +Version: 5.12.5-2 +Description: Qt5 x11extras Module; +Build-Depends: qt5-base diff --git a/ports/qt5-x11extras/portfile.cmake b/ports/qt5-x11extras/portfile.cmake new file mode 100644 index 00000000000000..214726759f3cf1 --- /dev/null +++ b/ports/qt5-x11extras/portfile.cmake @@ -0,0 +1,2 @@ +include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) +qt_submodule_installation() \ No newline at end of file diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL index 2df22650fa7e2c..e1fc8405c3ae04 100644 --- a/ports/vtk/CONTROL +++ b/ports/vtk/CONTROL @@ -14,7 +14,7 @@ Build-Depends: sdl2, openvr Feature: qt Description: Qt functionality for VTK -Build-Depends: qt5-xmlpatterns, qt5-tools, qt5-imageformats +Build-Depends: qt5-xmlpatterns, qt5-tools, qt5-imageformats, qt5-x11extras (linux) Feature: mpi Description: MPI functionality for VTK From 759450c424c9a9a4b2873772d5488fd751874c60 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 20 Dec 2019 22:55:46 +0100 Subject: [PATCH 145/419] fix find boost on linux --- ports/paraview/portfile.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/paraview/portfile.cmake b/ports/paraview/portfile.cmake index ed9c1b49406b15..c2d1f4b7e9a719 100644 --- a/ports/paraview/portfile.cmake +++ b/ports/paraview/portfile.cmake @@ -120,6 +120,7 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA # Disable this option if project cannot be built with Ninja OPTIONS + -DBoost_DEBUG=ON -DPARAVIEW_USE_EXTERNAL:BOOL=ON -DPARAVIEW_USE_EXTERNAL_VTK:BOOL=ON -DPARAVIEW_ENABLE_VISITBRIDGE:BOOL=ON @@ -129,7 +130,7 @@ vcpkg_configure_cmake( -DPARAVIEW_USE_QTHELP=OFF #A little bit of help in finding the boost headers - -DBoost_INCLUDE_DIR:PATH="${CURRENT_INSTALLED_DIR}/include" + "-DBoost_INCLUDE_DIR:PATH=${CURRENT_INSTALLED_DIR}/include" # Workarounds for CMake issues -DHAVE_SYS_TYPES_H=0 ## For some strange reason the test first succeeds and then fails the second time around From 9cc30be2aefba87deb85a5afd9f6e468edf8c688 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 20 Dec 2019 22:56:36 +0100 Subject: [PATCH 146/419] remove debug for find boost --- ports/paraview/portfile.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/paraview/portfile.cmake b/ports/paraview/portfile.cmake index c2d1f4b7e9a719..ad4c10436a171b 100644 --- a/ports/paraview/portfile.cmake +++ b/ports/paraview/portfile.cmake @@ -120,7 +120,6 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA # Disable this option if project cannot be built with Ninja OPTIONS - -DBoost_DEBUG=ON -DPARAVIEW_USE_EXTERNAL:BOOL=ON -DPARAVIEW_USE_EXTERNAL_VTK:BOOL=ON -DPARAVIEW_ENABLE_VISITBRIDGE:BOOL=ON From 395889ed5ab9ba593cfb5ea0138ab38f0710bc43 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 20 Dec 2019 23:02:20 +0100 Subject: [PATCH 147/419] fix wrapper --- ports/qt5-base/vcpkg-cmake-wrapper.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/qt5-base/vcpkg-cmake-wrapper.cmake b/ports/qt5-base/vcpkg-cmake-wrapper.cmake index 21dd8e06a4e57e..62a47eee4c1a62 100644 --- a/ports/qt5-base/vcpkg-cmake-wrapper.cmake +++ b/ports/qt5-base/vcpkg-cmake-wrapper.cmake @@ -31,7 +31,7 @@ if("${_target_type}" STREQUAL "STATIC_LIBRARY") ZLIB::ZLIB JPEG::JPEG PNG::PNG Freetype::Freetype sqlite3 harfbuzz::harfbuzz double-conversion::double-conversion OpenSSL::SSL OpenSSL::Crypto PostgreSQL::PostgreSQL ) - if(NOT WINDOWS_STORE) + if(WIN32 AND NOT WINDOWS_STORE) set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES UxTheme.lib d2d1.lib Dwrite.lib d3d11.lib) # Should probably be added to Qt5:Gui and not core but currently we only have that one wrapper endif() From 93a2af25170bb49d85f1d56a2c7fd2852d57f99d Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 21 Dec 2019 22:21:37 +0100 Subject: [PATCH 148/419] update netcdf-c and use targets --- ports/netcdf-c/fix-build-error-on-linux.patch | 28 --- .../fix_config_errors_and_targets.patch | 44 ----- ports/netcdf-c/hdf5.patch | 27 --- ports/netcdf-c/hdf5_2.patch | 13 -- ports/netcdf-c/hdf5_3.patch | 14 -- ports/netcdf-c/portfile.cmake | 24 +-- ports/netcdf-c/transitive-hdf5.patch | 13 -- ports/netcdf-c/use_targets.patch | 166 ++++++++++++++++++ 8 files changed, 170 insertions(+), 159 deletions(-) delete mode 100644 ports/netcdf-c/fix-build-error-on-linux.patch delete mode 100644 ports/netcdf-c/fix_config_errors_and_targets.patch delete mode 100644 ports/netcdf-c/hdf5.patch delete mode 100644 ports/netcdf-c/hdf5_2.patch delete mode 100644 ports/netcdf-c/hdf5_3.patch delete mode 100644 ports/netcdf-c/transitive-hdf5.patch create mode 100644 ports/netcdf-c/use_targets.patch diff --git a/ports/netcdf-c/fix-build-error-on-linux.patch b/ports/netcdf-c/fix-build-error-on-linux.patch deleted file mode 100644 index bdcd7c97a4d141..00000000000000 --- a/ports/netcdf-c/fix-build-error-on-linux.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/include/ncconfigure.h b/include/ncconfigure.h -index 2c5b2c8..d397790 100644 ---- a/include/ncconfigure.h -+++ b/include/ncconfigure.h -@@ -25,20 +25,20 @@ missing functions should be - defined and missing types defined. - */ - --#ifndef HAVE_STRDUP -+#ifndef strdup - extern char* strdup(const char*); - #endif - - /* handle null arguments */ - #ifndef nulldup --#ifdef HAVE_STRDUP -+#ifdef strdup - #define nulldup(s) ((s)==NULL?NULL:strdup(s)) - #else - char *nulldup(const char* s); - #endif - #endif - --#ifdef _MSC_VER -+#ifdef _WIN32 - #ifndef HAVE_SSIZE_T - #include - typedef SSIZE_T ssize_t; diff --git a/ports/netcdf-c/fix_config_errors_and_targets.patch b/ports/netcdf-c/fix_config_errors_and_targets.patch deleted file mode 100644 index a500e0844f1d12..00000000000000 --- a/ports/netcdf-c/fix_config_errors_and_targets.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 96fbaf979..e5089ad4f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -261,7 +261,7 @@ ENDIF() - INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) - INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/oc2) - INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/libsrc) --SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_SOURCE_DIR}/libsrc) -+list(APPEND CMAKE_REQUIRED_INCLUDES ${CMAKE_SOURCE_DIR}/libsrc) - - ################################ - # End Compiler Configuration -@@ -726,7 +726,7 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) - FIND_LIBRARY(SZIP NAMES szip sz) - IF(SZIP) - SET(HAVE_H5Z_SZIP 1) -- SET(SZIP_LIBRARY ${SZIP}) -+ #SET(SZIP_LIBRARY ${SZIP}) - SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${SZIP}) - ELSE() - MESSAGE(FATAL_ERROR "HDF5 Requires SZIP, but cannot find libszip or libsz.") -diff --git a/liblib/CMakeLists.txt b/liblib/CMakeLists.txt -index 6a81a4801..74173c1d3 100644 ---- a/liblib/CMakeLists.txt -+++ b/liblib/CMakeLists.txt -@@ -61,7 +61,7 @@ SET(TLL_LIBS "") - SET(TLL_LIBS ${TLL_LIBS} ${HAVE_LIBM} ${ZLIB_LIBRARY}) - - # Add extra dependencies specified via NC_EXTRA_DEPS --SET(TLL_LIBS ${TLL_LIBS} ${EXTRA_DEPS}) -+#SET(TLL_LIBS ${TLL_LIBS} ${EXTRA_DEPS}) - - IF(HAVE_LIBDL) - SET(TLL_LIBS ${LIBDL} ${TLL_LIBS}) -@@ -100,7 +102,7 @@ IF(ENABLE_PNETCDF AND PNETCDF) - ENDIF() - - IF(TLL_LIBS) -- LIST(REMOVE_DUPLICATES TLL_LIBS) -+ #LIST(REMOVE_DUPLICATES TLL_LIBS) //removes deuplicate debug/optimize - ENDIF() - - TARGET_LINK_LIBRARIES(netcdf ${TLL_LIBS}) diff --git a/ports/netcdf-c/hdf5.patch b/ports/netcdf-c/hdf5.patch deleted file mode 100644 index 71f4921eded8c7..00000000000000 --- a/ports/netcdf-c/hdf5.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a3874c13..36f15beb 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -599,11 +599,10 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) - IF(NC_FIND_SHARED_LIBS) - SET(NC_HDF5_LINK_TYPE "shared") - SET(NC_HDF5_LINK_TYPE_UPPER "SHARED") -- ADD_DEFINITIONS(-DH5_BUILT_AS_DYNAMIC_LIB) - ELSE(NC_FIND_SHARED_LIBS) - SET(NC_HDF5_LINK_TYPE "static") - SET(NC_HDF5_LINK_TYPE_UPPER "STATIC") -- ADD_DEFINITIONS(-DH5_BUILT_AS_STATIC_LIB) -+ SET(HDF5_USE_STATIC_LIBRARIES ON) - ENDIF(NC_FIND_SHARED_LIBS) - - ##### -@@ -614,8 +615,7 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) - # had worked. - ##### - IF(MSVC) -- SET(SEARCH_PACKAGE_NAME ${HDF5_PACKAGE_NAME}) -- FIND_PACKAGE(HDF5 NAMES ${SEARCH_PACKAGE_NAME} COMPONENTS C HL NO_MODULES REQUIRED ${NC_HDF5_LINK_TYPE}) -+ FIND_PACKAGE(HDF5 COMPONENTS C HL REQUIRED) - ELSE(MSVC) - FIND_PACKAGE(HDF5 COMPONENTS C HL REQUIRED) - ENDIF(MSVC) diff --git a/ports/netcdf-c/hdf5_2.patch b/ports/netcdf-c/hdf5_2.patch deleted file mode 100644 index a3a3fb751ba183..00000000000000 --- a/ports/netcdf-c/hdf5_2.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/liblib/CMakeLists.txt b/liblib/CMakeLists.txt -index ea9b0294..3c7f427d 100644 ---- a/liblib/CMakeLists.txt -+++ b/liblib/CMakeLists.txt -@@ -83,7 +83,7 @@ IF(USE_HDF5 OR USE_NETCDF4) - # HDF5_HL_LIBRARY. - SET(TLL_LIBS ${HDF5_HL_LIBRARIES} ${HDF5_C_LIBRARIES} ${TLL_LIBS} ${SZIP_LIBRARY}) - ELSE() # Windows CMake defines HDF5_LIBRARIES. -- SET(TLL_LIBS ${HDF5_LIBRARIES} ${TLL_LIBS} ${SZIP_LIBRARY}) -+ SET(TLL_LIBS ${HDF5_HL_LIBRARIES} ${HDF5_C_LIBRARIES} ${TLL_LIBS} ${SZIP_LIBRARY}) - ENDIF() - ENDIF() - diff --git a/ports/netcdf-c/hdf5_3.patch b/ports/netcdf-c/hdf5_3.patch deleted file mode 100644 index 502a8ea9941bc8..00000000000000 --- a/ports/netcdf-c/hdf5_3.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/libhdf5/CMakeLists.txt b/libhdf5/CMakeLists.txt -index f3c7bbc..34fc2ab 100644 ---- a/libhdf5/CMakeLists.txt -+++ b/libhdf5/CMakeLists.txt -@@ -20,3 +20,9 @@ add_library(netcdfhdf5 OBJECT ${libnchdf5_SOURCES}) - - # Remember to package this file for CMake builds. - ADD_EXTRA_DIST(${libnchdf5_SOURCES} CMakeLists.txt) -+ -+if(HDF5_BUILD_SHARED_LIBS) -+ target_link_libraries(netcdfhdf5 PRIVATE hdf5::hdf5-shared hdf5::hdf5_hl-shared) -+else() -+ target_link_libraries(netcdfhdf5 PRIVATE hdf5::hdf5-static hdf5::hdf5_hl-static) -+endif() diff --git a/ports/netcdf-c/portfile.cmake b/ports/netcdf-c/portfile.cmake index 325d40cb2a2663..30522e963dd478 100644 --- a/ports/netcdf-c/portfile.cmake +++ b/ports/netcdf-c/portfile.cmake @@ -1,23 +1,19 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Unidata/netcdf-c - REF v4.7.0 - SHA512 6602799780105c60ac8c873ed4055c1512dc8bebf98de01e1cce572d113ffb3bf3ca522475b93255c415340f672c55dc6785e0bdbcc39055314683da1d02141a + REF b7cd387bee8c661141fabb490f4969587c008c55 # v4.7.3 + SHA512 a55391620fac61e4975fe62907ca21049911afce6190fc12d183d24133a32aae8cd223b97a3fe57fc82d8bdca1a7db451046e3be3c379051624d48b1f56c0332 HEAD_REF master PATCHES no-install-deps.patch config-pkg-location.patch - transitive-hdf5.patch - hdf5.patch - hdf5_2.patch - fix-build-error-on-linux.patch - hdf5_3.patch - fix_config_errors_and_targets.patch + use_targets.patch ) #Remove outdated find modules file(REMOVE "${SOURCE_PATH}/cmake/modules/FindSZIP.cmake") file(REMOVE "${SOURCE_PATH}/cmake/modules/FindZLIB.cmake") +file(REMOVE "${SOURCE_PATH}/cmake/modules/windows/FindHDF5.cmake") if(VCPKG_CRT_LINKAGE STREQUAL "static") set(NC_USE_STATIC_CRT ON) @@ -47,18 +43,6 @@ vcpkg_configure_cmake( -DDISABLE_INSTALL_DEPENDENCIES=ON -DNC_USE_STATIC_CRT=${NC_USE_STATIC_CRT} -DConfigPackageLocation=share/netcdf - "-DNC_EXTRA_DEPS=zlib szip" #The functions checks done by cmake are actual failing due to missing external symbols. This should fix it. - "-DCURL_INCLUDE_DIRS=${CURRENT_INSTALLED_DIR}/include" - "-DCMAKE_REQUIRED_INCLUDES=${CURRENT_INSTALLED_DIR}/include" # the curl variable make the curl checks succesful - "-DSZIP_LIBRARY:STRING=debug\\\\\\\\\\\;${SZIP_DEBUG}\\\\\\\\\\\;optimized\\\\\\\\\\\;${SZIP_RELEASE}" - OPTIONS_RELEASE - "-Dzlib_DEP=${ZLIB_RELEASE}" - "-Dszip_DEP=${SZIP_RELEASE}" - "-DSZIP=${SZIP_RELEASE}" - OPTIONS_DEBUG - "-Dzlib_DEP=${ZLIB_DEBUG}" - "-Dszip_DEP=${SZIP_DEBUG}" - "-DSZIP=${SZIP_DEBUG}" ) vcpkg_install_cmake() diff --git a/ports/netcdf-c/transitive-hdf5.patch b/ports/netcdf-c/transitive-hdf5.patch deleted file mode 100644 index 89773e6d40f41f..00000000000000 --- a/ports/netcdf-c/transitive-hdf5.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/netCDFConfig.cmake.in b/netCDFConfig.cmake.in -index 6f4ccf8..14a3743 100644 ---- a/netCDFConfig.cmake.in -+++ b/netCDFConfig.cmake.in -@@ -11,6 +11,8 @@ set_and_check(netCDF_LIB_DIR "@PACKAGE_CMAKE_INSTALL_LIBDIR@") - - set(netCDF_LIBRARIES netcdf) - -+find_package(HDF5 COMPONENTS C HL CONFIG REQUIRED) -+ - # include target information - include("${CMAKE_CURRENT_LIST_DIR}/netCDFTargets.cmake") - diff --git a/ports/netcdf-c/use_targets.patch b/ports/netcdf-c/use_targets.patch new file mode 100644 index 00000000000000..b81fe8183a927e --- /dev/null +++ b/ports/netcdf-c/use_targets.patch @@ -0,0 +1,166 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1ce05e0fe..d1722ded6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -431,7 +431,7 @@ IF(NC_EXTRA_DEPS) + SET(EXTRA_DEPS ${EXTRA_DEPS} "${${_LIB}_DEP}") + ENDFOREACH() + MESSAGE("Extra deps: ${EXTRA_DEPS}") +- LIST(REMOVE_DUPLICATES EXTRA_DEPS) ++ #LIST(REMOVE_DUPLICATES EXTRA_DEPS) + SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${EXTRA_DEPS}) + ENDIF() + ### +@@ -620,9 +620,9 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) + SET(SEARCH_PACKAGE_NAME ${HDF5_PACKAGE_NAME}) + FIND_PACKAGE(HDF5 NAMES ${SEARCH_PACKAGE_NAME} COMPONENTS C HL CONFIG REQUIRED ${NC_HDF5_LINK_TYPE}) + ELSE(MSVC) +- FIND_PACKAGE(HDF5 COMPONENTS C HL REQUIRED) ++ FIND_PACKAGE(HDF5 COMPONENTS C HL CONFIG REQUIRED) + ENDIF(MSVC) +- ++ + ## + # Next, check the HDF5 version. This will inform which + # HDF5 variables we need to munge. +@@ -710,7 +710,8 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) + # Use H5Pset_fapl_mpio and H5Pget_fapl_mpio, instead. + # CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Pget_fapl_mpiposix "" HDF5_IS_PARALLEL_MPIPOSIX) + +- CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Pget_fapl_mpio "" HDF5_IS_PARALLEL_MPIO) ++ #CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Pget_fapl_mpio "" HDF5_IS_PARALLEL_MPIO) ++ set(HDF5_IS_PARALLEL_MPIO ${HDF5_ENABLE_PARALLEL}) + IF(HDF5_IS_PARALLEL_MPIO) + SET(HDF5_PARALLEL ON) + ELSE() +@@ -718,21 +719,30 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) + ENDIF() + + #Check to see if HDF5 library has collective metadata APIs, (HDF5 >= 1.10.0) +- CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Pset_all_coll_metadata_ops "" HDF5_HAS_COLL_METADATA_OPS) ++ #CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Pset_all_coll_metadata_ops "" HDF5_HAS_COLL_METADATA_OPS) ++ set(HDF5_HAS_COLL_METADATA_OPS ON) + + #Check to see if H5Z_SZIP exists in HDF5_Libraries. If so, we must use szip. +- CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Z_SZIP "" USE_SZIP) ++ #CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Z_SZIP "" USE_SZIP) ++ set(USE_SZIP ${HDF5_ENABLE_SZIP_SUPPORT}) + IF(USE_SZIP) +- FIND_LIBRARY(SZIP NAMES szip sz) +- IF(SZIP) ++ #FIND_LIBRARY(SZIP NAMES szip sz) ++ #IF(SZIP) + SET(HAVE_H5Z_SZIP 1) +- SET(SZIP_LIBRARY ${SZIP}) +- SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${SZIP}) +- ELSE() +- MESSAGE(FATAL_ERROR "HDF5 Requires SZIP, but cannot find libszip or libsz.") +- ENDIF() ++ #SET(SZIP_LIBRARY ${SZIP}) ++ #ELSE() ++ # MESSAGE(FATAL_ERROR "HDF5 Requires SZIP, but cannot find libszip or libsz.") ++ #ENDIF() + ENDIF() + ++ if(TARGET hdf5::hdf5-shared) ++ set(HDF5_C_LIBRARY_hdf5 hdf5::hdf5-shared) ++ set(HDF5_HL_LIBRARIES hdf5::hdf5_hl-shared) ++ else() ++ set(HDF5_C_LIBRARY_hdf5 hdf5::hdf5-static) ++ set(HDF5_HL_LIBRARIES hdf5::hdf5_hl-static) ++ endif() ++ list(APPEND CMAKE_REQUIRED_LIBRARIES ${HDF5_C_LIBRARY_hdf5}) + CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Pset_libver_bounds "" HAVE_H5PSET_LIBVER_BOUNDS) + CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5free_memory "" HAVE_H5FREE_MEMORY) + CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5allocate_memory "" HAVE_H5ALLOCATE_MEMORY) +@@ -764,8 +774,8 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) + ENDIF(USE_HDF5 OR ENABLE_NETCDF_4) + + # See if we have libcurl +-FIND_PACKAGE(CURL) +-ADD_DEFINITIONS(-DCURL_STATICLIB=1) ++FIND_PACKAGE(CURL CONFIG) ++#ADD_DEFINITIONS(-DCURL_STATICLIB=1) + INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS}) + + # Check to see if CURLOPT_USERNAME is defined. +@@ -1890,7 +1900,7 @@ ENDIF() + + STRING(REPLACE ";" " " LINKFLAGS "${LINKFLAGS}") + +-LIST(REMOVE_DUPLICATES NC_LIBS) ++#LIST(REMOVE_DUPLICATES NC_LIBS) + LIST(REMOVE_DUPLICATES LINKFLAGS) + + SET(LIBS ${NC_LIBS}) +diff --git a/liblib/CMakeLists.txt b/liblib/CMakeLists.txt +index ea9b02949..ec7851f37 100644 +--- a/liblib/CMakeLists.txt ++++ b/liblib/CMakeLists.txt +@@ -58,7 +58,7 @@ ENDIF() + + SET(TLL_LIBS "") + +-SET(TLL_LIBS ${TLL_LIBS} ${HAVE_LIBM} ${ZLIB_LIBRARY}) ++SET(TLL_LIBS ${TLL_LIBS} ${HAVE_LIBM} ZLIB::ZLIB) + + # Add extra dependencies specified via NC_EXTRA_DEPS + SET(TLL_LIBS ${TLL_LIBS} ${EXTRA_DEPS}) +@@ -68,27 +68,15 @@ IF(HAVE_LIBDL) + ENDIF() + + IF(USE_HDF5 OR USE_NETCDF4) +- IF(NOT MSVC) +- # Some version of cmake define HDF5_hdf5_LIBRARY instead of +- # HDF5_LIBRARY. Same with HDF5_HL_LIBRARIES +- IF(HDF5_hdf5_LIBRARY AND NOT HDF5_C_LIBRARIES) +- SET(HDF5_C_LIBRARIES ${HDF5_hdf5_LIBRARY}) +- ENDIF() +- IF(HDF5_hdf5_hl_LIBRARY AND NOT HDF5_HL_LIBRARIES) +- SET(HDF5_HL_LIBRARIES ${HDF5_hdf5_hl_LIBRARY}) +- ENDIF() +- # The order of the libraries is important here for static +- # builds: +- # Make sure that HDF5_C_LIBRARY appears *after* +- # HDF5_HL_LIBRARY. +- SET(TLL_LIBS ${HDF5_HL_LIBRARIES} ${HDF5_C_LIBRARIES} ${TLL_LIBS} ${SZIP_LIBRARY}) +- ELSE() # Windows CMake defines HDF5_LIBRARIES. +- SET(TLL_LIBS ${HDF5_LIBRARIES} ${TLL_LIBS} ${SZIP_LIBRARY}) +- ENDIF() ++ if(TARGET hdf5::hdf5-shared) ++ SET(TLL_LIBS ${TLL_LIBS} hdf5::hdf5-shared hdf5::hdf5_hl-shared) ++ else() ++ SET(TLL_LIBS ${TLL_LIBS} hdf5::hdf5-static hdf5::hdf5_hl-static) ++ endif() + ENDIF() + + IF(USE_DAP) +- SET(TLL_LIBS ${TLL_LIBS} ${CURL_LIBRARY}) ++ SET(TLL_LIBS ${TLL_LIBS} CURL::libcurl) + ENDIF() + + IF(USE_HDF4) +@@ -100,7 +88,7 @@ IF(ENABLE_PNETCDF AND PNETCDF) + ENDIF() + + IF(TLL_LIBS) +- LIST(REMOVE_DUPLICATES TLL_LIBS) ++ #LIST(REMOVE_DUPLICATES TLL_LIBS) + ENDIF() + + TARGET_LINK_LIBRARIES(netcdf ${TLL_LIBS}) +diff --git a/netCDFConfig.cmake.in b/netCDFConfig.cmake.in +index c89cf3e67..b81f35a1b 100644 +--- a/netCDFConfig.cmake.in ++++ b/netCDFConfig.cmake.in +@@ -12,6 +12,10 @@ set_and_check(netCDF_LIB_DIR "@PACKAGE_CMAKE_INSTALL_LIBDIR@") + set(netCDF_LIBRARIES netcdf) + + # include target information ++include(CMakeFindDependencyMacro) ++find_dependency(ZLIB CONFIG) ++find_dependency(HDF5 CONFIG) ++find_dependency(CURL CONFIG) + include("${CMAKE_CURRENT_LIST_DIR}/netCDFTargets.cmake") + + # Compiling Options From 30acd8223a30be9f6d65bb366ea1042f56494692 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 21 Dec 2019 22:24:29 +0100 Subject: [PATCH 149/419] netcdf update to 4.7.3 and use targets instead of libraries in cmake --- ports/netcdf-c/CONTROL | 2 +- ports/netcdf-c/fix-build-error-on-linux.patch | 28 --- .../fix_config_errors_and_targets.patch | 44 ----- ports/netcdf-c/hdf5.patch | 27 --- ports/netcdf-c/hdf5_2.patch | 13 -- ports/netcdf-c/hdf5_3.patch | 14 -- ports/netcdf-c/portfile.cmake | 24 +-- ports/netcdf-c/transitive-hdf5.patch | 13 -- ports/netcdf-c/use_targets.patch | 166 ++++++++++++++++++ 9 files changed, 171 insertions(+), 160 deletions(-) delete mode 100644 ports/netcdf-c/fix-build-error-on-linux.patch delete mode 100644 ports/netcdf-c/fix_config_errors_and_targets.patch delete mode 100644 ports/netcdf-c/hdf5.patch delete mode 100644 ports/netcdf-c/hdf5_2.patch delete mode 100644 ports/netcdf-c/hdf5_3.patch delete mode 100644 ports/netcdf-c/transitive-hdf5.patch create mode 100644 ports/netcdf-c/use_targets.patch diff --git a/ports/netcdf-c/CONTROL b/ports/netcdf-c/CONTROL index ff9940e2bc2894..1d5b7cb90229be 100644 --- a/ports/netcdf-c/CONTROL +++ b/ports/netcdf-c/CONTROL @@ -1,5 +1,5 @@ Source: netcdf-c -Version: 4.7.0-6 +Version: 4.7.3 Build-Depends: hdf5, curl Homepage: https://github.com/Unidata/netcdf-c Description: a set of self-describing, machine-independent data formats that support the creation, access, and sharing of array-oriented scientific data. diff --git a/ports/netcdf-c/fix-build-error-on-linux.patch b/ports/netcdf-c/fix-build-error-on-linux.patch deleted file mode 100644 index bdcd7c97a4d141..00000000000000 --- a/ports/netcdf-c/fix-build-error-on-linux.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/include/ncconfigure.h b/include/ncconfigure.h -index 2c5b2c8..d397790 100644 ---- a/include/ncconfigure.h -+++ b/include/ncconfigure.h -@@ -25,20 +25,20 @@ missing functions should be - defined and missing types defined. - */ - --#ifndef HAVE_STRDUP -+#ifndef strdup - extern char* strdup(const char*); - #endif - - /* handle null arguments */ - #ifndef nulldup --#ifdef HAVE_STRDUP -+#ifdef strdup - #define nulldup(s) ((s)==NULL?NULL:strdup(s)) - #else - char *nulldup(const char* s); - #endif - #endif - --#ifdef _MSC_VER -+#ifdef _WIN32 - #ifndef HAVE_SSIZE_T - #include - typedef SSIZE_T ssize_t; diff --git a/ports/netcdf-c/fix_config_errors_and_targets.patch b/ports/netcdf-c/fix_config_errors_and_targets.patch deleted file mode 100644 index a500e0844f1d12..00000000000000 --- a/ports/netcdf-c/fix_config_errors_and_targets.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 96fbaf979..e5089ad4f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -261,7 +261,7 @@ ENDIF() - INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) - INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/oc2) - INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/libsrc) --SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_SOURCE_DIR}/libsrc) -+list(APPEND CMAKE_REQUIRED_INCLUDES ${CMAKE_SOURCE_DIR}/libsrc) - - ################################ - # End Compiler Configuration -@@ -726,7 +726,7 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) - FIND_LIBRARY(SZIP NAMES szip sz) - IF(SZIP) - SET(HAVE_H5Z_SZIP 1) -- SET(SZIP_LIBRARY ${SZIP}) -+ #SET(SZIP_LIBRARY ${SZIP}) - SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${SZIP}) - ELSE() - MESSAGE(FATAL_ERROR "HDF5 Requires SZIP, but cannot find libszip or libsz.") -diff --git a/liblib/CMakeLists.txt b/liblib/CMakeLists.txt -index 6a81a4801..74173c1d3 100644 ---- a/liblib/CMakeLists.txt -+++ b/liblib/CMakeLists.txt -@@ -61,7 +61,7 @@ SET(TLL_LIBS "") - SET(TLL_LIBS ${TLL_LIBS} ${HAVE_LIBM} ${ZLIB_LIBRARY}) - - # Add extra dependencies specified via NC_EXTRA_DEPS --SET(TLL_LIBS ${TLL_LIBS} ${EXTRA_DEPS}) -+#SET(TLL_LIBS ${TLL_LIBS} ${EXTRA_DEPS}) - - IF(HAVE_LIBDL) - SET(TLL_LIBS ${LIBDL} ${TLL_LIBS}) -@@ -100,7 +102,7 @@ IF(ENABLE_PNETCDF AND PNETCDF) - ENDIF() - - IF(TLL_LIBS) -- LIST(REMOVE_DUPLICATES TLL_LIBS) -+ #LIST(REMOVE_DUPLICATES TLL_LIBS) //removes deuplicate debug/optimize - ENDIF() - - TARGET_LINK_LIBRARIES(netcdf ${TLL_LIBS}) diff --git a/ports/netcdf-c/hdf5.patch b/ports/netcdf-c/hdf5.patch deleted file mode 100644 index 71f4921eded8c7..00000000000000 --- a/ports/netcdf-c/hdf5.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a3874c13..36f15beb 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -599,11 +599,10 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) - IF(NC_FIND_SHARED_LIBS) - SET(NC_HDF5_LINK_TYPE "shared") - SET(NC_HDF5_LINK_TYPE_UPPER "SHARED") -- ADD_DEFINITIONS(-DH5_BUILT_AS_DYNAMIC_LIB) - ELSE(NC_FIND_SHARED_LIBS) - SET(NC_HDF5_LINK_TYPE "static") - SET(NC_HDF5_LINK_TYPE_UPPER "STATIC") -- ADD_DEFINITIONS(-DH5_BUILT_AS_STATIC_LIB) -+ SET(HDF5_USE_STATIC_LIBRARIES ON) - ENDIF(NC_FIND_SHARED_LIBS) - - ##### -@@ -614,8 +615,7 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) - # had worked. - ##### - IF(MSVC) -- SET(SEARCH_PACKAGE_NAME ${HDF5_PACKAGE_NAME}) -- FIND_PACKAGE(HDF5 NAMES ${SEARCH_PACKAGE_NAME} COMPONENTS C HL NO_MODULES REQUIRED ${NC_HDF5_LINK_TYPE}) -+ FIND_PACKAGE(HDF5 COMPONENTS C HL REQUIRED) - ELSE(MSVC) - FIND_PACKAGE(HDF5 COMPONENTS C HL REQUIRED) - ENDIF(MSVC) diff --git a/ports/netcdf-c/hdf5_2.patch b/ports/netcdf-c/hdf5_2.patch deleted file mode 100644 index a3a3fb751ba183..00000000000000 --- a/ports/netcdf-c/hdf5_2.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/liblib/CMakeLists.txt b/liblib/CMakeLists.txt -index ea9b0294..3c7f427d 100644 ---- a/liblib/CMakeLists.txt -+++ b/liblib/CMakeLists.txt -@@ -83,7 +83,7 @@ IF(USE_HDF5 OR USE_NETCDF4) - # HDF5_HL_LIBRARY. - SET(TLL_LIBS ${HDF5_HL_LIBRARIES} ${HDF5_C_LIBRARIES} ${TLL_LIBS} ${SZIP_LIBRARY}) - ELSE() # Windows CMake defines HDF5_LIBRARIES. -- SET(TLL_LIBS ${HDF5_LIBRARIES} ${TLL_LIBS} ${SZIP_LIBRARY}) -+ SET(TLL_LIBS ${HDF5_HL_LIBRARIES} ${HDF5_C_LIBRARIES} ${TLL_LIBS} ${SZIP_LIBRARY}) - ENDIF() - ENDIF() - diff --git a/ports/netcdf-c/hdf5_3.patch b/ports/netcdf-c/hdf5_3.patch deleted file mode 100644 index 502a8ea9941bc8..00000000000000 --- a/ports/netcdf-c/hdf5_3.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/libhdf5/CMakeLists.txt b/libhdf5/CMakeLists.txt -index f3c7bbc..34fc2ab 100644 ---- a/libhdf5/CMakeLists.txt -+++ b/libhdf5/CMakeLists.txt -@@ -20,3 +20,9 @@ add_library(netcdfhdf5 OBJECT ${libnchdf5_SOURCES}) - - # Remember to package this file for CMake builds. - ADD_EXTRA_DIST(${libnchdf5_SOURCES} CMakeLists.txt) -+ -+if(HDF5_BUILD_SHARED_LIBS) -+ target_link_libraries(netcdfhdf5 PRIVATE hdf5::hdf5-shared hdf5::hdf5_hl-shared) -+else() -+ target_link_libraries(netcdfhdf5 PRIVATE hdf5::hdf5-static hdf5::hdf5_hl-static) -+endif() diff --git a/ports/netcdf-c/portfile.cmake b/ports/netcdf-c/portfile.cmake index 325d40cb2a2663..30522e963dd478 100644 --- a/ports/netcdf-c/portfile.cmake +++ b/ports/netcdf-c/portfile.cmake @@ -1,23 +1,19 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Unidata/netcdf-c - REF v4.7.0 - SHA512 6602799780105c60ac8c873ed4055c1512dc8bebf98de01e1cce572d113ffb3bf3ca522475b93255c415340f672c55dc6785e0bdbcc39055314683da1d02141a + REF b7cd387bee8c661141fabb490f4969587c008c55 # v4.7.3 + SHA512 a55391620fac61e4975fe62907ca21049911afce6190fc12d183d24133a32aae8cd223b97a3fe57fc82d8bdca1a7db451046e3be3c379051624d48b1f56c0332 HEAD_REF master PATCHES no-install-deps.patch config-pkg-location.patch - transitive-hdf5.patch - hdf5.patch - hdf5_2.patch - fix-build-error-on-linux.patch - hdf5_3.patch - fix_config_errors_and_targets.patch + use_targets.patch ) #Remove outdated find modules file(REMOVE "${SOURCE_PATH}/cmake/modules/FindSZIP.cmake") file(REMOVE "${SOURCE_PATH}/cmake/modules/FindZLIB.cmake") +file(REMOVE "${SOURCE_PATH}/cmake/modules/windows/FindHDF5.cmake") if(VCPKG_CRT_LINKAGE STREQUAL "static") set(NC_USE_STATIC_CRT ON) @@ -47,18 +43,6 @@ vcpkg_configure_cmake( -DDISABLE_INSTALL_DEPENDENCIES=ON -DNC_USE_STATIC_CRT=${NC_USE_STATIC_CRT} -DConfigPackageLocation=share/netcdf - "-DNC_EXTRA_DEPS=zlib szip" #The functions checks done by cmake are actual failing due to missing external symbols. This should fix it. - "-DCURL_INCLUDE_DIRS=${CURRENT_INSTALLED_DIR}/include" - "-DCMAKE_REQUIRED_INCLUDES=${CURRENT_INSTALLED_DIR}/include" # the curl variable make the curl checks succesful - "-DSZIP_LIBRARY:STRING=debug\\\\\\\\\\\;${SZIP_DEBUG}\\\\\\\\\\\;optimized\\\\\\\\\\\;${SZIP_RELEASE}" - OPTIONS_RELEASE - "-Dzlib_DEP=${ZLIB_RELEASE}" - "-Dszip_DEP=${SZIP_RELEASE}" - "-DSZIP=${SZIP_RELEASE}" - OPTIONS_DEBUG - "-Dzlib_DEP=${ZLIB_DEBUG}" - "-Dszip_DEP=${SZIP_DEBUG}" - "-DSZIP=${SZIP_DEBUG}" ) vcpkg_install_cmake() diff --git a/ports/netcdf-c/transitive-hdf5.patch b/ports/netcdf-c/transitive-hdf5.patch deleted file mode 100644 index 89773e6d40f41f..00000000000000 --- a/ports/netcdf-c/transitive-hdf5.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/netCDFConfig.cmake.in b/netCDFConfig.cmake.in -index 6f4ccf8..14a3743 100644 ---- a/netCDFConfig.cmake.in -+++ b/netCDFConfig.cmake.in -@@ -11,6 +11,8 @@ set_and_check(netCDF_LIB_DIR "@PACKAGE_CMAKE_INSTALL_LIBDIR@") - - set(netCDF_LIBRARIES netcdf) - -+find_package(HDF5 COMPONENTS C HL CONFIG REQUIRED) -+ - # include target information - include("${CMAKE_CURRENT_LIST_DIR}/netCDFTargets.cmake") - diff --git a/ports/netcdf-c/use_targets.patch b/ports/netcdf-c/use_targets.patch new file mode 100644 index 00000000000000..b81fe8183a927e --- /dev/null +++ b/ports/netcdf-c/use_targets.patch @@ -0,0 +1,166 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1ce05e0fe..d1722ded6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -431,7 +431,7 @@ IF(NC_EXTRA_DEPS) + SET(EXTRA_DEPS ${EXTRA_DEPS} "${${_LIB}_DEP}") + ENDFOREACH() + MESSAGE("Extra deps: ${EXTRA_DEPS}") +- LIST(REMOVE_DUPLICATES EXTRA_DEPS) ++ #LIST(REMOVE_DUPLICATES EXTRA_DEPS) + SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${EXTRA_DEPS}) + ENDIF() + ### +@@ -620,9 +620,9 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) + SET(SEARCH_PACKAGE_NAME ${HDF5_PACKAGE_NAME}) + FIND_PACKAGE(HDF5 NAMES ${SEARCH_PACKAGE_NAME} COMPONENTS C HL CONFIG REQUIRED ${NC_HDF5_LINK_TYPE}) + ELSE(MSVC) +- FIND_PACKAGE(HDF5 COMPONENTS C HL REQUIRED) ++ FIND_PACKAGE(HDF5 COMPONENTS C HL CONFIG REQUIRED) + ENDIF(MSVC) +- ++ + ## + # Next, check the HDF5 version. This will inform which + # HDF5 variables we need to munge. +@@ -710,7 +710,8 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) + # Use H5Pset_fapl_mpio and H5Pget_fapl_mpio, instead. + # CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Pget_fapl_mpiposix "" HDF5_IS_PARALLEL_MPIPOSIX) + +- CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Pget_fapl_mpio "" HDF5_IS_PARALLEL_MPIO) ++ #CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Pget_fapl_mpio "" HDF5_IS_PARALLEL_MPIO) ++ set(HDF5_IS_PARALLEL_MPIO ${HDF5_ENABLE_PARALLEL}) + IF(HDF5_IS_PARALLEL_MPIO) + SET(HDF5_PARALLEL ON) + ELSE() +@@ -718,21 +719,30 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) + ENDIF() + + #Check to see if HDF5 library has collective metadata APIs, (HDF5 >= 1.10.0) +- CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Pset_all_coll_metadata_ops "" HDF5_HAS_COLL_METADATA_OPS) ++ #CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Pset_all_coll_metadata_ops "" HDF5_HAS_COLL_METADATA_OPS) ++ set(HDF5_HAS_COLL_METADATA_OPS ON) + + #Check to see if H5Z_SZIP exists in HDF5_Libraries. If so, we must use szip. +- CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Z_SZIP "" USE_SZIP) ++ #CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Z_SZIP "" USE_SZIP) ++ set(USE_SZIP ${HDF5_ENABLE_SZIP_SUPPORT}) + IF(USE_SZIP) +- FIND_LIBRARY(SZIP NAMES szip sz) +- IF(SZIP) ++ #FIND_LIBRARY(SZIP NAMES szip sz) ++ #IF(SZIP) + SET(HAVE_H5Z_SZIP 1) +- SET(SZIP_LIBRARY ${SZIP}) +- SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${SZIP}) +- ELSE() +- MESSAGE(FATAL_ERROR "HDF5 Requires SZIP, but cannot find libszip or libsz.") +- ENDIF() ++ #SET(SZIP_LIBRARY ${SZIP}) ++ #ELSE() ++ # MESSAGE(FATAL_ERROR "HDF5 Requires SZIP, but cannot find libszip or libsz.") ++ #ENDIF() + ENDIF() + ++ if(TARGET hdf5::hdf5-shared) ++ set(HDF5_C_LIBRARY_hdf5 hdf5::hdf5-shared) ++ set(HDF5_HL_LIBRARIES hdf5::hdf5_hl-shared) ++ else() ++ set(HDF5_C_LIBRARY_hdf5 hdf5::hdf5-static) ++ set(HDF5_HL_LIBRARIES hdf5::hdf5_hl-static) ++ endif() ++ list(APPEND CMAKE_REQUIRED_LIBRARIES ${HDF5_C_LIBRARY_hdf5}) + CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Pset_libver_bounds "" HAVE_H5PSET_LIBVER_BOUNDS) + CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5free_memory "" HAVE_H5FREE_MEMORY) + CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5allocate_memory "" HAVE_H5ALLOCATE_MEMORY) +@@ -764,8 +774,8 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) + ENDIF(USE_HDF5 OR ENABLE_NETCDF_4) + + # See if we have libcurl +-FIND_PACKAGE(CURL) +-ADD_DEFINITIONS(-DCURL_STATICLIB=1) ++FIND_PACKAGE(CURL CONFIG) ++#ADD_DEFINITIONS(-DCURL_STATICLIB=1) + INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS}) + + # Check to see if CURLOPT_USERNAME is defined. +@@ -1890,7 +1900,7 @@ ENDIF() + + STRING(REPLACE ";" " " LINKFLAGS "${LINKFLAGS}") + +-LIST(REMOVE_DUPLICATES NC_LIBS) ++#LIST(REMOVE_DUPLICATES NC_LIBS) + LIST(REMOVE_DUPLICATES LINKFLAGS) + + SET(LIBS ${NC_LIBS}) +diff --git a/liblib/CMakeLists.txt b/liblib/CMakeLists.txt +index ea9b02949..ec7851f37 100644 +--- a/liblib/CMakeLists.txt ++++ b/liblib/CMakeLists.txt +@@ -58,7 +58,7 @@ ENDIF() + + SET(TLL_LIBS "") + +-SET(TLL_LIBS ${TLL_LIBS} ${HAVE_LIBM} ${ZLIB_LIBRARY}) ++SET(TLL_LIBS ${TLL_LIBS} ${HAVE_LIBM} ZLIB::ZLIB) + + # Add extra dependencies specified via NC_EXTRA_DEPS + SET(TLL_LIBS ${TLL_LIBS} ${EXTRA_DEPS}) +@@ -68,27 +68,15 @@ IF(HAVE_LIBDL) + ENDIF() + + IF(USE_HDF5 OR USE_NETCDF4) +- IF(NOT MSVC) +- # Some version of cmake define HDF5_hdf5_LIBRARY instead of +- # HDF5_LIBRARY. Same with HDF5_HL_LIBRARIES +- IF(HDF5_hdf5_LIBRARY AND NOT HDF5_C_LIBRARIES) +- SET(HDF5_C_LIBRARIES ${HDF5_hdf5_LIBRARY}) +- ENDIF() +- IF(HDF5_hdf5_hl_LIBRARY AND NOT HDF5_HL_LIBRARIES) +- SET(HDF5_HL_LIBRARIES ${HDF5_hdf5_hl_LIBRARY}) +- ENDIF() +- # The order of the libraries is important here for static +- # builds: +- # Make sure that HDF5_C_LIBRARY appears *after* +- # HDF5_HL_LIBRARY. +- SET(TLL_LIBS ${HDF5_HL_LIBRARIES} ${HDF5_C_LIBRARIES} ${TLL_LIBS} ${SZIP_LIBRARY}) +- ELSE() # Windows CMake defines HDF5_LIBRARIES. +- SET(TLL_LIBS ${HDF5_LIBRARIES} ${TLL_LIBS} ${SZIP_LIBRARY}) +- ENDIF() ++ if(TARGET hdf5::hdf5-shared) ++ SET(TLL_LIBS ${TLL_LIBS} hdf5::hdf5-shared hdf5::hdf5_hl-shared) ++ else() ++ SET(TLL_LIBS ${TLL_LIBS} hdf5::hdf5-static hdf5::hdf5_hl-static) ++ endif() + ENDIF() + + IF(USE_DAP) +- SET(TLL_LIBS ${TLL_LIBS} ${CURL_LIBRARY}) ++ SET(TLL_LIBS ${TLL_LIBS} CURL::libcurl) + ENDIF() + + IF(USE_HDF4) +@@ -100,7 +88,7 @@ IF(ENABLE_PNETCDF AND PNETCDF) + ENDIF() + + IF(TLL_LIBS) +- LIST(REMOVE_DUPLICATES TLL_LIBS) ++ #LIST(REMOVE_DUPLICATES TLL_LIBS) + ENDIF() + + TARGET_LINK_LIBRARIES(netcdf ${TLL_LIBS}) +diff --git a/netCDFConfig.cmake.in b/netCDFConfig.cmake.in +index c89cf3e67..b81f35a1b 100644 +--- a/netCDFConfig.cmake.in ++++ b/netCDFConfig.cmake.in +@@ -12,6 +12,10 @@ set_and_check(netCDF_LIB_DIR "@PACKAGE_CMAKE_INSTALL_LIBDIR@") + set(netCDF_LIBRARIES netcdf) + + # include target information ++include(CMakeFindDependencyMacro) ++find_dependency(ZLIB CONFIG) ++find_dependency(HDF5 CONFIG) ++find_dependency(CURL CONFIG) + include("${CMAKE_CURRENT_LIST_DIR}/netCDFTargets.cmake") + + # Compiling Options From c971473bedf7b1671be0006128b90aa3b682a0e5 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sun, 22 Dec 2019 23:00:11 +0100 Subject: [PATCH 150/419] remove config from the zlib find_dependency call because there is no config. The target is supplied by a cmake module itself --- ports/netcdf-c/use_targets.patch | 162 +++++++++++++++---------------- 1 file changed, 81 insertions(+), 81 deletions(-) diff --git a/ports/netcdf-c/use_targets.patch b/ports/netcdf-c/use_targets.patch index b81fe8183a927e..b03bbea83c4432 100644 --- a/ports/netcdf-c/use_targets.patch +++ b/ports/netcdf-c/use_targets.patch @@ -1,8 +1,8 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1ce05e0fe..d1722ded6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -431,7 +431,7 @@ IF(NC_EXTRA_DEPS) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1ce05e0fe..d1722ded6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -431,7 +431,7 @@ IF(NC_EXTRA_DEPS) SET(EXTRA_DEPS ${EXTRA_DEPS} "${${_LIB}_DEP}") ENDFOREACH() MESSAGE("Extra deps: ${EXTRA_DEPS}") @@ -11,7 +11,7 @@ index 1ce05e0fe..d1722ded6 100644 SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${EXTRA_DEPS}) ENDIF() ### -@@ -620,9 +620,9 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) +@@ -620,9 +620,9 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) SET(SEARCH_PACKAGE_NAME ${HDF5_PACKAGE_NAME}) FIND_PACKAGE(HDF5 NAMES ${SEARCH_PACKAGE_NAME} COMPONENTS C HL CONFIG REQUIRED ${NC_HDF5_LINK_TYPE}) ELSE(MSVC) @@ -23,7 +23,7 @@ index 1ce05e0fe..d1722ded6 100644 ## # Next, check the HDF5 version. This will inform which # HDF5 variables we need to munge. -@@ -710,7 +710,8 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) +@@ -710,7 +710,8 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) # Use H5Pset_fapl_mpio and H5Pget_fapl_mpio, instead. # CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Pget_fapl_mpiposix "" HDF5_IS_PARALLEL_MPIPOSIX) @@ -33,7 +33,7 @@ index 1ce05e0fe..d1722ded6 100644 IF(HDF5_IS_PARALLEL_MPIO) SET(HDF5_PARALLEL ON) ELSE() -@@ -718,21 +719,30 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) +@@ -718,21 +719,30 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) ENDIF() #Check to see if HDF5 library has collective metadata APIs, (HDF5 >= 1.10.0) @@ -73,7 +73,7 @@ index 1ce05e0fe..d1722ded6 100644 CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Pset_libver_bounds "" HAVE_H5PSET_LIBVER_BOUNDS) CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5free_memory "" HAVE_H5FREE_MEMORY) CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5allocate_memory "" HAVE_H5ALLOCATE_MEMORY) -@@ -764,8 +774,8 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) +@@ -764,8 +774,8 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) ENDIF(USE_HDF5 OR ENABLE_NETCDF_4) # See if we have libcurl @@ -84,7 +84,7 @@ index 1ce05e0fe..d1722ded6 100644 INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS}) # Check to see if CURLOPT_USERNAME is defined. -@@ -1890,7 +1900,7 @@ ENDIF() +@@ -1890,7 +1900,7 @@ ENDIF() STRING(REPLACE ";" " " LINKFLAGS "${LINKFLAGS}") @@ -93,74 +93,74 @@ index 1ce05e0fe..d1722ded6 100644 LIST(REMOVE_DUPLICATES LINKFLAGS) SET(LIBS ${NC_LIBS}) -diff --git a/liblib/CMakeLists.txt b/liblib/CMakeLists.txt -index ea9b02949..ec7851f37 100644 ---- a/liblib/CMakeLists.txt -+++ b/liblib/CMakeLists.txt -@@ -58,7 +58,7 @@ ENDIF() - - SET(TLL_LIBS "") - --SET(TLL_LIBS ${TLL_LIBS} ${HAVE_LIBM} ${ZLIB_LIBRARY}) -+SET(TLL_LIBS ${TLL_LIBS} ${HAVE_LIBM} ZLIB::ZLIB) - - # Add extra dependencies specified via NC_EXTRA_DEPS - SET(TLL_LIBS ${TLL_LIBS} ${EXTRA_DEPS}) -@@ -68,27 +68,15 @@ IF(HAVE_LIBDL) - ENDIF() - - IF(USE_HDF5 OR USE_NETCDF4) -- IF(NOT MSVC) -- # Some version of cmake define HDF5_hdf5_LIBRARY instead of -- # HDF5_LIBRARY. Same with HDF5_HL_LIBRARIES -- IF(HDF5_hdf5_LIBRARY AND NOT HDF5_C_LIBRARIES) -- SET(HDF5_C_LIBRARIES ${HDF5_hdf5_LIBRARY}) -- ENDIF() -- IF(HDF5_hdf5_hl_LIBRARY AND NOT HDF5_HL_LIBRARIES) -- SET(HDF5_HL_LIBRARIES ${HDF5_hdf5_hl_LIBRARY}) -- ENDIF() -- # The order of the libraries is important here for static -- # builds: -- # Make sure that HDF5_C_LIBRARY appears *after* -- # HDF5_HL_LIBRARY. -- SET(TLL_LIBS ${HDF5_HL_LIBRARIES} ${HDF5_C_LIBRARIES} ${TLL_LIBS} ${SZIP_LIBRARY}) -- ELSE() # Windows CMake defines HDF5_LIBRARIES. -- SET(TLL_LIBS ${HDF5_LIBRARIES} ${TLL_LIBS} ${SZIP_LIBRARY}) -- ENDIF() -+ if(TARGET hdf5::hdf5-shared) -+ SET(TLL_LIBS ${TLL_LIBS} hdf5::hdf5-shared hdf5::hdf5_hl-shared) -+ else() -+ SET(TLL_LIBS ${TLL_LIBS} hdf5::hdf5-static hdf5::hdf5_hl-static) -+ endif() - ENDIF() - - IF(USE_DAP) -- SET(TLL_LIBS ${TLL_LIBS} ${CURL_LIBRARY}) -+ SET(TLL_LIBS ${TLL_LIBS} CURL::libcurl) - ENDIF() - - IF(USE_HDF4) -@@ -100,7 +88,7 @@ IF(ENABLE_PNETCDF AND PNETCDF) - ENDIF() - - IF(TLL_LIBS) -- LIST(REMOVE_DUPLICATES TLL_LIBS) -+ #LIST(REMOVE_DUPLICATES TLL_LIBS) - ENDIF() - - TARGET_LINK_LIBRARIES(netcdf ${TLL_LIBS}) -diff --git a/netCDFConfig.cmake.in b/netCDFConfig.cmake.in -index c89cf3e67..b81f35a1b 100644 ---- a/netCDFConfig.cmake.in -+++ b/netCDFConfig.cmake.in -@@ -12,6 +12,10 @@ set_and_check(netCDF_LIB_DIR "@PACKAGE_CMAKE_INSTALL_LIBDIR@") - set(netCDF_LIBRARIES netcdf) - - # include target information -+include(CMakeFindDependencyMacro) -+find_dependency(ZLIB CONFIG) -+find_dependency(HDF5 CONFIG) -+find_dependency(CURL CONFIG) - include("${CMAKE_CURRENT_LIST_DIR}/netCDFTargets.cmake") - - # Compiling Options +diff --git a/liblib/CMakeLists.txt b/liblib/CMakeLists.txt +index ea9b02949..ec7851f37 100644 +--- a/liblib/CMakeLists.txt ++++ b/liblib/CMakeLists.txt +@@ -58,7 +58,7 @@ ENDIF() + + SET(TLL_LIBS "") + +-SET(TLL_LIBS ${TLL_LIBS} ${HAVE_LIBM} ${ZLIB_LIBRARY}) ++SET(TLL_LIBS ${TLL_LIBS} ${HAVE_LIBM} ZLIB::ZLIB) + + # Add extra dependencies specified via NC_EXTRA_DEPS + SET(TLL_LIBS ${TLL_LIBS} ${EXTRA_DEPS}) +@@ -68,27 +68,15 @@ IF(HAVE_LIBDL) + ENDIF() + + IF(USE_HDF5 OR USE_NETCDF4) +- IF(NOT MSVC) +- # Some version of cmake define HDF5_hdf5_LIBRARY instead of +- # HDF5_LIBRARY. Same with HDF5_HL_LIBRARIES +- IF(HDF5_hdf5_LIBRARY AND NOT HDF5_C_LIBRARIES) +- SET(HDF5_C_LIBRARIES ${HDF5_hdf5_LIBRARY}) +- ENDIF() +- IF(HDF5_hdf5_hl_LIBRARY AND NOT HDF5_HL_LIBRARIES) +- SET(HDF5_HL_LIBRARIES ${HDF5_hdf5_hl_LIBRARY}) +- ENDIF() +- # The order of the libraries is important here for static +- # builds: +- # Make sure that HDF5_C_LIBRARY appears *after* +- # HDF5_HL_LIBRARY. +- SET(TLL_LIBS ${HDF5_HL_LIBRARIES} ${HDF5_C_LIBRARIES} ${TLL_LIBS} ${SZIP_LIBRARY}) +- ELSE() # Windows CMake defines HDF5_LIBRARIES. +- SET(TLL_LIBS ${HDF5_LIBRARIES} ${TLL_LIBS} ${SZIP_LIBRARY}) +- ENDIF() ++ if(TARGET hdf5::hdf5-shared) ++ SET(TLL_LIBS ${TLL_LIBS} hdf5::hdf5-shared hdf5::hdf5_hl-shared) ++ else() ++ SET(TLL_LIBS ${TLL_LIBS} hdf5::hdf5-static hdf5::hdf5_hl-static) ++ endif() + ENDIF() + + IF(USE_DAP) +- SET(TLL_LIBS ${TLL_LIBS} ${CURL_LIBRARY}) ++ SET(TLL_LIBS ${TLL_LIBS} CURL::libcurl) + ENDIF() + + IF(USE_HDF4) +@@ -100,7 +88,7 @@ IF(ENABLE_PNETCDF AND PNETCDF) + ENDIF() + + IF(TLL_LIBS) +- LIST(REMOVE_DUPLICATES TLL_LIBS) ++ #LIST(REMOVE_DUPLICATES TLL_LIBS) + ENDIF() + + TARGET_LINK_LIBRARIES(netcdf ${TLL_LIBS}) +diff --git a/netCDFConfig.cmake.in b/netCDFConfig.cmake.in +index c89cf3e67..b81f35a1b 100644 +--- a/netCDFConfig.cmake.in ++++ b/netCDFConfig.cmake.in +@@ -12,6 +12,10 @@ set_and_check(netCDF_LIB_DIR "@PACKAGE_CMAKE_INSTALL_LIBDIR@") + set(netCDF_LIBRARIES netcdf) + + # include target information ++include(CMakeFindDependencyMacro) ++find_dependency(ZLIB) ++find_dependency(HDF5 CONFIG) ++find_dependency(CURL CONFIG) + include("${CMAKE_CURRENT_LIST_DIR}/netCDFTargets.cmake") + + # Compiling Options From 1f1bed251a509eabfcd70a9e022a1843df32a31d Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 23 Dec 2019 14:53:47 +0100 Subject: [PATCH 151/419] move usage of hdf5 target to an further up in the cmakelists.txt and use config also on linux --- ports/netcdf-c/use_targets.patch | 226 +++++++++++++++++-------------- 1 file changed, 122 insertions(+), 104 deletions(-) diff --git a/ports/netcdf-c/use_targets.patch b/ports/netcdf-c/use_targets.patch index b03bbea83c4432..856837471dc597 100644 --- a/ports/netcdf-c/use_targets.patch +++ b/ports/netcdf-c/use_targets.patch @@ -1,8 +1,8 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1ce05e0fe..d1722ded6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -431,7 +431,7 @@ IF(NC_EXTRA_DEPS) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1ce05e0fe..7671d7b1e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -431,7 +431,7 @@ IF(NC_EXTRA_DEPS) SET(EXTRA_DEPS ${EXTRA_DEPS} "${${_LIB}_DEP}") ENDFOREACH() MESSAGE("Extra deps: ${EXTRA_DEPS}") @@ -11,7 +11,32 @@ index 1ce05e0fe..d1722ded6 100644 SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${EXTRA_DEPS}) ENDIF() ### -@@ -620,9 +620,9 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) +@@ -599,15 +599,15 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) + # we will use a static library. This can be toggled + # by explicitly modifying NC_FIND_SHARED_LIBS. + ## +- IF(NC_FIND_SHARED_LIBS) +- SET(NC_HDF5_LINK_TYPE "shared") +- SET(NC_HDF5_LINK_TYPE_UPPER "SHARED") +- ADD_DEFINITIONS(-DH5_BUILT_AS_DYNAMIC_LIB) +- ELSE(NC_FIND_SHARED_LIBS) +- SET(NC_HDF5_LINK_TYPE "static") +- SET(NC_HDF5_LINK_TYPE_UPPER "STATIC") +- ADD_DEFINITIONS(-DH5_BUILT_AS_STATIC_LIB) +- ENDIF(NC_FIND_SHARED_LIBS) ++ #IF(NC_FIND_SHARED_LIBS) ++ #SET(NC_HDF5_LINK_TYPE "shared") ++ #SET(NC_HDF5_LINK_TYPE_UPPER "SHARED") ++ #ADD_DEFINITIONS(-DH5_BUILT_AS_DYNAMIC_LIB) ++ #ELSE(NC_FIND_SHARED_LIBS) ++ #SET(NC_HDF5_LINK_TYPE "static") ++ #SET(NC_HDF5_LINK_TYPE_UPPER "STATIC") ++ #ADD_DEFINITIONS(-DH5_BUILT_AS_STATIC_LIB) ++ #ENDIF(NC_FIND_SHARED_LIBS) + + ##### + # First, find the C and HL libraries. +@@ -620,9 +620,9 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) SET(SEARCH_PACKAGE_NAME ${HDF5_PACKAGE_NAME}) FIND_PACKAGE(HDF5 NAMES ${SEARCH_PACKAGE_NAME} COMPONENTS C HL CONFIG REQUIRED ${NC_HDF5_LINK_TYPE}) ELSE(MSVC) @@ -23,23 +48,26 @@ index 1ce05e0fe..d1722ded6 100644 ## # Next, check the HDF5 version. This will inform which # HDF5 variables we need to munge. -@@ -710,7 +710,8 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) - # Use H5Pset_fapl_mpio and H5Pget_fapl_mpio, instead. - # CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Pget_fapl_mpiposix "" HDF5_IS_PARALLEL_MPIPOSIX) +@@ -695,6 +695,17 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) + ENDIF() + ENDIF(HDF5_C_LIBRARY AND HDF5_HL_LIBRARY AND HDF5_INCLUDE_DIR) -- CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Pget_fapl_mpio "" HDF5_IS_PARALLEL_MPIO) -+ #CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Pget_fapl_mpio "" HDF5_IS_PARALLEL_MPIO) -+ set(HDF5_IS_PARALLEL_MPIO ${HDF5_ENABLE_PARALLEL}) - IF(HDF5_IS_PARALLEL_MPIO) - SET(HDF5_PARALLEL ON) - ELSE() -@@ -718,21 +719,30 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) - ENDIF() ++ if(TARGET hdf5::hdf5-shared) ++ set(HDF5_C_LIBRARY hdf5::hdf5-shared) ++ set(HDF5_C_LIBRARY_hdf5 hdf5::hdf5-shared) ++ set(HDF5_HL_LIBRARIES hdf5::hdf5_hl-shared) ++ else() ++ set(HDF5_C_LIBRARY hdf5::hdf5-static) ++ set(HDF5_C_LIBRARY_hdf5 hdf5::hdf5-static) ++ set(HDF5_HL_LIBRARIES hdf5::hdf5_hl-static) ++ endif() ++ list(APPEND CMAKE_REQUIRED_LIBRARIES ${HDF5_C_LIBRARY}) ++ + FIND_PACKAGE(Threads) - #Check to see if HDF5 library has collective metadata APIs, (HDF5 >= 1.10.0) -- CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Pset_all_coll_metadata_ops "" HDF5_HAS_COLL_METADATA_OPS) -+ #CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Pset_all_coll_metadata_ops "" HDF5_HAS_COLL_METADATA_OPS) -+ set(HDF5_HAS_COLL_METADATA_OPS ON) + # There is a missing case in the above code so default it +@@ -721,16 +733,16 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) + CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Pset_all_coll_metadata_ops "" HDF5_HAS_COLL_METADATA_OPS) #Check to see if H5Z_SZIP exists in HDF5_Libraries. If so, we must use szip. - CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Z_SZIP "" USE_SZIP) @@ -62,18 +90,8 @@ index 1ce05e0fe..d1722ded6 100644 + #ENDIF() ENDIF() -+ if(TARGET hdf5::hdf5-shared) -+ set(HDF5_C_LIBRARY_hdf5 hdf5::hdf5-shared) -+ set(HDF5_HL_LIBRARIES hdf5::hdf5_hl-shared) -+ else() -+ set(HDF5_C_LIBRARY_hdf5 hdf5::hdf5-static) -+ set(HDF5_HL_LIBRARIES hdf5::hdf5_hl-static) -+ endif() -+ list(APPEND CMAKE_REQUIRED_LIBRARIES ${HDF5_C_LIBRARY_hdf5}) CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Pset_libver_bounds "" HAVE_H5PSET_LIBVER_BOUNDS) - CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5free_memory "" HAVE_H5FREE_MEMORY) - CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5allocate_memory "" HAVE_H5ALLOCATE_MEMORY) -@@ -764,8 +774,8 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) +@@ -764,8 +776,8 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) ENDIF(USE_HDF5 OR ENABLE_NETCDF_4) # See if we have libcurl @@ -84,7 +102,7 @@ index 1ce05e0fe..d1722ded6 100644 INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS}) # Check to see if CURLOPT_USERNAME is defined. -@@ -1890,7 +1900,7 @@ ENDIF() +@@ -1890,7 +1902,7 @@ ENDIF() STRING(REPLACE ";" " " LINKFLAGS "${LINKFLAGS}") @@ -93,74 +111,74 @@ index 1ce05e0fe..d1722ded6 100644 LIST(REMOVE_DUPLICATES LINKFLAGS) SET(LIBS ${NC_LIBS}) -diff --git a/liblib/CMakeLists.txt b/liblib/CMakeLists.txt -index ea9b02949..ec7851f37 100644 ---- a/liblib/CMakeLists.txt -+++ b/liblib/CMakeLists.txt -@@ -58,7 +58,7 @@ ENDIF() - - SET(TLL_LIBS "") - --SET(TLL_LIBS ${TLL_LIBS} ${HAVE_LIBM} ${ZLIB_LIBRARY}) -+SET(TLL_LIBS ${TLL_LIBS} ${HAVE_LIBM} ZLIB::ZLIB) - - # Add extra dependencies specified via NC_EXTRA_DEPS - SET(TLL_LIBS ${TLL_LIBS} ${EXTRA_DEPS}) -@@ -68,27 +68,15 @@ IF(HAVE_LIBDL) - ENDIF() - - IF(USE_HDF5 OR USE_NETCDF4) -- IF(NOT MSVC) -- # Some version of cmake define HDF5_hdf5_LIBRARY instead of -- # HDF5_LIBRARY. Same with HDF5_HL_LIBRARIES -- IF(HDF5_hdf5_LIBRARY AND NOT HDF5_C_LIBRARIES) -- SET(HDF5_C_LIBRARIES ${HDF5_hdf5_LIBRARY}) -- ENDIF() -- IF(HDF5_hdf5_hl_LIBRARY AND NOT HDF5_HL_LIBRARIES) -- SET(HDF5_HL_LIBRARIES ${HDF5_hdf5_hl_LIBRARY}) -- ENDIF() -- # The order of the libraries is important here for static -- # builds: -- # Make sure that HDF5_C_LIBRARY appears *after* -- # HDF5_HL_LIBRARY. -- SET(TLL_LIBS ${HDF5_HL_LIBRARIES} ${HDF5_C_LIBRARIES} ${TLL_LIBS} ${SZIP_LIBRARY}) -- ELSE() # Windows CMake defines HDF5_LIBRARIES. -- SET(TLL_LIBS ${HDF5_LIBRARIES} ${TLL_LIBS} ${SZIP_LIBRARY}) -- ENDIF() -+ if(TARGET hdf5::hdf5-shared) -+ SET(TLL_LIBS ${TLL_LIBS} hdf5::hdf5-shared hdf5::hdf5_hl-shared) -+ else() -+ SET(TLL_LIBS ${TLL_LIBS} hdf5::hdf5-static hdf5::hdf5_hl-static) -+ endif() - ENDIF() - - IF(USE_DAP) -- SET(TLL_LIBS ${TLL_LIBS} ${CURL_LIBRARY}) -+ SET(TLL_LIBS ${TLL_LIBS} CURL::libcurl) - ENDIF() - - IF(USE_HDF4) -@@ -100,7 +88,7 @@ IF(ENABLE_PNETCDF AND PNETCDF) - ENDIF() - - IF(TLL_LIBS) -- LIST(REMOVE_DUPLICATES TLL_LIBS) -+ #LIST(REMOVE_DUPLICATES TLL_LIBS) - ENDIF() - - TARGET_LINK_LIBRARIES(netcdf ${TLL_LIBS}) -diff --git a/netCDFConfig.cmake.in b/netCDFConfig.cmake.in -index c89cf3e67..b81f35a1b 100644 ---- a/netCDFConfig.cmake.in -+++ b/netCDFConfig.cmake.in -@@ -12,6 +12,10 @@ set_and_check(netCDF_LIB_DIR "@PACKAGE_CMAKE_INSTALL_LIBDIR@") - set(netCDF_LIBRARIES netcdf) - - # include target information -+include(CMakeFindDependencyMacro) -+find_dependency(ZLIB) -+find_dependency(HDF5 CONFIG) -+find_dependency(CURL CONFIG) - include("${CMAKE_CURRENT_LIST_DIR}/netCDFTargets.cmake") - - # Compiling Options +diff --git a/liblib/CMakeLists.txt b/liblib/CMakeLists.txt +index ea9b02949..ec7851f37 100644 +--- a/liblib/CMakeLists.txt ++++ b/liblib/CMakeLists.txt +@@ -58,7 +58,7 @@ ENDIF() + + SET(TLL_LIBS "") + +-SET(TLL_LIBS ${TLL_LIBS} ${HAVE_LIBM} ${ZLIB_LIBRARY}) ++SET(TLL_LIBS ${TLL_LIBS} ${HAVE_LIBM} ZLIB::ZLIB) + + # Add extra dependencies specified via NC_EXTRA_DEPS + SET(TLL_LIBS ${TLL_LIBS} ${EXTRA_DEPS}) +@@ -68,27 +68,15 @@ IF(HAVE_LIBDL) + ENDIF() + + IF(USE_HDF5 OR USE_NETCDF4) +- IF(NOT MSVC) +- # Some version of cmake define HDF5_hdf5_LIBRARY instead of +- # HDF5_LIBRARY. Same with HDF5_HL_LIBRARIES +- IF(HDF5_hdf5_LIBRARY AND NOT HDF5_C_LIBRARIES) +- SET(HDF5_C_LIBRARIES ${HDF5_hdf5_LIBRARY}) +- ENDIF() +- IF(HDF5_hdf5_hl_LIBRARY AND NOT HDF5_HL_LIBRARIES) +- SET(HDF5_HL_LIBRARIES ${HDF5_hdf5_hl_LIBRARY}) +- ENDIF() +- # The order of the libraries is important here for static +- # builds: +- # Make sure that HDF5_C_LIBRARY appears *after* +- # HDF5_HL_LIBRARY. +- SET(TLL_LIBS ${HDF5_HL_LIBRARIES} ${HDF5_C_LIBRARIES} ${TLL_LIBS} ${SZIP_LIBRARY}) +- ELSE() # Windows CMake defines HDF5_LIBRARIES. +- SET(TLL_LIBS ${HDF5_LIBRARIES} ${TLL_LIBS} ${SZIP_LIBRARY}) +- ENDIF() ++ if(TARGET hdf5::hdf5-shared) ++ SET(TLL_LIBS ${TLL_LIBS} hdf5::hdf5-shared hdf5::hdf5_hl-shared) ++ else() ++ SET(TLL_LIBS ${TLL_LIBS} hdf5::hdf5-static hdf5::hdf5_hl-static) ++ endif() + ENDIF() + + IF(USE_DAP) +- SET(TLL_LIBS ${TLL_LIBS} ${CURL_LIBRARY}) ++ SET(TLL_LIBS ${TLL_LIBS} CURL::libcurl) + ENDIF() + + IF(USE_HDF4) +@@ -100,7 +88,7 @@ IF(ENABLE_PNETCDF AND PNETCDF) + ENDIF() + + IF(TLL_LIBS) +- LIST(REMOVE_DUPLICATES TLL_LIBS) ++ #LIST(REMOVE_DUPLICATES TLL_LIBS) + ENDIF() + + TARGET_LINK_LIBRARIES(netcdf ${TLL_LIBS}) +diff --git a/netCDFConfig.cmake.in b/netCDFConfig.cmake.in +index c89cf3e67..b81f35a1b 100644 +--- a/netCDFConfig.cmake.in ++++ b/netCDFConfig.cmake.in +@@ -12,6 +12,10 @@ set_and_check(netCDF_LIB_DIR "@PACKAGE_CMAKE_INSTALL_LIBDIR@") + set(netCDF_LIBRARIES netcdf) + + # include target information ++include(CMakeFindDependencyMacro) ++find_dependency(ZLIB) ++find_dependency(HDF5 CONFIG) ++find_dependency(CURL CONFIG) + include("${CMAKE_CURRENT_LIST_DIR}/netCDFTargets.cmake") + + # Compiling Options From b8f670b5cc2bb658deea844e238be62d09cf3c7e Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 23 Dec 2019 21:19:57 +0100 Subject: [PATCH 152/419] fix dynamic builds --- ports/netcdf-c/use_targets.patch | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ports/netcdf-c/use_targets.patch b/ports/netcdf-c/use_targets.patch index 856837471dc597..76495f45b64fe7 100644 --- a/ports/netcdf-c/use_targets.patch +++ b/ports/netcdf-c/use_targets.patch @@ -48,18 +48,20 @@ index 1ce05e0fe..7671d7b1e 100644 ## # Next, check the HDF5 version. This will inform which # HDF5 variables we need to munge. -@@ -695,6 +695,17 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) +@@ -695,6 +695,19 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) ENDIF() ENDIF(HDF5_C_LIBRARY AND HDF5_HL_LIBRARY AND HDF5_INCLUDE_DIR) + if(TARGET hdf5::hdf5-shared) + set(HDF5_C_LIBRARY hdf5::hdf5-shared) + set(HDF5_C_LIBRARY_hdf5 hdf5::hdf5-shared) -+ set(HDF5_HL_LIBRARIES hdf5::hdf5_hl-shared) ++ set(HDF5_HL_LIBRARIES hdf5::hdf5_hl-shared) ++ ADD_DEFINITIONS(-DH5_BUILT_AS_DYNAMIC_LIB) + else() + set(HDF5_C_LIBRARY hdf5::hdf5-static) + set(HDF5_C_LIBRARY_hdf5 hdf5::hdf5-static) -+ set(HDF5_HL_LIBRARIES hdf5::hdf5_hl-static) ++ set(HDF5_HL_LIBRARIES hdf5::hdf5_hl-static) ++ ADD_DEFINITIONS(-DH5_BUILT_AS_STATIC_LIB) + endif() + list(APPEND CMAKE_REQUIRED_LIBRARIES ${HDF5_C_LIBRARY}) + From 94e4824ccf3ed5333bf69da5151c80500c9b77b6 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 23 Dec 2019 21:20:17 +0100 Subject: [PATCH 153/419] remove code from portfile --- ports/netcdf-c/portfile.cmake | 7 ------- 1 file changed, 7 deletions(-) diff --git a/ports/netcdf-c/portfile.cmake b/ports/netcdf-c/portfile.cmake index 30522e963dd478..61dd1d88571d8d 100644 --- a/ports/netcdf-c/portfile.cmake +++ b/ports/netcdf-c/portfile.cmake @@ -20,13 +20,6 @@ if(VCPKG_CRT_LINKAGE STREQUAL "static") else() set(NC_USE_STATIC_CRT OFF) endif() -#NC_EXTRA_DEPS -find_library(ZLIB_RELEASE NAMES z zlib PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(ZLIB_DEBUG NAMES z zlib zd zlibd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -find_library(SZIP_RELEASE NAMES libsz libszip szip sz PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(SZIP_DEBUG NAMES libsz libszip szip sz libsz_D libszip_D szip_D sz_D szip_debug PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -#find_library(CURL_RELEASE NAMES curl libcurl PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -#find_library(CURL_DEBUG NAMES curl_d libcurl_d curld libcurld curl libcurl PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} From eebfc44dd7ef2799b88b99b6b9d937224e30ab1a Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 26 Dec 2019 00:29:29 +0100 Subject: [PATCH 154/419] fix netcdf-c --- ports/netcdf-c/use_targets.patch | 76 ++++++++++++++++++++------------ ports/vtk/FindNetCDF.patch | 24 ++++++++++ ports/vtk/portfile.cmake | 2 + 3 files changed, 73 insertions(+), 29 deletions(-) create mode 100644 ports/vtk/FindNetCDF.patch diff --git a/ports/netcdf-c/use_targets.patch b/ports/netcdf-c/use_targets.patch index b81fe8183a927e..856837471dc597 100644 --- a/ports/netcdf-c/use_targets.patch +++ b/ports/netcdf-c/use_targets.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1ce05e0fe..d1722ded6 100644 +index 1ce05e0fe..7671d7b1e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -431,7 +431,7 @@ IF(NC_EXTRA_DEPS) @@ -11,6 +11,31 @@ index 1ce05e0fe..d1722ded6 100644 SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${EXTRA_DEPS}) ENDIF() ### +@@ -599,15 +599,15 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) + # we will use a static library. This can be toggled + # by explicitly modifying NC_FIND_SHARED_LIBS. + ## +- IF(NC_FIND_SHARED_LIBS) +- SET(NC_HDF5_LINK_TYPE "shared") +- SET(NC_HDF5_LINK_TYPE_UPPER "SHARED") +- ADD_DEFINITIONS(-DH5_BUILT_AS_DYNAMIC_LIB) +- ELSE(NC_FIND_SHARED_LIBS) +- SET(NC_HDF5_LINK_TYPE "static") +- SET(NC_HDF5_LINK_TYPE_UPPER "STATIC") +- ADD_DEFINITIONS(-DH5_BUILT_AS_STATIC_LIB) +- ENDIF(NC_FIND_SHARED_LIBS) ++ #IF(NC_FIND_SHARED_LIBS) ++ #SET(NC_HDF5_LINK_TYPE "shared") ++ #SET(NC_HDF5_LINK_TYPE_UPPER "SHARED") ++ #ADD_DEFINITIONS(-DH5_BUILT_AS_DYNAMIC_LIB) ++ #ELSE(NC_FIND_SHARED_LIBS) ++ #SET(NC_HDF5_LINK_TYPE "static") ++ #SET(NC_HDF5_LINK_TYPE_UPPER "STATIC") ++ #ADD_DEFINITIONS(-DH5_BUILT_AS_STATIC_LIB) ++ #ENDIF(NC_FIND_SHARED_LIBS) + + ##### + # First, find the C and HL libraries. @@ -620,9 +620,9 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) SET(SEARCH_PACKAGE_NAME ${HDF5_PACKAGE_NAME}) FIND_PACKAGE(HDF5 NAMES ${SEARCH_PACKAGE_NAME} COMPONENTS C HL CONFIG REQUIRED ${NC_HDF5_LINK_TYPE}) @@ -23,23 +48,26 @@ index 1ce05e0fe..d1722ded6 100644 ## # Next, check the HDF5 version. This will inform which # HDF5 variables we need to munge. -@@ -710,7 +710,8 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) - # Use H5Pset_fapl_mpio and H5Pget_fapl_mpio, instead. - # CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Pget_fapl_mpiposix "" HDF5_IS_PARALLEL_MPIPOSIX) +@@ -695,6 +695,17 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) + ENDIF() + ENDIF(HDF5_C_LIBRARY AND HDF5_HL_LIBRARY AND HDF5_INCLUDE_DIR) -- CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Pget_fapl_mpio "" HDF5_IS_PARALLEL_MPIO) -+ #CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Pget_fapl_mpio "" HDF5_IS_PARALLEL_MPIO) -+ set(HDF5_IS_PARALLEL_MPIO ${HDF5_ENABLE_PARALLEL}) - IF(HDF5_IS_PARALLEL_MPIO) - SET(HDF5_PARALLEL ON) - ELSE() -@@ -718,21 +719,30 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) - ENDIF() ++ if(TARGET hdf5::hdf5-shared) ++ set(HDF5_C_LIBRARY hdf5::hdf5-shared) ++ set(HDF5_C_LIBRARY_hdf5 hdf5::hdf5-shared) ++ set(HDF5_HL_LIBRARIES hdf5::hdf5_hl-shared) ++ else() ++ set(HDF5_C_LIBRARY hdf5::hdf5-static) ++ set(HDF5_C_LIBRARY_hdf5 hdf5::hdf5-static) ++ set(HDF5_HL_LIBRARIES hdf5::hdf5_hl-static) ++ endif() ++ list(APPEND CMAKE_REQUIRED_LIBRARIES ${HDF5_C_LIBRARY}) ++ + FIND_PACKAGE(Threads) - #Check to see if HDF5 library has collective metadata APIs, (HDF5 >= 1.10.0) -- CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Pset_all_coll_metadata_ops "" HDF5_HAS_COLL_METADATA_OPS) -+ #CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Pset_all_coll_metadata_ops "" HDF5_HAS_COLL_METADATA_OPS) -+ set(HDF5_HAS_COLL_METADATA_OPS ON) + # There is a missing case in the above code so default it +@@ -721,16 +733,16 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) + CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Pset_all_coll_metadata_ops "" HDF5_HAS_COLL_METADATA_OPS) #Check to see if H5Z_SZIP exists in HDF5_Libraries. If so, we must use szip. - CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Z_SZIP "" USE_SZIP) @@ -62,18 +90,8 @@ index 1ce05e0fe..d1722ded6 100644 + #ENDIF() ENDIF() -+ if(TARGET hdf5::hdf5-shared) -+ set(HDF5_C_LIBRARY_hdf5 hdf5::hdf5-shared) -+ set(HDF5_HL_LIBRARIES hdf5::hdf5_hl-shared) -+ else() -+ set(HDF5_C_LIBRARY_hdf5 hdf5::hdf5-static) -+ set(HDF5_HL_LIBRARIES hdf5::hdf5_hl-static) -+ endif() -+ list(APPEND CMAKE_REQUIRED_LIBRARIES ${HDF5_C_LIBRARY_hdf5}) CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Pset_libver_bounds "" HAVE_H5PSET_LIBVER_BOUNDS) - CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5free_memory "" HAVE_H5FREE_MEMORY) - CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5allocate_memory "" HAVE_H5ALLOCATE_MEMORY) -@@ -764,8 +774,8 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) +@@ -764,8 +776,8 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) ENDIF(USE_HDF5 OR ENABLE_NETCDF_4) # See if we have libcurl @@ -84,7 +102,7 @@ index 1ce05e0fe..d1722ded6 100644 INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS}) # Check to see if CURLOPT_USERNAME is defined. -@@ -1890,7 +1900,7 @@ ENDIF() +@@ -1890,7 +1902,7 @@ ENDIF() STRING(REPLACE ";" " " LINKFLAGS "${LINKFLAGS}") @@ -158,7 +176,7 @@ index c89cf3e67..b81f35a1b 100644 # include target information +include(CMakeFindDependencyMacro) -+find_dependency(ZLIB CONFIG) ++find_dependency(ZLIB) +find_dependency(HDF5 CONFIG) +find_dependency(CURL CONFIG) include("${CMAKE_CURRENT_LIST_DIR}/netCDFTargets.cmake") diff --git a/ports/vtk/FindNetCDF.patch b/ports/vtk/FindNetCDF.patch new file mode 100644 index 00000000000000..2e45a709fd70e8 --- /dev/null +++ b/ports/vtk/FindNetCDF.patch @@ -0,0 +1,24 @@ +diff --git a/CMake/FindNetCDF.cmake b/CMake/FindNetCDF.cmake +index 7e8117cac..926a3bfae 100644 +--- a/CMake/FindNetCDF.cmake ++++ b/CMake/FindNetCDF.cmake +@@ -9,14 +9,17 @@ Provides the following variables: + #]==] + + # Try to find a CMake-built NetCDF. +-find_package(netCDF CONFIG QUIET) ++find_package(netCDF CONFIG REQUIRED) + if (netCDF_FOUND) + # Forward the variables in a consistent way. + set(NetCDF_FOUND "${netCDF_FOUND}") + set(NetCDF_INCLUDE_DIRS "${netCDF_INCLUDE_DIR}") + set(NetCDF_LIBRARIES "${netCDF_LIBRARIES}") + set(NetCDF_VERSION "${NetCDFVersion}") +- if (NOT TARGET NetCDF::NetCDF) ++ if(TARGET netCDF::netcdf) ++ set_target_properties(netCDF::netcdf PROPERTIES IMPORTED_GLOBAL TRUE) ++ add_library(NetCDF::NetCDF ALIAS netCDF::netcdf) ++ elseif (NOT TARGET NetCDF::NetCDF) + add_library(NetCDF::NetCDF INTERFACE IMPORTED) + set_target_properties(NetCDF::NetCDF PROPERTIES + INTERFACE_LINK_LIBRARIES "${NetCDF_LIBRARIES}") diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index a11cdeb00cebe7..f607e42901a483 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -96,10 +96,12 @@ vcpkg_from_github( FindLZMA.patch FindLZ4.patch Findproj.patch + FindNetCDF.patch vtkm.patch # To include an external VTKm build (v.1.3 required) exportalldependinfo.patch # This one is already in master and is seems to be required by paraview to wrap the client server code pythonwrapper.patch # NoUndefDebug.patch + # Last patch TODO: Patch out internal loguru ) From 2cfea508e037e10abd591b9ce5e707275227b2cf Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 26 Dec 2019 00:29:41 +0100 Subject: [PATCH 155/419] fix qt5 linux linkage --- ports/qt5-base/vcpkg-cmake-wrapper.cmake | 32 ++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/ports/qt5-base/vcpkg-cmake-wrapper.cmake b/ports/qt5-base/vcpkg-cmake-wrapper.cmake index 62a47eee4c1a62..9a371357c9160e 100644 --- a/ports/qt5-base/vcpkg-cmake-wrapper.cmake +++ b/ports/qt5-base/vcpkg-cmake-wrapper.cmake @@ -54,10 +54,38 @@ if("${_target_type}" STREQUAL "STATIC_LIBRARY") add_qt_library(Qt5::Core Qt5WindowsUIAutomationSupport qwindows qdirect2d) elseif(UNIX AND NOT APPLE) - add_qt_library(Qt5::Core + add_qt_library(Qt5::Core Qt5GraphicsSupport Qt5ClipboardSupport - Qt5AccessibilitySupport) + Qt5LinuxAccessibilitySupport + Qt5AccessibilitySupport + Qt5ServiceSupport + Qt5FbSupport + Qt5EglSupport + Qt5InputSupport + Qt5DeviceDiscoverySupport + Qt5EdidSupport + Qt5KmsSupport + Qt5GlxSupport + Qt5EglFSDeviceIntegration + Qt5EglFsKmsSupport + Qt5XcbQpa + EGL + fontconfig expat + Qt5Gui + Qt5DBus + Qt5Core) + #find_package(X11 REQUIRED) + set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES + xcb-glx X11-xcb xcb-xinput xcb-icccm xcb-image xcb-shm xcb-keysyms xcb-randr xcb-render-util + xcb-render xcb-shape xcb-sync xcb-xfixes xcb-xinerama xcb-xkb xcb Xrender Xext X11 + m SM ICE mtdev input xkbcommon-x11 xkbcommon dl GL gbm udev + OpenSSL::SSL OpenSSL::Crypto Freetype::Freetype + dbus-1 drm gthread-2.0 glib-2.0 gtk-3 gdk-3 pangocairo-1.0 pango-1.0 atk-1.0 cairo-gobject cairo gdk_pixbuf-2.0 gio-2.0 gobject-2.0 glib-2.0 Xext X11 + ) + #xcb-damage xcb-glx + #${X11_LIBRARIES} Xau Xdmcp + #gthread-2.0 ) elseif(APPLE) set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES "-weak_framework DiskArbitration" "-weak_framework IOKit" "-weak_framework Foundation" "-weak_framework CoreServices" From 22eeafff261f422361cb886b5a0e234e63462ee6 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sun, 29 Dec 2019 00:14:05 +0100 Subject: [PATCH 156/419] update patch for linux --- ports/paraview/qt_static_plugins.patch | 27 ++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/ports/paraview/qt_static_plugins.patch b/ports/paraview/qt_static_plugins.patch index 6e56699e153fb2..f369f091c3689d 100644 --- a/ports/paraview/qt_static_plugins.patch +++ b/ports/paraview/qt_static_plugins.patch @@ -2,12 +2,16 @@ diff --git a/CMake/ParaViewClient.cmake b/CMake/ParaViewClient.cmake index 31beb7e20..d4bb36844 100644 --- a/CMake/ParaViewClient.cmake +++ b/CMake/ParaViewClient.cmake -@@ -263,7 +263,7 @@ IDI_ICON1 ICON \"${_paraview_client_APPLICATION_ICON}\"\n") +@@ -263,7 +263,11 @@ 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(Qt5 REQUIRED QUIET COMPONENTS Core Widgets Svg Network Sql DBus) ++ find_package(Qt5 REQUIRED QUIET COMPONENTS Core Widgets Svg Network Sql DBus OpenGL OpenGLExtensions) ++ if(UNIX) ++ find_package(Qt5 REQUIRED QUIET COMPONENTS X11Extras) ++ list(APPEND qt_additional_libs Qt5::X11Extras) ++ endif() # 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 @@ -17,7 +21,7 @@ index 31beb7e20..d4bb36844 100644 endif () + + if(NOT PARAVIEW_BUILD_SHARED_LIBS) # Should be a check if Qt is built statically and not ParaView -+ list(APPEND qt_components Svg Widgets Gui) # added due to svg rescources, sql due to VTK::GUISupportQtSQL ++ list(APPEND qt_components Svg Widgets Gui OpenGL OpenGLExtensions) # added due to svg rescources, sql due to VTK::GUISupportQtSQL + set(qt_plugin_list) + foreach(qt_component ${qt_components}) + message(STATUS "Qt5${qt_component}_PLUGINS: ${Qt5${qt_component}_PLUGINS}") @@ -49,21 +53,24 @@ index 31beb7e20..d4bb36844 100644 if (DEFINED _paraview_client_NAMESPACE) add_executable("${_paraview_client_NAMESPACE}::${_paraview_client_NAME}" ALIAS "${_paraview_client_NAME}") endif () -@@ -338,9 +362,17 @@ IDI_ICON1 ICON \"${_paraview_client_APPLICATION_ICON}\"\n") +@@ -338,9 +362,20 @@ IDI_ICON1 ICON \"${_paraview_client_APPLICATION_ICON}\"\n") "$") target_link_libraries("${_paraview_client_NAME}" PRIVATE ++ ${qt_plugin_list} ++ Qt5::Svg ## added ++ Qt5::Sql ## added ++ Qt5::Network ## added ++ Qt5::Gui ## added ++ Qt5::OpenGL ++ Qt5::OpenGLExtensions ++ Qt5::DBus ##added ++ ${qt_additional_libs} + Qt5::Core # needed in VCPKG due to the extra Wrapper -+ Qt5::Svg ## added -+ Qt5::Sql ## added -+ Qt5::Network ## added -+ Qt5::Gui ## added -+ Qt5::DBus ##added Qt5::Widgets ParaView::pqApplicationComponents - VTK::vtksys) + VTK::vtksys -+ ${qt_plugin_list} + ) if (DEFINED _paraview_client_PLUGINS_TARGET) From f30f89a98c2ec2b2d6781dca24506602ee179805 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 31 Dec 2019 21:19:34 +0100 Subject: [PATCH 157/419] remove commenting from patch and simply delete the lines --- ports/netcdf-c/use_targets.patch | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/ports/netcdf-c/use_targets.patch b/ports/netcdf-c/use_targets.patch index 76495f45b64fe7..99e50dc9d06d0b 100644 --- a/ports/netcdf-c/use_targets.patch +++ b/ports/netcdf-c/use_targets.patch @@ -2,16 +2,15 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 1ce05e0fe..7671d7b1e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -431,7 +431,7 @@ IF(NC_EXTRA_DEPS) +@@ -431,7 +431,6 @@ IF(NC_EXTRA_DEPS) SET(EXTRA_DEPS ${EXTRA_DEPS} "${${_LIB}_DEP}") ENDFOREACH() MESSAGE("Extra deps: ${EXTRA_DEPS}") - LIST(REMOVE_DUPLICATES EXTRA_DEPS) -+ #LIST(REMOVE_DUPLICATES EXTRA_DEPS) SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${EXTRA_DEPS}) ENDIF() ### -@@ -599,15 +599,15 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) +@@ -599,15 +599,6 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) # we will use a static library. This can be toggled # by explicitly modifying NC_FIND_SHARED_LIBS. ## @@ -24,15 +23,6 @@ index 1ce05e0fe..7671d7b1e 100644 - SET(NC_HDF5_LINK_TYPE_UPPER "STATIC") - ADD_DEFINITIONS(-DH5_BUILT_AS_STATIC_LIB) - ENDIF(NC_FIND_SHARED_LIBS) -+ #IF(NC_FIND_SHARED_LIBS) -+ #SET(NC_HDF5_LINK_TYPE "shared") -+ #SET(NC_HDF5_LINK_TYPE_UPPER "SHARED") -+ #ADD_DEFINITIONS(-DH5_BUILT_AS_DYNAMIC_LIB) -+ #ELSE(NC_FIND_SHARED_LIBS) -+ #SET(NC_HDF5_LINK_TYPE "static") -+ #SET(NC_HDF5_LINK_TYPE_UPPER "STATIC") -+ #ADD_DEFINITIONS(-DH5_BUILT_AS_STATIC_LIB) -+ #ENDIF(NC_FIND_SHARED_LIBS) ##### # First, find the C and HL libraries. @@ -68,12 +58,11 @@ index 1ce05e0fe..7671d7b1e 100644 FIND_PACKAGE(Threads) # There is a missing case in the above code so default it -@@ -721,16 +733,16 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) +@@ -721,16 +733,11 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Pset_all_coll_metadata_ops "" HDF5_HAS_COLL_METADATA_OPS) #Check to see if H5Z_SZIP exists in HDF5_Libraries. If so, we must use szip. - CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Z_SZIP "" USE_SZIP) -+ #CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Z_SZIP "" USE_SZIP) + set(USE_SZIP ${HDF5_ENABLE_SZIP_SUPPORT}) IF(USE_SZIP) - FIND_LIBRARY(SZIP NAMES szip sz) @@ -86,30 +75,24 @@ index 1ce05e0fe..7671d7b1e 100644 - ELSE() - MESSAGE(FATAL_ERROR "HDF5 Requires SZIP, but cannot find libszip or libsz.") - ENDIF() -+ #SET(SZIP_LIBRARY ${SZIP}) -+ #ELSE() -+ # MESSAGE(FATAL_ERROR "HDF5 Requires SZIP, but cannot find libszip or libsz.") -+ #ENDIF() ENDIF() CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Pset_libver_bounds "" HAVE_H5PSET_LIBVER_BOUNDS) -@@ -764,8 +776,8 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) +@@ -764,8 +776,7 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) ENDIF(USE_HDF5 OR ENABLE_NETCDF_4) # See if we have libcurl -FIND_PACKAGE(CURL) -ADD_DEFINITIONS(-DCURL_STATICLIB=1) +FIND_PACKAGE(CURL CONFIG) -+#ADD_DEFINITIONS(-DCURL_STATICLIB=1) INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS}) # Check to see if CURLOPT_USERNAME is defined. -@@ -1890,7 +1902,7 @@ ENDIF() +@@ -1890,7 +1902,6 @@ ENDIF() STRING(REPLACE ";" " " LINKFLAGS "${LINKFLAGS}") -LIST(REMOVE_DUPLICATES NC_LIBS) -+#LIST(REMOVE_DUPLICATES NC_LIBS) LIST(REMOVE_DUPLICATES LINKFLAGS) SET(LIBS ${NC_LIBS}) @@ -160,12 +143,11 @@ index ea9b02949..ec7851f37 100644 ENDIF() IF(USE_HDF4) -@@ -100,7 +88,7 @@ IF(ENABLE_PNETCDF AND PNETCDF) +@@ -100,7 +88,6 @@ IF(ENABLE_PNETCDF AND PNETCDF) ENDIF() IF(TLL_LIBS) - LIST(REMOVE_DUPLICATES TLL_LIBS) -+ #LIST(REMOVE_DUPLICATES TLL_LIBS) ENDIF() TARGET_LINK_LIBRARIES(netcdf ${TLL_LIBS}) From f19e368f1006570a929a015593c30e0a5637ef56 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 11 Jan 2020 20:47:36 +0100 Subject: [PATCH 158/419] copy qtminimal plugin to tools --- ports/qt5-xmlpatterns/CONTROL | 2 +- ports/qt5-xmlpatterns/portfile.cmake | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ports/qt5-xmlpatterns/CONTROL b/ports/qt5-xmlpatterns/CONTROL index 6e7b3d711a3093..15a67649806f77 100644 --- a/ports/qt5-xmlpatterns/CONTROL +++ b/ports/qt5-xmlpatterns/CONTROL @@ -1,4 +1,4 @@ Source: qt5-xmlpatterns -Version: 5.12.5 +Version: 5.12.5-1 Description: Qt5 XML Patterns Module - Support for XPath, XQuery, XSLT and XML schema validation Build-Depends: qt5-base, qt5-declarative diff --git a/ports/qt5-xmlpatterns/portfile.cmake b/ports/qt5-xmlpatterns/portfile.cmake index 214726759f3cf1..fdbfa8d8ef3f13 100644 --- a/ports/qt5-xmlpatterns/portfile.cmake +++ b/ports/qt5-xmlpatterns/portfile.cmake @@ -1,2 +1,5 @@ include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) -qt_submodule_installation() \ No newline at end of file +qt_submodule_installation() +if(EXISTS "${CURRENT_INSTALLED_DIR}/plugins/platforms/qminimal${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}") + file(INSTALL "${CURRENT_INSTALLED_DIR}/plugins/platforms/qminimal${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/plugins/platforms") +endif() \ No newline at end of file From 98eb8acf979a1c4d4bd328e205d4031db98e0140 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 11 Jan 2020 20:48:07 +0100 Subject: [PATCH 159/419] add opengles3 option for testing --- ports/qt5-base/portfile.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 42ab6c79243c08..a450a4a956f558 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -68,6 +68,8 @@ set(CORE_OPTIONS #-optimized-tools #-force-debug-info #-verbose + #-list-features + #-list-libraries ) ## 3rd Party Libs @@ -136,7 +138,7 @@ if(VCPKG_TARGET_IS_WINDOWS) list(APPEND CORE_OPTIONS -appstore-compliant) endif() if(NOT ${VCPKG_LIBRARY_LINKAGE} STREQUAL "static") - list(APPEND CORE_OPTIONS -opengl dynamic) # other options are "-no-opengl", "-opengl angle", and "-opengl desktop" and "-opengel es2" + list(APPEND CORE_OPTIONS -opengl dynamic -opengles3) # other options are "-no-opengl", "-opengl angle", and "-opengl desktop" and "-opengel es2" else() list(APPEND CORE_OPTIONS -opengl dynamic) # other possible option without moving angle dlls: "-opengl desktop". "-opengel es2" only works with commented patch endif() From 6e7c510fb6e80b6a2d507be65a4f60af8545d095 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 15 Jan 2020 23:02:55 +0100 Subject: [PATCH 160/419] [qt5-imageformats] freeglut is not a dependency on osx --- ports/qt5-imageformats/CONTROL | 2 +- ports/qt5-imageformats/portfile.cmake | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ports/qt5-imageformats/CONTROL b/ports/qt5-imageformats/CONTROL index 24108f974215b8..20ee53538f67e6 100644 --- a/ports/qt5-imageformats/CONTROL +++ b/ports/qt5-imageformats/CONTROL @@ -1,4 +1,4 @@ Source: qt5-imageformats -Version: 5.12.5-2 +Version: 5.12.5-3 Description: Qt5 Image Formats Module - Plugins for additional image formats: TIFF, MNG, TGA, WBMP Build-Depends: qt5-base, tiff, libwebp, jasper diff --git a/ports/qt5-imageformats/portfile.cmake b/ports/qt5-imageformats/portfile.cmake index f7ce7466e4c4a9..dbea7fd9e45c1e 100644 --- a/ports/qt5-imageformats/portfile.cmake +++ b/ports/qt5-imageformats/portfile.cmake @@ -14,8 +14,10 @@ find_library(TIFF_DEBUG NAMES tiffd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" N find_library(JASPER_RELEASE NAMES jasper PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(JASPER_DEBUG NAMES jasperd jasper libjasperd libjasper PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -find_library(FREEGLUT_RELEASE NAMES freeglut glut PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(FREEGLUT_DEBUG NAMES freeglutd freeglut glutd glut PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +if(NOT VCPKG_TARGET_IS_OSX) + find_library(FREEGLUT_RELEASE NAMES freeglut glut PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) + find_library(FREEGLUT_DEBUG NAMES freeglutd freeglut glutd glut PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +endif() find_library(WEBP_RELEASE NAMES webp PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(WEBP_DEBUG NAMES webpd webp PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) From a6265b83f944f2865fa7f49a936ef391558bfbda Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 15 Jan 2020 23:03:45 +0100 Subject: [PATCH 161/419] [qt5-base] fontconfig can require iconv on linux and osx --- ports/qt5-base/CONTROL | 2 +- ports/qt5-base/portfile.cmake | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL index ac926522b578fb..c6512c1b23e57b 100644 --- a/ports/qt5-base/CONTROL +++ b/ports/qt5-base/CONTROL @@ -1,5 +1,5 @@ Source: qt5-base -Version: 5.12.5-8 +Version: 5.12.5-9 Homepage: https://www.qt.io/ Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components. Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl, angle (!windows), egl-registry, icu (!uwp), fontconfig (!windows) diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 443d462e11d01c..49cf24d450d0f6 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -197,14 +197,14 @@ elseif(VCPKG_TARGET_IS_LINUX) "SQLITE_LIBS=${SQLITE_RELEASE} -ldl -lpthread" "HARFBUZZ_LIBS=${HARFBUZZ_RELEASE}" "OPENSSL_LIBS=${SSL_RELEASE} ${EAY_RELEASE} -ldl -lpthread" - "FONTCONFIG_LIBS=${FONTCONFIG_RELEASE} ${FREETYPE_RELEASE} ${EXPAT_RELEASE}" + "FONTCONFIG_LIBS=${FONTCONFIG_RELEASE} ${FREETYPE_RELEASE} ${EXPAT_RELEASE} -liconv" ) list(APPEND DEBUG_OPTIONS "PSQL_LIBS=${PSQL_DEBUG} ${SSL_DEBUG} ${EAY_DEBUG} -ldl -lpthread" "SQLITE_LIBS=${SQLITE_DEBUG} -ldl -lpthread" "HARFBUZZ_LIBS=${HARFBUZZ_DEBUG}" "OPENSSL_LIBS=${SSL_DEBUG} ${EAY_DEBUG} -ldl -lpthread" - "FONTCONFIG_LIBS=${FONTCONFIG_DEBUG} ${FREETYPE_DEBUG} ${EXPAT_DEBUG}" + "FONTCONFIG_LIBS=${FONTCONFIG_DEBUG} ${FREETYPE_DEBUG} ${EXPAT_DEBUG} -liconv" ) elseif(VCPKG_TARGET_IS_OSX) list(APPEND CORE_OPTIONS -fontconfig) @@ -235,14 +235,14 @@ elseif(VCPKG_TARGET_IS_OSX) "SQLITE_LIBS=${SQLITE_RELEASE} -ldl -lpthread" "HARFBUZZ_LIBS=${HARFBUZZ_RELEASE} -framework ApplicationServices" "OPENSSL_LIBS=${SSL_RELEASE} ${EAY_RELEASE} -ldl -lpthread" - "FONTCONFIG_LIBS=${FONTCONFIG_RELEASE} ${FREETYPE_RELEASE} ${EXPAT_RELEASE}" + "FONTCONFIG_LIBS=${FONTCONFIG_RELEASE} ${FREETYPE_RELEASE} ${EXPAT_RELEASE} -liconv" ) list(APPEND DEBUG_OPTIONS "PSQL_LIBS=${PSQL_DEBUG} ${SSL_DEBUG} ${EAY_DEBUG} -ldl -lpthread" "SQLITE_LIBS=${SQLITE_DEBUG} -ldl -lpthread" "HARFBUZZ_LIBS=${HARFBUZZ_DEBUG} -framework ApplicationServices" "OPENSSL_LIBS=${SSL_DEBUG} ${EAY_DEBUG} -ldl -lpthread" - "FONTCONFIG_LIBS=${FONTCONFIG_DEBUG} ${FREETYPE_DEBUG} ${EXPAT_DEBUG}" + "FONTCONFIG_LIBS=${FONTCONFIG_DEBUG} ${FREETYPE_DEBUG} ${EXPAT_DEBUG} -liconv" ) endif() From e99b62623fd8d0cad06f98dbfe70bb2120957607 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 15 Jan 2020 23:16:42 +0100 Subject: [PATCH 162/419] include the jasper fix to get CI coverage? --- ports/jasper/CONTROL | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/jasper/CONTROL b/ports/jasper/CONTROL index 43c657dd4cd95d..df701a0526a476 100644 --- a/ports/jasper/CONTROL +++ b/ports/jasper/CONTROL @@ -1,5 +1,5 @@ Source: jasper -Version: 2.0.16-2 +Version: 2.0.16-3 Homepage: https://github.com/mdadams/jasper Description: Open source implementation of the JPEG-2000 Part-1 standard -Build-Depends: libjpeg-turbo, opengl, freeglut +Build-Depends: libjpeg-turbo, opengl, freeglut (!osx) From 8b9b188839ec90c25b54b49d17cf03c50987a49b Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 15 Jan 2020 23:30:46 +0100 Subject: [PATCH 163/419] trying to get ci coverage for qt on osx --- ports/harfbuzz/CONTROL | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/harfbuzz/CONTROL b/ports/harfbuzz/CONTROL index 8952d04d4b903f..8608dc0df79ee6 100644 --- a/ports/harfbuzz/CONTROL +++ b/ports/harfbuzz/CONTROL @@ -1,5 +1,5 @@ Source: harfbuzz -Version: 2.5.3 +Version: 2.5.3-1 Description: HarfBuzz OpenType text shaping engine Homepage: https://github.com/behdad/harfbuzz Build-Depends: freetype, ragel, gettext (osx) @@ -17,5 +17,5 @@ Feature: ucdn Description: Builtin (UCDN) Unicode callbacks support Feature: glib -Build-Depends: glib +Build-Depends: glib (!osx) Description: Glib Unicode callbacks support From 56b493fe1cfe55561293be5d8cc62ddd6df7043f Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 15 Jan 2020 23:34:46 +0100 Subject: [PATCH 164/419] Revert "trying to get ci coverage for qt on osx" This reverts commit 8b9b188839ec90c25b54b49d17cf03c50987a49b. --- ports/harfbuzz/CONTROL | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/harfbuzz/CONTROL b/ports/harfbuzz/CONTROL index 8608dc0df79ee6..8952d04d4b903f 100644 --- a/ports/harfbuzz/CONTROL +++ b/ports/harfbuzz/CONTROL @@ -1,5 +1,5 @@ Source: harfbuzz -Version: 2.5.3-1 +Version: 2.5.3 Description: HarfBuzz OpenType text shaping engine Homepage: https://github.com/behdad/harfbuzz Build-Depends: freetype, ragel, gettext (osx) @@ -17,5 +17,5 @@ Feature: ucdn Description: Builtin (UCDN) Unicode callbacks support Feature: glib -Build-Depends: glib (!osx) +Build-Depends: glib Description: Glib Unicode callbacks support From 7058612c4d8fdd5fbfcf35e5cc4fee8cda84c849 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 15 Jan 2020 23:38:05 +0100 Subject: [PATCH 165/419] apply the correct ci hack --- ports/pango/CONTROL | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/pango/CONTROL b/ports/pango/CONTROL index 62220dbefff8e3..72b2aaa1070830 100644 --- a/ports/pango/CONTROL +++ b/ports/pango/CONTROL @@ -1,5 +1,5 @@ Source: pango -Version: 1.40.11-5 +Version: 1.40.11-6 Homepage: https://ftp.gnome.org/pub/GNOME/sources/pango/ Description: Text and font handling library. -Build-Depends: glib, gettext, cairo, fontconfig, freetype, harfbuzz[glib] (!(windows&static)) +Build-Depends: glib, gettext, cairo, fontconfig, freetype, harfbuzz[glib] (!(windows&static)&!osx) From bf12fef4f45c5847967ff95a600b9d0fe4ceca32 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 16 Jan 2020 08:50:43 +0100 Subject: [PATCH 166/419] fix wrapper to include macosx debug suffix --- ports/qt5-base/vcpkg-cmake-wrapper.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/qt5-base/vcpkg-cmake-wrapper.cmake b/ports/qt5-base/vcpkg-cmake-wrapper.cmake index 1f048e3272a1ba..3e22f087c111bf 100644 --- a/ports/qt5-base/vcpkg-cmake-wrapper.cmake +++ b/ports/qt5-base/vcpkg-cmake-wrapper.cmake @@ -3,7 +3,7 @@ _find_package(${ARGS}) function(add_qt_library _target) foreach(_lib IN LISTS ARGN) #The fact that we are within this file means we are using the VCPKG toolchain. Has such we only need to search in VCPKG paths! - find_library(${_lib}_LIBRARY_DEBUG NAMES ${_lib}d ${_lib} NAMES_PER_DIR PATH_SUFFIXES lib plugins/platforms PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH) + find_library(${_lib}_LIBRARY_DEBUG NAMES ${_lib}_debug ${_lib}d ${_lib} NAMES_PER_DIR PATH_SUFFIXES lib plugins/platforms PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH) find_library(${_lib}_LIBRARY_RELEASE NAMES ${_lib} NAMES_PER_DIR PATH_SUFFIXES lib plugins/platforms PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH) if(${_lib}_LIBRARY_RELEASE) list(APPEND interface_lib \$<\$>:${${_lib}_LIBRARY_RELEASE}>) From 486580c9883ad47cbb5cc87911d61de1fd7d7122 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 16 Jan 2020 08:50:52 +0100 Subject: [PATCH 167/419] update baseline --- scripts/ci.baseline.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 2067b29838f355..5e90c7f37ebe1e 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -467,7 +467,6 @@ freeglut:arm64-windows=fail freeglut:arm-uwp=fail freeglut:x64-uwp=fail freeglut:x64-osx=fail -freeimage:x64-osx=fail freerdp:arm64-windows=fail freerdp:arm-uwp=fail freerdp:x64-osx=fail @@ -1401,7 +1400,6 @@ python3:x64-uwp=fail qca:x64-linux=fail qca:x64-osx=fail qca:x64-windows-static=fail -qcustomplot:x64-osx=fail qhull:arm-uwp=ignore qhull:x64-windows-static=ignore qhull:x64-uwp=ignore @@ -1409,7 +1407,6 @@ qpid-proton:arm-uwp=fail qpid-proton:x64-uwp=fail qpid-proton:x64-windows-static=fail qscintilla:x64-linux=fail -qscintilla:x64-osx=fail qt5-activeqt:x64-linux=fail qt5-activeqt:x64-osx=fail qt5-macextras:x64-linux=fail From 1a744c9304bcc2cdee1a702f983f28c7c05a3f20 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 16 Jan 2020 09:29:16 +0100 Subject: [PATCH 168/419] first try to fix the Qt5 cmake configs at the root. --- ports/qt5-base/fixcmake.py | 76 ++++++++++---------- ports/qt5-base/patches/Qt5BasicConfig.patch | 76 ++++++++++++++++++++ ports/qt5-base/patches/Qt5PluginTarget.patch | 22 ++++++ ports/qt5-base/portfile.cmake | 3 + 4 files changed, 139 insertions(+), 38 deletions(-) create mode 100644 ports/qt5-base/patches/Qt5BasicConfig.patch create mode 100644 ports/qt5-base/patches/Qt5PluginTarget.patch diff --git a/ports/qt5-base/fixcmake.py b/ports/qt5-base/fixcmake.py index 6f677327c1ca4d..31315560716a0f 100644 --- a/ports/qt5-base/fixcmake.py +++ b/ports/qt5-base/fixcmake.py @@ -13,13 +13,13 @@ for f in files: openedfile = open(f, "r") builder = "" - dllpatterndebug = re.compile("_install_prefix}/bin/Qt5.*d+(.dll|.so)") - libpatterndebug = re.compile("_install_prefix}/lib/Qt5.*d+(.lib|.a)") + # dllpatterndebug = re.compile("_install_prefix}/bin/Qt5.*d+(.dll|.so)") + # libpatterndebug = re.compile("_install_prefix}/lib/Qt5.*d+(.lib|.a)") exepattern = re.compile("_install_prefix}/bin/[a-z]+(.exe|)") toolexepattern = re.compile("_install_prefix}/tools/qt5/bin/[a-z]+(.exe|)") tooldllpattern = re.compile("_install_prefix}/tools/qt5/bin/Qt5.*d+(.dll|.so)") - populatepluginpattern = re.compile("_populate_[^_]+_plugin_properties\([^ ]+ RELEASE") - populatetargetpattern = re.compile("_populate_[^_]+_target_properties\(RELEASE ") + # populatepluginpattern = re.compile("_populate_[^_]+_plugin_properties\([^ ]+ RELEASE") + # populatetargetpattern = re.compile("_populate_[^_]+_target_properties\(RELEASE ") for line in openedfile: if "_install_prefix}/tools/qt5/${LIB_LOCATION}" in line: builder += " if (${Configuration} STREQUAL \"RELEASE\")" @@ -30,30 +30,30 @@ #TODO: Make single configuration builds of Qt work correctly! builder += "\n " + line.replace("/tools/qt5/debug/bin", "/debug/bin/") builder += " endif()\n" - elif "_install_prefix}/bin/${LIB_LOCATION}" in line: - builder += " if (${Configuration} STREQUAL \"RELEASE\")" - builder += "\n " + line - builder += " else()" #This requires a release and debug build! - builder += "\n " + line.replace("/bin/", "/debug/bin/") - builder += " endif()\n" - elif "_install_prefix}/lib/${LIB_LOCATION}" in line: - builder += " if (${Configuration} STREQUAL \"RELEASE\")" - builder += "\n " + line - builder += " else()" #This requires a release and debug build! - builder += "\n " + line.replace("/lib/", "/debug/lib/") - builder += " endif()\n" - elif "_install_prefix}/lib/${IMPLIB_LOCATION}" in line: - builder += " if (${Configuration} STREQUAL \"RELEASE\")" - builder += "\n " + line - builder += " else()" #This requires a release and debug build! - builder += "\n " + line.replace("/lib/", "/debug/lib/") - builder += " endif()\n" - elif "_install_prefix}/plugins/${PLUGIN_LOCATION}" in line: - builder += " if (${Configuration} STREQUAL \"RELEASE\")" - builder += "\n " + line - builder += " else()" #This requires a release and debug build! - builder += "\n " + line.replace("/plugins/", "/debug/plugins/") - builder += " endif()\n" + # elif "_install_prefix}/bin/${LIB_LOCATION}" in line: + # builder += " if (${Configuration} STREQUAL \"RELEASE\")" + # builder += "\n " + line + # builder += " else()" #This requires a release and debug build! + # builder += "\n " + line.replace("/bin/", "/debug/bin/") + # builder += " endif()\n" + # elif "_install_prefix}/lib/${LIB_LOCATION}" in line: + # builder += " if (${Configuration} STREQUAL \"RELEASE\")" + # builder += "\n " + line + # builder += " else()" #This requires a release and debug build! + # builder += "\n " + line.replace("/lib/", "/debug/lib/") + # builder += " endif()\n" + # elif "_install_prefix}/lib/${IMPLIB_LOCATION}" in line: + # builder += " if (${Configuration} STREQUAL \"RELEASE\")" + # builder += "\n " + line + # builder += " else()" #This requires a release and debug build! + # builder += "\n " + line.replace("/lib/", "/debug/lib/") + # builder += " endif()\n" + # elif "_install_prefix}/plugins/${PLUGIN_LOCATION}" in line: + # builder += " if (${Configuration} STREQUAL \"RELEASE\")" + # builder += "\n " + line + # builder += " else()" #This requires a release and debug build! + # builder += "\n " + line.replace("/plugins/", "/debug/plugins/") + # builder += " endif()\n" elif "_install_prefix}/lib/qtmaind.lib" in line: # qtmaind.lib has been moved to manual-link: builder += line.replace("/lib/", "/debug/lib/manual-link/") @@ -65,16 +65,16 @@ builder += " set_target_properties(Qt5::WinMain PROPERTIES\n" builder += " IMPORTED_LOCATION_DEBUG ${imported_location_debug}\n" builder += " )\n" - elif populatepluginpattern.search(line) != None: - builder += line - builder += line.replace("RELEASE", "DEBUG").replace(".dll", "d.dll").replace(".lib", "d.lib") - elif populatetargetpattern.search(line) != None: - builder += line - builder += line.replace("RELEASE", "DEBUG").replace(".dll", "d.dll").replace(".lib", "d.lib") - elif dllpatterndebug.search(line) != None: - builder += line.replace("/bin/", "/debug/bin/") - elif libpatterndebug.search(line) != None: - builder += line.replace("/lib/", "/debug/lib/") + # elif populatepluginpattern.search(line) != None: + # builder += line + # builder += line.replace("RELEASE", "DEBUG").replace(".dll", "d.dll").replace(".lib", "d.lib") + # elif populatetargetpattern.search(line) != None: + # builder += line + # builder += line.replace("RELEASE", "DEBUG").replace(".dll", "d.dll").replace(".lib", "d.lib") + # elif dllpatterndebug.search(line) != None: + # builder += line.replace("/bin/", "/debug/bin/") + # elif libpatterndebug.search(line) != None: + # builder += line.replace("/lib/", "/debug/lib/") elif tooldllpattern.search(line) != None: builder += line.replace("/tools/qt5/bin", "/debug/bin/") elif exepattern.search(line) != None: diff --git a/ports/qt5-base/patches/Qt5BasicConfig.patch b/ports/qt5-base/patches/Qt5BasicConfig.patch new file mode 100644 index 00000000000000..b7b0459d13f5c5 --- /dev/null +++ b/ports/qt5-base/patches/Qt5BasicConfig.patch @@ -0,0 +1,76 @@ +diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +index c72989288..a88234dca 100644 +--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in ++++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +@@ -53,7 +53,11 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI + set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) + + !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") ++ if(${Configuration} STREQUAL \"DEBUG\") ++ set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") ++ else() ++ set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") ++ endif() + !!ELSE + set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") + !!ENDIF +@@ -69,8 +73,12 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI + ) + + !!IF !isEmpty(CMAKE_WINDOWS_BUILD) +-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") ++!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) ++ if(${Configuration} STREQUAL \"DEBUG\") ++ set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") ++ else() ++ set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") ++ endif() + !!ELSE + set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") + !!ENDIF +@@ -270,7 +278,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD + + !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) +-!!IF isEmpty(CMAKE_DEBUG_TYPE) + !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) + if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) +@@ -281,20 +288,19 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + !!ELSE // CMAKE_STATIC_WINDOWS_BUILD + if (EXISTS + !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" ++ \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" + !!ELSE + \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" + !!ENDIF + AND EXISTS + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) ++ \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) + !!ELSE + \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) + !!ENDIF + _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) + !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD + endif() +-!!ENDIF // CMAKE_DEBUG_TYPE + !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD + + !!ENDIF // CMAKE_RELEASE_TYPE +@@ -347,7 +353,12 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) + + !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE) ++ if(${Configuration} STREQUAL \"DEBUG\") ++ set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") ++ else() + set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") ++ endif() ++ + !!ELSE + set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") + !!ENDIF diff --git a/ports/qt5-base/patches/Qt5PluginTarget.patch b/ports/qt5-base/patches/Qt5PluginTarget.patch new file mode 100644 index 00000000000000..4ad10f29677148 --- /dev/null +++ b/ports/qt5-base/patches/Qt5PluginTarget.patch @@ -0,0 +1,22 @@ +diff --git a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in +index 5baf0fdb1..185abfffd 100644 +--- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in ++++ b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in +@@ -1,11 +1,11 @@ + + add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED) + +-!!IF !isEmpty(CMAKE_RELEASE_TYPE) +-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\") +-!!ENDIF +-!!IF !isEmpty(CMAKE_DEBUG_TYPE) +-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\") +-!!ENDIF ++if(EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\$${CMAKE_PLUGIN_LOCATION_RELEASE}") ++ _populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\") ++endif() ++if(EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\$${CMAKE_PLUGIN_LOCATION_DEBUG}") ++ _populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\") ++endif() + + list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME) diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 49cf24d450d0f6..8d6f79f2900070 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -42,6 +42,9 @@ qt_download_submodule( OUT_SOURCE_PATH SOURCE_PATH #patches/static_opengl.patch #Use this patch if you really want to statically link angle on windows (e.g. using -opengl es2 and -static). #Be carefull since it requires definining _GDI32_ for all dependent projects due to redefinition errors in the #the windows supplied gl.h header and the angle gl.h otherwise. + #CMake fixes + patches/Qt5BasicConfig.patch + patches/Qt5PluginTarget.patch ) # Remove vendored dependencies to ensure they are not picked up by the build From baaa467bcb18aeb010c2390df3114a9da053ec1e Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 16 Jan 2020 11:20:31 +0100 Subject: [PATCH 169/419] fix missing backslash --- ports/qt5-base/patches/Qt5PluginTarget.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/qt5-base/patches/Qt5PluginTarget.patch b/ports/qt5-base/patches/Qt5PluginTarget.patch index 4ad10f29677148..597ec41709b149 100644 --- a/ports/qt5-base/patches/Qt5PluginTarget.patch +++ b/ports/qt5-base/patches/Qt5PluginTarget.patch @@ -12,10 +12,10 @@ index 5baf0fdb1..185abfffd 100644 -!!IF !isEmpty(CMAKE_DEBUG_TYPE) -_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\") -!!ENDIF -+if(EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\$${CMAKE_PLUGIN_LOCATION_RELEASE}") ++if(EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\$${CMAKE_PLUGIN_LOCATION_RELEASE}\") + _populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\") +endif() -+if(EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\$${CMAKE_PLUGIN_LOCATION_DEBUG}") ++if(EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\$${CMAKE_PLUGIN_LOCATION_DEBUG}\") + _populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\") +endif() From 65531c3a782b83714536744208732a5a9fe89bbf Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 16 Jan 2020 11:35:19 +0100 Subject: [PATCH 170/419] fix plugin patch --- ports/qt5-base/patches/Qt5PluginTarget.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/qt5-base/patches/Qt5PluginTarget.patch b/ports/qt5-base/patches/Qt5PluginTarget.patch index 597ec41709b149..0ae0a03c0aa76a 100644 --- a/ports/qt5-base/patches/Qt5PluginTarget.patch +++ b/ports/qt5-base/patches/Qt5PluginTarget.patch @@ -12,10 +12,10 @@ index 5baf0fdb1..185abfffd 100644 -!!IF !isEmpty(CMAKE_DEBUG_TYPE) -_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\") -!!ENDIF -+if(EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\$${CMAKE_PLUGIN_LOCATION_RELEASE}\") ++if(EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_RELEASE}\") + _populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\") +endif() -+if(EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\$${CMAKE_PLUGIN_LOCATION_DEBUG}\") ++if(EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_DEBUG}\") + _populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\") +endif() From 0c3767c8f8ba0ba8a8dfce23226fd3e198fb7f29 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 16 Jan 2020 14:07:36 +0100 Subject: [PATCH 171/419] fix qt config patch --- ports/qt5-base/patches/Qt5BasicConfig.patch | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ports/qt5-base/patches/Qt5BasicConfig.patch b/ports/qt5-base/patches/Qt5BasicConfig.patch index b7b0459d13f5c5..6d68036cbb5adf 100644 --- a/ports/qt5-base/patches/Qt5BasicConfig.patch +++ b/ports/qt5-base/patches/Qt5BasicConfig.patch @@ -19,9 +19,8 @@ index c72989288..a88234dca 100644 ) !!IF !isEmpty(CMAKE_WINDOWS_BUILD) --!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) - set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") -+!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) + if(${Configuration} STREQUAL \"DEBUG\") + set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") + else() @@ -30,14 +29,17 @@ index c72989288..a88234dca 100644 !!ELSE set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") !!ENDIF -@@ -270,7 +278,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -270,9 +278,8 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) -!!IF isEmpty(CMAKE_DEBUG_TYPE) !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) - if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) +- if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) ++ if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) + !!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE + if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) @@ -281,20 +288,19 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!ELSE // CMAKE_STATIC_WINDOWS_BUILD if (EXISTS From 795acd05bcc989072e6909181ba34617d36c575a Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 16 Jan 2020 14:08:00 +0100 Subject: [PATCH 172/419] remove 90% of fixcmake.py --- ports/qt5-base/fixcmake.py | 70 +++++--------------------------------- 1 file changed, 9 insertions(+), 61 deletions(-) diff --git a/ports/qt5-base/fixcmake.py b/ports/qt5-base/fixcmake.py index 31315560716a0f..e49c51c516b4c3 100644 --- a/ports/qt5-base/fixcmake.py +++ b/ports/qt5-base/fixcmake.py @@ -13,73 +13,21 @@ for f in files: openedfile = open(f, "r") builder = "" - # dllpatterndebug = re.compile("_install_prefix}/bin/Qt5.*d+(.dll|.so)") - # libpatterndebug = re.compile("_install_prefix}/lib/Qt5.*d+(.lib|.a)") - exepattern = re.compile("_install_prefix}/bin/[a-z]+(.exe|)") toolexepattern = re.compile("_install_prefix}/tools/qt5/bin/[a-z]+(.exe|)") - tooldllpattern = re.compile("_install_prefix}/tools/qt5/bin/Qt5.*d+(.dll|.so)") - # populatepluginpattern = re.compile("_populate_[^_]+_plugin_properties\([^ ]+ RELEASE") - # populatetargetpattern = re.compile("_populate_[^_]+_target_properties\(RELEASE ") for line in openedfile: - if "_install_prefix}/tools/qt5/${LIB_LOCATION}" in line: - builder += " if (${Configuration} STREQUAL \"RELEASE\")" - builder += "\n " + line.replace("/tools/qt5/bin", "/bin/") - builder += " else()" #This requires a release and debug build since Qt will check that the file exists! - #It would be better to use an elseif here with a EXISTS check but that requires a more complicated regex to build the complete filepath since each module uses its own _(qtmodule)_install_prefix - #so single configuration builds of Qt are currently not supported. Thus => - #TODO: Make single configuration builds of Qt work correctly! - builder += "\n " + line.replace("/tools/qt5/debug/bin", "/debug/bin/") - builder += " endif()\n" - # elif "_install_prefix}/bin/${LIB_LOCATION}" in line: - # builder += " if (${Configuration} STREQUAL \"RELEASE\")" - # builder += "\n " + line - # builder += " else()" #This requires a release and debug build! - # builder += "\n " + line.replace("/bin/", "/debug/bin/") - # builder += " endif()\n" - # elif "_install_prefix}/lib/${LIB_LOCATION}" in line: - # builder += " if (${Configuration} STREQUAL \"RELEASE\")" - # builder += "\n " + line - # builder += " else()" #This requires a release and debug build! - # builder += "\n " + line.replace("/lib/", "/debug/lib/") - # builder += " endif()\n" - # elif "_install_prefix}/lib/${IMPLIB_LOCATION}" in line: - # builder += " if (${Configuration} STREQUAL \"RELEASE\")" - # builder += "\n " + line - # builder += " else()" #This requires a release and debug build! - # builder += "\n " + line.replace("/lib/", "/debug/lib/") - # builder += " endif()\n" - # elif "_install_prefix}/plugins/${PLUGIN_LOCATION}" in line: - # builder += " if (${Configuration} STREQUAL \"RELEASE\")" - # builder += "\n " + line - # builder += " else()" #This requires a release and debug build! - # builder += "\n " + line.replace("/plugins/", "/debug/plugins/") - # builder += " endif()\n" - elif "_install_prefix}/lib/qtmaind.lib" in line: - # qtmaind.lib has been moved to manual-link: - builder += line.replace("/lib/", "/debug/lib/manual-link/") - elif "_install_prefix}/lib/qtmain.lib" in line: + if "_install_prefix}/lib/qtmain.lib" in line: # There is only one file which need to fix that + print("qtmain") # qtmain(d).lib has been moved to manual-link: builder += line.replace("/lib/", "/lib/manual-link/") builder += " set(imported_location_debug \"${_qt5Core_install_prefix}/debug/lib/manual-link/qtmaind.lib\")\n" builder += "\n" - builder += " set_target_properties(Qt5::WinMain PROPERTIES\n" - builder += " IMPORTED_LOCATION_DEBUG ${imported_location_debug}\n" - builder += " )\n" - # elif populatepluginpattern.search(line) != None: - # builder += line - # builder += line.replace("RELEASE", "DEBUG").replace(".dll", "d.dll").replace(".lib", "d.lib") - # elif populatetargetpattern.search(line) != None: - # builder += line - # builder += line.replace("RELEASE", "DEBUG").replace(".dll", "d.dll").replace(".lib", "d.lib") - # elif dllpatterndebug.search(line) != None: - # builder += line.replace("/bin/", "/debug/bin/") - # elif libpatterndebug.search(line) != None: - # builder += line.replace("/lib/", "/debug/lib/") - elif tooldllpattern.search(line) != None: - builder += line.replace("/tools/qt5/bin", "/debug/bin/") - elif exepattern.search(line) != None: - builder += line.replace("/bin/", tooldir) - elif toolexepattern.search(line) != None: + builder += " if(EXISTS \"${imported_location_debug}\")" + builder += " set_target_properties(Qt5::WinMain PROPERTIES\n" + builder += " IMPORTED_LOCATION_DEBUG ${imported_location_debug}\n" + builder += " )\n" + builder += " endif()" + elif toolexepattern.search(line) != None: # This could be avoided with a better copying of dll dependencies. + print("toolexepattern") builder += line.replace("/tools/qt5/bin/",tooldir) else: builder += line From 2c43ad41a13cd134de1dfc06a4bd5201da719e2f Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 16 Jan 2020 15:33:26 +0100 Subject: [PATCH 173/419] update baseline --- scripts/ci.baseline.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 5e90c7f37ebe1e..96e90a277cf8a3 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -309,7 +309,6 @@ cudnn:arm-uwp=fail cudnn:x64-uwp=fail cudnn:x64-windows-static=fail cudnn:x86-windows=fail -cutelyst2:x64-osx=fail darknet:arm-uwp=fail darknet:x64-uwp=fail date:arm64-windows=fail From 430e311971a69668344d016621e78cff25ef492c Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 16 Jan 2020 15:34:43 +0100 Subject: [PATCH 174/419] experimental removal of fixcmake.py and dll copying into tools/qt5/bin --- ports/qt5-base/cmake/qt_build_submodule.cmake | 12 +++++++ ports/qt5-base/cmake/qt_fix_cmake.cmake | 32 ++++++----------- ports/qt5-base/fixcmake.py | 36 ------------------- ports/qt5-base/portfile.cmake | 32 ++++++++++++----- 4 files changed, 46 insertions(+), 66 deletions(-) delete mode 100644 ports/qt5-base/fixcmake.py diff --git a/ports/qt5-base/cmake/qt_build_submodule.cmake b/ports/qt5-base/cmake/qt_build_submodule.cmake index 78249f58ac07cf..4a2638cab81513 100644 --- a/ports/qt5-base/cmake/qt_build_submodule.cmake +++ b/ports/qt5-base/cmake/qt_build_submodule.cmake @@ -78,6 +78,18 @@ function(qt_build_submodule SOURCE_PATH) endforeach() if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/qt5/bin") file(COPY "${CURRENT_PACKAGES_DIR}/tools/qt5/bin" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + configure_file(${CURRENT_INSTALLED_DIR}/tools/qt5/qt_release.conf ${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin) # This makes the tools at least useable for release vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") + if(VCPKG_TARGET_IS_WINDOWS) + file(GLOB_RECURSE DLL_DEPS_AVAIL "${CURRENT_INSTALLED_DIR}/tools/qt5/bin/*.dll") + message(STATUS "FOUND DLLS: ${DLL_DEPS_AVAIL}") + file(GLOB_RECURSE DLL_DEPS_NEEDED "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/*.dll") + message(STATUS "DEP DLLS: ${DLL_DEPS_NEEDED}") + list(REMOVE_ITEM DLL_DEPS_NEEDED ${DLL_DEPS_AVAIL}) + message(STATUS "NEEDED DLLS: ${DLL_DEPS_NEEDED}") + foreach(dll_dep ${DLL_DEPS_NEEDED}) + file(COPY "${dll_dep}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/qt5/bin") + endforeach() + endif() endif() endfunction() \ No newline at end of file diff --git a/ports/qt5-base/cmake/qt_fix_cmake.cmake b/ports/qt5-base/cmake/qt_fix_cmake.cmake index f435566c659e05..435d0a6a8825b9 100644 --- a/ports/qt5-base/cmake/qt_fix_cmake.cmake +++ b/ports/qt5-base/cmake/qt_fix_cmake.cmake @@ -1,25 +1,14 @@ function(qt_fix_cmake PACKAGE_DIR_TO_FIX PORT_TO_FIX) - set(BACKUP_PATH "$ENV{PATH}") - #Find Python and add it to the path - vcpkg_find_acquire_program(PYTHON2) - get_filename_component(PYTHON2_EXE_PATH ${PYTHON2} DIRECTORY) - vcpkg_add_to_path("${PYTHON2_EXE_PATH}") - - #Fix the cmake files if they exist - if(EXISTS ${PACKAGE_DIR_TO_FIX}/lib/cmake) - vcpkg_execute_required_process( - COMMAND ${PYTHON2} ${CURRENT_INSTALLED_DIR}/share/qt5/fixcmake.py ${PORT_TO_FIX} - WORKING_DIRECTORY ${PACKAGE_DIR_TO_FIX}/lib/cmake - LOGNAME fix-cmake - ) - endif() - if(EXISTS ${PACKAGE_DIR_TO_FIX}/share/cmake) - vcpkg_execute_required_process( - COMMAND ${PYTHON2} ${CURRENT_INSTALLED_DIR}/share/qt5/fixcmake.py ${PORT_TO_FIX} - WORKING_DIRECTORY ${PACKAGE_DIR_TO_FIX}/share/cmake - LOGNAME fix-cmake - ) - endif() + file(GLOB_RECURSE cmakefiles ${PACKAGE_DIR_TO_FIX}/share/cmake/*.cmake ${PACKAGE_DIR_TO_FIX}/lib/cmake/*.cmake) + foreach(cmakefile ${cmakefiles}) + file(READ "${cmakefile}" _contents) + if(_contents MATCHES "_install_prefix}/tools/qt5/bin/([a-z0-9]+)") + message(STATUS "FIXED FILE: ${cmakefile}") + string(REGEX REPLACE "_install_prefix}/tools/qt5/bin/([a-z0-9]+)" "_install_prefix}/tools/${PORT_TO_FIX}/bin/\\1" _contents "${_contents}") + file(WRITE "${cmakefile}" "${_contents}") + endif() + endforeach() + #Install cmake files if(EXISTS ${PACKAGE_DIR_TO_FIX}/lib/cmake) file(MAKE_DIRECTORY ${PACKAGE_DIR_TO_FIX}/share) @@ -29,5 +18,4 @@ function(qt_fix_cmake PACKAGE_DIR_TO_FIX PORT_TO_FIX) if(EXISTS ${PACKAGE_DIR_TO_FIX}/debug/lib/cmake) file(REMOVE_RECURSE ${PACKAGE_DIR_TO_FIX}/debug/lib/cmake) endif() - set(ENV{PATH} "${BACKUP_PATH}") endfunction() \ No newline at end of file diff --git a/ports/qt5-base/fixcmake.py b/ports/qt5-base/fixcmake.py deleted file mode 100644 index e49c51c516b4c3..00000000000000 --- a/ports/qt5-base/fixcmake.py +++ /dev/null @@ -1,36 +0,0 @@ -import os -import re -import sys -from glob import glob - -port="qt5" -if len(sys.argv) > 1: - port=sys.argv[1] - -files = [y for x in os.walk('.') for y in glob(os.path.join(x[0], '*.cmake'))] -tooldir="/tools/"+port+"/bin/" - -for f in files: - openedfile = open(f, "r") - builder = "" - toolexepattern = re.compile("_install_prefix}/tools/qt5/bin/[a-z]+(.exe|)") - for line in openedfile: - if "_install_prefix}/lib/qtmain.lib" in line: # There is only one file which need to fix that - print("qtmain") - # qtmain(d).lib has been moved to manual-link: - builder += line.replace("/lib/", "/lib/manual-link/") - builder += " set(imported_location_debug \"${_qt5Core_install_prefix}/debug/lib/manual-link/qtmaind.lib\")\n" - builder += "\n" - builder += " if(EXISTS \"${imported_location_debug}\")" - builder += " set_target_properties(Qt5::WinMain PROPERTIES\n" - builder += " IMPORTED_LOCATION_DEBUG ${imported_location_debug}\n" - builder += " )\n" - builder += " endif()" - elif toolexepattern.search(line) != None: # This could be avoided with a better copying of dll dependencies. - print("toolexepattern") - builder += line.replace("/tools/qt5/bin/",tooldir) - else: - builder += line - new_file = open(f, "w") - new_file.write(builder) - new_file.close() diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 8d6f79f2900070..d25d7f61d900d8 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -289,7 +289,7 @@ else() file(RENAME ${CURRENT_PACKAGES_DIR}/lib/cmake ${CURRENT_PACKAGES_DIR}/share/cmake) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake) # TODO: check if important debug information for cmake is lost - #This needs a new VCPKG policy. + #This needs a new VCPKG policy or a static angle build (ANGLE needs to be fixed in VCPKG!) if(VCPKG_TARGET_IS_WINDOWS AND ${VCPKG_LIBRARY_LINKAGE} MATCHES "static") # Move angle dll libraries message(STATUS "Moving ANGLE dlls from /bin to /tools/qt5-angle/bin. In static builds dlls are not allowed in /bin") if(EXISTS "${CURRENT_PACKAGES_DIR}/bin") @@ -302,12 +302,28 @@ else() endif() endif() - #TODO: Replace python script with cmake script - vcpkg_execute_required_process( - COMMAND ${PYTHON3} ${CMAKE_CURRENT_LIST_DIR}/fixcmake.py - WORKING_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/cmake - LOGNAME fix-cmake - ) + ## Fix location of qtmain(d).lib. Has been moved into manual-link. Add debug version + if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_BUILD_TYPE) + set(cmakefile "${CURRENT_PACKAGES_DIR}/share/cmake/Qt5Core/Qt5CoreConfigExtras.cmake") + file(READ "${cmakefile}" _contents) + string(REPLACE "set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)" "set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE DEBUG)" _contents "${_contents}") + string(REPLACE + [[set(imported_location "${_qt5Core_install_prefix}/lib/qtmain.lib")]] + [[set(imported_location_release "${_qt5Core_install_prefix}/lib/manual-link/qtmain.lib") + set(imported_location_debug "${_qt5Core_install_prefix}/debug/lib/manual-link/qtmaind.lib")]] + _contents "${_contents}") + string(REPLACE +[[ set_target_properties(Qt5::WinMain PROPERTIES + IMPORTED_LOCATION_RELEASE ${imported_location} + )]] +[[ set_target_properties(Qt5::WinMain PROPERTIES + IMPORTED_LOCATION_RELEASE ${imported_location_release} + IMPORTED_LOCATION_DEBUG ${imported_location_debug} + )]] + _contents "${_contents}") + file(WRITE "${cmakefile}" "${_contents}") + endif() + file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/qt5core) if(EXISTS ${CURRENT_PACKAGES_DIR}/tools/qt5/bin) file(COPY ${CURRENT_PACKAGES_DIR}/tools/qt5/bin DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) @@ -318,12 +334,12 @@ else() if(EXISTS ${CURRENT_PACKAGES_DIR}/tools/qt5/bin/qt.conf) file(REMOVE "${CURRENT_PACKAGES_DIR}/tools/qt5/bin/qt.conf") endif() + configure_file(${CURRENT_PACKAGES_DIR}/tools/qt5/qt_release.conf ${CURRENT_PACKAGES_DIR}/tools/qt5/bin) # This makes the tools at least useable for release qt_install_copyright(${SOURCE_PATH}) endif() #install scripts for other qt ports file(COPY - ${CMAKE_CURRENT_LIST_DIR}/fixcmake.py ${CMAKE_CURRENT_LIST_DIR}/cmake/qt_port_hashes.cmake ${CMAKE_CURRENT_LIST_DIR}/cmake/qt_port_functions.cmake ${CMAKE_CURRENT_LIST_DIR}/cmake/qt_fix_makefile_install.cmake From 7957d50949f631ce6df169c4562ea025065b4e23 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 16 Jan 2020 16:37:56 +0100 Subject: [PATCH 175/419] fix experimental dll copying. --- ports/qt5-base/cmake/qt_build_submodule.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ports/qt5-base/cmake/qt_build_submodule.cmake b/ports/qt5-base/cmake/qt_build_submodule.cmake index 4a2638cab81513..5f3d60e7191d87 100644 --- a/ports/qt5-base/cmake/qt_build_submodule.cmake +++ b/ports/qt5-base/cmake/qt_build_submodule.cmake @@ -82,13 +82,15 @@ function(qt_build_submodule SOURCE_PATH) vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") if(VCPKG_TARGET_IS_WINDOWS) file(GLOB_RECURSE DLL_DEPS_AVAIL "${CURRENT_INSTALLED_DIR}/tools/qt5/bin/*.dll") + string(REPLACE "${CURRENT_INSTALLED_DIR}/tools/qt5/bin/" "" DLL_DEPS_AVAIL "${DLL_DEPS_AVAIL}") message(STATUS "FOUND DLLS: ${DLL_DEPS_AVAIL}") file(GLOB_RECURSE DLL_DEPS_NEEDED "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/*.dll") + string(REPLACE "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/" "" DLL_DEPS_NEEDED "${DLL_DEPS_NEEDED}") message(STATUS "DEP DLLS: ${DLL_DEPS_NEEDED}") list(REMOVE_ITEM DLL_DEPS_NEEDED ${DLL_DEPS_AVAIL}) message(STATUS "NEEDED DLLS: ${DLL_DEPS_NEEDED}") foreach(dll_dep ${DLL_DEPS_NEEDED}) - file(COPY "${dll_dep}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/qt5/bin") + file(COPY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/${dll_dep}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/qt5/bin") endforeach() endif() endif() From a7d5029e53af29d35a598a41c6981457cd75968a Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 16 Jan 2020 19:42:19 +0100 Subject: [PATCH 176/419] fix static windows builds --- ports/qt5-base/cmake/qt_build_submodule.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ports/qt5-base/cmake/qt_build_submodule.cmake b/ports/qt5-base/cmake/qt_build_submodule.cmake index 5f3d60e7191d87..8d20702a1723e4 100644 --- a/ports/qt5-base/cmake/qt_build_submodule.cmake +++ b/ports/qt5-base/cmake/qt_build_submodule.cmake @@ -87,7 +87,9 @@ function(qt_build_submodule SOURCE_PATH) file(GLOB_RECURSE DLL_DEPS_NEEDED "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/*.dll") string(REPLACE "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/" "" DLL_DEPS_NEEDED "${DLL_DEPS_NEEDED}") message(STATUS "DEP DLLS: ${DLL_DEPS_NEEDED}") - list(REMOVE_ITEM DLL_DEPS_NEEDED ${DLL_DEPS_AVAIL}) + if(DLL_DEPS_AVAIL AND DLL_DEPS_NEEDED) + list(REMOVE_ITEM DLL_DEPS_NEEDED ${DLL_DEPS_AVAIL}) + endif() message(STATUS "NEEDED DLLS: ${DLL_DEPS_NEEDED}") foreach(dll_dep ${DLL_DEPS_NEEDED}) file(COPY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/${dll_dep}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/qt5/bin") From d62c0eeb5f23d61954311cf440b0548ea5cfe5d9 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 16 Jan 2020 19:47:01 +0100 Subject: [PATCH 177/419] fix static builds --- ports/qt5-base/cmake/qt_build_submodule.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/qt5-base/cmake/qt_build_submodule.cmake b/ports/qt5-base/cmake/qt_build_submodule.cmake index 8d20702a1723e4..b634e8ca0c77b4 100644 --- a/ports/qt5-base/cmake/qt_build_submodule.cmake +++ b/ports/qt5-base/cmake/qt_build_submodule.cmake @@ -80,7 +80,7 @@ function(qt_build_submodule SOURCE_PATH) file(COPY "${CURRENT_PACKAGES_DIR}/tools/qt5/bin" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") configure_file(${CURRENT_INSTALLED_DIR}/tools/qt5/qt_release.conf ${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin) # This makes the tools at least useable for release vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") - if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") file(GLOB_RECURSE DLL_DEPS_AVAIL "${CURRENT_INSTALLED_DIR}/tools/qt5/bin/*.dll") string(REPLACE "${CURRENT_INSTALLED_DIR}/tools/qt5/bin/" "" DLL_DEPS_AVAIL "${DLL_DEPS_AVAIL}") message(STATUS "FOUND DLLS: ${DLL_DEPS_AVAIL}") From 8da5f7e79468e674af4a2e948d0dac788b28181b Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 16 Jan 2020 20:07:34 +0100 Subject: [PATCH 178/419] fix plugin copy --- ports/qt5-base/cmake/qt_build_submodule.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ports/qt5-base/cmake/qt_build_submodule.cmake b/ports/qt5-base/cmake/qt_build_submodule.cmake index b634e8ca0c77b4..578bbd846af40b 100644 --- a/ports/qt5-base/cmake/qt_build_submodule.cmake +++ b/ports/qt5-base/cmake/qt_build_submodule.cmake @@ -92,7 +92,9 @@ function(qt_build_submodule SOURCE_PATH) endif() message(STATUS "NEEDED DLLS: ${DLL_DEPS_NEEDED}") foreach(dll_dep ${DLL_DEPS_NEEDED}) - file(COPY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/${dll_dep}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/qt5/bin") + string(REGEX REPLACE "[^/]+$" "" dll_subpath "${dll_dep}") + message(STATUS "SUBPATH DLLS: ${dll_subpath}") + file(COPY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/${dll_dep}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/qt5/bin/${dll_subpath}") endforeach() endif() endif() From cf1ff5087181c99b026b068cb2e99e135b62eb66 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 17 Jan 2020 00:02:21 +0100 Subject: [PATCH 179/419] add quotes around configuration to make it work --- ports/qt5-base/patches/Qt5BasicConfig.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/qt5-base/patches/Qt5BasicConfig.patch b/ports/qt5-base/patches/Qt5BasicConfig.patch index 6d68036cbb5adf..d113fb6695bee1 100644 --- a/ports/qt5-base/patches/Qt5BasicConfig.patch +++ b/ports/qt5-base/patches/Qt5BasicConfig.patch @@ -7,7 +7,7 @@ index c72989288..a88234dca 100644 !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) - set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") -+ if(${Configuration} STREQUAL \"DEBUG\") ++ if(\"${Configuration}\" STREQUAL \"DEBUG\") + set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") + else() + set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") @@ -21,7 +21,7 @@ index c72989288..a88234dca 100644 !!IF !isEmpty(CMAKE_WINDOWS_BUILD) !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) - set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") -+ if(${Configuration} STREQUAL \"DEBUG\") ++ if(\"${Configuration}\" STREQUAL \"DEBUG\") + set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") + else() + set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") @@ -67,7 +67,7 @@ index c72989288..a88234dca 100644 set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE) -+ if(${Configuration} STREQUAL \"DEBUG\") ++ if(\"${Configuration}\" STREQUAL \"DEBUG\") + set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") + else() set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") From 136322ca0afa69f7cf4a7db56145a3f5f4925cc1 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 17 Jan 2020 00:02:32 +0100 Subject: [PATCH 180/419] remove dll debug messages --- ports/qt5-base/cmake/qt_build_submodule.cmake | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ports/qt5-base/cmake/qt_build_submodule.cmake b/ports/qt5-base/cmake/qt_build_submodule.cmake index 578bbd846af40b..f3da03c2ef8055 100644 --- a/ports/qt5-base/cmake/qt_build_submodule.cmake +++ b/ports/qt5-base/cmake/qt_build_submodule.cmake @@ -83,17 +83,13 @@ function(qt_build_submodule SOURCE_PATH) if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") file(GLOB_RECURSE DLL_DEPS_AVAIL "${CURRENT_INSTALLED_DIR}/tools/qt5/bin/*.dll") string(REPLACE "${CURRENT_INSTALLED_DIR}/tools/qt5/bin/" "" DLL_DEPS_AVAIL "${DLL_DEPS_AVAIL}") - message(STATUS "FOUND DLLS: ${DLL_DEPS_AVAIL}") file(GLOB_RECURSE DLL_DEPS_NEEDED "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/*.dll") string(REPLACE "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/" "" DLL_DEPS_NEEDED "${DLL_DEPS_NEEDED}") - message(STATUS "DEP DLLS: ${DLL_DEPS_NEEDED}") if(DLL_DEPS_AVAIL AND DLL_DEPS_NEEDED) list(REMOVE_ITEM DLL_DEPS_NEEDED ${DLL_DEPS_AVAIL}) endif() - message(STATUS "NEEDED DLLS: ${DLL_DEPS_NEEDED}") foreach(dll_dep ${DLL_DEPS_NEEDED}) string(REGEX REPLACE "[^/]+$" "" dll_subpath "${dll_dep}") - message(STATUS "SUBPATH DLLS: ${dll_subpath}") file(COPY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/${dll_dep}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/qt5/bin/${dll_subpath}") endforeach() endif() From d0446cf5e169b45c06ee8817d860b8b4b10da61c Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 17 Jan 2020 09:06:06 +0100 Subject: [PATCH 181/419] note about the cmake fix --- ports/qt5-base/cmake/qt_fix_cmake.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/qt5-base/cmake/qt_fix_cmake.cmake b/ports/qt5-base/cmake/qt_fix_cmake.cmake index 435d0a6a8825b9..1b6522716e2da6 100644 --- a/ports/qt5-base/cmake/qt_fix_cmake.cmake +++ b/ports/qt5-base/cmake/qt_fix_cmake.cmake @@ -1,9 +1,9 @@ function(qt_fix_cmake PACKAGE_DIR_TO_FIX PORT_TO_FIX) + file(GLOB_RECURSE cmakefiles ${PACKAGE_DIR_TO_FIX}/share/cmake/*.cmake ${PACKAGE_DIR_TO_FIX}/lib/cmake/*.cmake) foreach(cmakefile ${cmakefiles}) file(READ "${cmakefile}" _contents) - if(_contents MATCHES "_install_prefix}/tools/qt5/bin/([a-z0-9]+)") - message(STATUS "FIXED FILE: ${cmakefile}") + if(_contents MATCHES "_install_prefix}/tools/qt5/bin/([a-z0-9]+)") # there are only about 3 to 5 cmake files which require the fix in ports: qt5-tools qt5-xmlpattern at5-activeqt qt5-quick string(REGEX REPLACE "_install_prefix}/tools/qt5/bin/([a-z0-9]+)" "_install_prefix}/tools/${PORT_TO_FIX}/bin/\\1" _contents "${_contents}") file(WRITE "${cmakefile}" "${_contents}") endif() From 4779bc0ced85a5d3f08c3877988c86436072af82 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 17 Jan 2020 09:06:47 +0100 Subject: [PATCH 182/419] revert fontconfig changes on linux. Make qt.conf relative and not absolute --- ports/qt5-base/portfile.cmake | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index d25d7f61d900d8..93a0eb53f24ec4 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -64,7 +64,6 @@ set(ENV{_CL_} "/utf-8") set(CORE_OPTIONS -confirm-license -opensource - #-no-fontconfig #-simulator_and_device #-ltcg #-combined-angle-lib @@ -200,14 +199,14 @@ elseif(VCPKG_TARGET_IS_LINUX) "SQLITE_LIBS=${SQLITE_RELEASE} -ldl -lpthread" "HARFBUZZ_LIBS=${HARFBUZZ_RELEASE}" "OPENSSL_LIBS=${SSL_RELEASE} ${EAY_RELEASE} -ldl -lpthread" - "FONTCONFIG_LIBS=${FONTCONFIG_RELEASE} ${FREETYPE_RELEASE} ${EXPAT_RELEASE} -liconv" + "FONTCONFIG_LIBS=${FONTCONFIG_RELEASE} ${FREETYPE_RELEASE} ${EXPAT_RELEASE}" ) list(APPEND DEBUG_OPTIONS "PSQL_LIBS=${PSQL_DEBUG} ${SSL_DEBUG} ${EAY_DEBUG} -ldl -lpthread" "SQLITE_LIBS=${SQLITE_DEBUG} -ldl -lpthread" "HARFBUZZ_LIBS=${HARFBUZZ_DEBUG}" "OPENSSL_LIBS=${SSL_DEBUG} ${EAY_DEBUG} -ldl -lpthread" - "FONTCONFIG_LIBS=${FONTCONFIG_DEBUG} ${FREETYPE_DEBUG} ${EXPAT_DEBUG} -liconv" + "FONTCONFIG_LIBS=${FONTCONFIG_DEBUG} ${FREETYPE_DEBUG} ${EXPAT_DEBUG}" ) elseif(VCPKG_TARGET_IS_OSX) list(APPEND CORE_OPTIONS -fontconfig) @@ -334,8 +333,11 @@ else() if(EXISTS ${CURRENT_PACKAGES_DIR}/tools/qt5/bin/qt.conf) file(REMOVE "${CURRENT_PACKAGES_DIR}/tools/qt5/bin/qt.conf") endif() - configure_file(${CURRENT_PACKAGES_DIR}/tools/qt5/qt_release.conf ${CURRENT_PACKAGES_DIR}/tools/qt5/bin) # This makes the tools at least useable for release - + set(CURRENT_INSTALLED_DIR_BACKUP "${CURRENT_INSTALLED_DIR}") + set(CURRENT_INSTALLED_DIR "./../../.." ) # Making the qt.conf relative and not absolute + configure_file(${CURRENT_PACKAGES_DIR}/tools/qt5/qt_release.conf ${CURRENT_PACKAGES_DIR}/tools/qt5/bin/qt.conf) # This makes the tools at least useable for release + set(CURRENT_INSTALLED_DIR "${CURRENT_INSTALLED_DIR_BACKUP}") + qt_install_copyright(${SOURCE_PATH}) endif() #install scripts for other qt ports From 728e9bd48388f010149800b4dbfbe8b690f4736f Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 17 Jan 2020 09:07:15 +0100 Subject: [PATCH 183/419] make qt.conf relative --- ports/qt5-base/cmake/qt_build_submodule.cmake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ports/qt5-base/cmake/qt_build_submodule.cmake b/ports/qt5-base/cmake/qt_build_submodule.cmake index f3da03c2ef8055..60f85bf8954bdf 100644 --- a/ports/qt5-base/cmake/qt_build_submodule.cmake +++ b/ports/qt5-base/cmake/qt_build_submodule.cmake @@ -78,7 +78,12 @@ function(qt_build_submodule SOURCE_PATH) endforeach() if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/qt5/bin") file(COPY "${CURRENT_PACKAGES_DIR}/tools/qt5/bin" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") - configure_file(${CURRENT_INSTALLED_DIR}/tools/qt5/qt_release.conf ${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin) # This makes the tools at least useable for release + + set(CURRENT_INSTALLED_DIR_BACKUP "${CURRENT_INSTALLED_DIR}") + set(CURRENT_INSTALLED_DIR "./../../.." ) # Making the qt.conf relative and not absolute + configure_file(${CURRENT_INSTALLED_DIR}/tools/qt5/qt_release.conf ${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/qt.conf) # This makes the tools at least useable for release + set(CURRENT_INSTALLED_DIR "${CURRENT_INSTALLED_DIR_BACKUP}") + vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") file(GLOB_RECURSE DLL_DEPS_AVAIL "${CURRENT_INSTALLED_DIR}/tools/qt5/bin/*.dll") From 708d8250d6eae81bb9a030ff7edef22d2ea1e67c Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 17 Jan 2020 09:21:16 +0100 Subject: [PATCH 184/419] trying to fix ogre osx ci regression --- ports/ogre/CONTROL | 2 +- ports/ogre/osx.patch | 13 +++++++++++++ ports/ogre/portfile.cmake | 1 + 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 ports/ogre/osx.patch diff --git a/ports/ogre/CONTROL b/ports/ogre/CONTROL index 3522ff8c5e890b..521f13f1738f14 100644 --- a/ports/ogre/CONTROL +++ b/ports/ogre/CONTROL @@ -1,5 +1,5 @@ Source: ogre -Version: 1.12.1 +Version: 1.12.1-1 Build-Depends: freeimage, freetype, zlib, zziplib Homepage: https://github.com/OGRECave/ogre Description: 3D Object-Oriented Graphics Rendering Engine diff --git a/ports/ogre/osx.patch b/ports/ogre/osx.patch new file mode 100644 index 00000000000000..53a457ee7578b4 --- /dev/null +++ b/ports/ogre/osx.patch @@ -0,0 +1,13 @@ +diff --git a/OgreMain/include/OgrePlatform.h b/OgreMain/include/OgrePlatform.h +index 50e396eba..d74dcc8fd 100644 +--- a/OgreMain/include/OgrePlatform.h ++++ b/OgreMain/include/OgrePlatform.h +@@ -147,7 +147,7 @@ namespace Ogre { + #elif defined(__EMSCRIPTEN__) + # define OGRE_PLATFORM OGRE_PLATFORM_EMSCRIPTEN + #elif defined( __APPLE_CC__) +-# include "Availability.h" ++# include + # ifdef __IPHONE_OS_VERSION_MIN_REQUIRED + # define OGRE_PLATFORM OGRE_PLATFORM_APPLE_IOS + # else diff --git a/ports/ogre/portfile.cmake b/ports/ogre/portfile.cmake index 898077c1e35af0..b6b83c7ac82327 100644 --- a/ports/ogre/portfile.cmake +++ b/ports/ogre/portfile.cmake @@ -12,6 +12,7 @@ vcpkg_from_github( HEAD_REF master PATCHES toolchain_fixes.patch + osx.patch ) file(REMOVE "${SOURCE_PATH}/CMake/Packages/FindOpenEXR.cmake") From d4797af7200114a7b96d4c2199083be99d932058 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 17 Jan 2020 11:09:14 +0100 Subject: [PATCH 185/419] fix silly path error --- ports/qt5-base/cmake/qt_build_submodule.cmake | 2 +- ports/qt5-base/portfile.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/qt5-base/cmake/qt_build_submodule.cmake b/ports/qt5-base/cmake/qt_build_submodule.cmake index 60f85bf8954bdf..18925adc1fcdad 100644 --- a/ports/qt5-base/cmake/qt_build_submodule.cmake +++ b/ports/qt5-base/cmake/qt_build_submodule.cmake @@ -81,7 +81,7 @@ function(qt_build_submodule SOURCE_PATH) set(CURRENT_INSTALLED_DIR_BACKUP "${CURRENT_INSTALLED_DIR}") set(CURRENT_INSTALLED_DIR "./../../.." ) # Making the qt.conf relative and not absolute - configure_file(${CURRENT_INSTALLED_DIR}/tools/qt5/qt_release.conf ${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/qt.conf) # This makes the tools at least useable for release + configure_file(${CURRENT_INSTALLED_DIR_BACKUP}/tools/qt5/qt_release.conf ${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/qt.conf) # This makes the tools at least useable for release set(CURRENT_INSTALLED_DIR "${CURRENT_INSTALLED_DIR_BACKUP}") vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 93a0eb53f24ec4..d35dacd4811855 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -335,7 +335,7 @@ else() endif() set(CURRENT_INSTALLED_DIR_BACKUP "${CURRENT_INSTALLED_DIR}") set(CURRENT_INSTALLED_DIR "./../../.." ) # Making the qt.conf relative and not absolute - configure_file(${CURRENT_PACKAGES_DIR}/tools/qt5/qt_release.conf ${CURRENT_PACKAGES_DIR}/tools/qt5/bin/qt.conf) # This makes the tools at least useable for release + configure_file(${CURRENT_INSTALLED_DIR_BACKUP}/tools/qt5/qt_release.conf ${CURRENT_PACKAGES_DIR}/tools/qt5/bin/qt.conf) # This makes the tools at least useable for release set(CURRENT_INSTALLED_DIR "${CURRENT_INSTALLED_DIR_BACKUP}") qt_install_copyright(${SOURCE_PATH}) From ddb9443049934b029ecb6ad142829a2f31dadfc8 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 17 Jan 2020 12:14:29 +0100 Subject: [PATCH 186/419] Revert "trying to fix ogre osx ci regression" This reverts commit 708d8250d6eae81bb9a030ff7edef22d2ea1e67c. --- ports/ogre/CONTROL | 2 +- ports/ogre/osx.patch | 13 ------------- ports/ogre/portfile.cmake | 1 - 3 files changed, 1 insertion(+), 15 deletions(-) delete mode 100644 ports/ogre/osx.patch diff --git a/ports/ogre/CONTROL b/ports/ogre/CONTROL index 521f13f1738f14..3522ff8c5e890b 100644 --- a/ports/ogre/CONTROL +++ b/ports/ogre/CONTROL @@ -1,5 +1,5 @@ Source: ogre -Version: 1.12.1-1 +Version: 1.12.1 Build-Depends: freeimage, freetype, zlib, zziplib Homepage: https://github.com/OGRECave/ogre Description: 3D Object-Oriented Graphics Rendering Engine diff --git a/ports/ogre/osx.patch b/ports/ogre/osx.patch deleted file mode 100644 index 53a457ee7578b4..00000000000000 --- a/ports/ogre/osx.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/OgreMain/include/OgrePlatform.h b/OgreMain/include/OgrePlatform.h -index 50e396eba..d74dcc8fd 100644 ---- a/OgreMain/include/OgrePlatform.h -+++ b/OgreMain/include/OgrePlatform.h -@@ -147,7 +147,7 @@ namespace Ogre { - #elif defined(__EMSCRIPTEN__) - # define OGRE_PLATFORM OGRE_PLATFORM_EMSCRIPTEN - #elif defined( __APPLE_CC__) --# include "Availability.h" -+# include - # ifdef __IPHONE_OS_VERSION_MIN_REQUIRED - # define OGRE_PLATFORM OGRE_PLATFORM_APPLE_IOS - # else diff --git a/ports/ogre/portfile.cmake b/ports/ogre/portfile.cmake index b6b83c7ac82327..898077c1e35af0 100644 --- a/ports/ogre/portfile.cmake +++ b/ports/ogre/portfile.cmake @@ -12,7 +12,6 @@ vcpkg_from_github( HEAD_REF master PATCHES toolchain_fixes.patch - osx.patch ) file(REMOVE "${SOURCE_PATH}/CMake/Packages/FindOpenEXR.cmake") From e4b66ea92d32170829ac7cb28bbdc87b725e34ea Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 17 Jan 2020 12:16:10 +0100 Subject: [PATCH 187/419] add ogre:x64-osx=fail to CI baseline --- scripts/ci.baseline.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 96e90a277cf8a3..443d545f8ee8dc 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1172,6 +1172,7 @@ ogdf:x64-uwp = skip ogdf:x64-windows = skip ogdf:x64-windows-static = skip ogdf:x86-windows = skip +ogre:x64-osx = fail # Conflicts with ogre ogre-next:arm64-windows = skip ogre-next:arm-uwp = skip From 473f0047a9470920632f08a7d1d38eb3a19724b1 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 17 Jan 2020 12:19:51 +0100 Subject: [PATCH 188/419] retry on osx --- ports/qt5-base/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL index c6512c1b23e57b..090d35799153b8 100644 --- a/ports/qt5-base/CONTROL +++ b/ports/qt5-base/CONTROL @@ -1,5 +1,5 @@ Source: qt5-base -Version: 5.12.5-9 +Version: 5.12.5-10 Homepage: https://www.qt.io/ Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components. Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl, angle (!windows), egl-registry, icu (!uwp), fontconfig (!windows) From 04f4209893ea12f655486515908656cba04d6c4d Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 17 Jan 2020 12:53:55 +0100 Subject: [PATCH 189/419] fix configure error. since in qt5-base everything is in the package directory and not in the installed --- ports/qt5-base/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index d35dacd4811855..93a0eb53f24ec4 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -335,7 +335,7 @@ else() endif() set(CURRENT_INSTALLED_DIR_BACKUP "${CURRENT_INSTALLED_DIR}") set(CURRENT_INSTALLED_DIR "./../../.." ) # Making the qt.conf relative and not absolute - configure_file(${CURRENT_INSTALLED_DIR_BACKUP}/tools/qt5/qt_release.conf ${CURRENT_PACKAGES_DIR}/tools/qt5/bin/qt.conf) # This makes the tools at least useable for release + configure_file(${CURRENT_PACKAGES_DIR}/tools/qt5/qt_release.conf ${CURRENT_PACKAGES_DIR}/tools/qt5/bin/qt.conf) # This makes the tools at least useable for release set(CURRENT_INSTALLED_DIR "${CURRENT_INSTALLED_DIR_BACKUP}") qt_install_copyright(${SOURCE_PATH}) From e8b85d68707657c8f61959498625abc6bd8a10d7 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 22 Jan 2020 08:33:57 +0100 Subject: [PATCH 190/419] update baseline --- scripts/ci.baseline.txt | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 7689ca1d505041..8423d0f7661636 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1414,14 +1414,21 @@ qpid-proton:x64-uwp=fail qpid-proton:x64-windows-static=fail qscintilla:x64-linux=fail qscintilla:x64-osx=fail -qt5-activeqt:x64-linux=fail -qt5-activeqt:x64-osx=fail -qt5-macextras:x64-linux=fail -qt5-macextras:x64-windows=fail -qt5-macextras:x64-windows-static=fail -qt5-macextras:x86-windows=fail -qt5-winextras:x64-linux=fail -qt5-winextras:x64-osx=fail +# Unsupported Qt platform modules +qt5-activeqt:x64-linux=skip +qt5-activeqt:x64-osx=skip +qt5-macextras:x64-linux=skip +qt5-macextras:x64-windows=skip +qt5-macextras:x64-windows-static=skip +qt5-macextras:x86-windows=skip +qt5-winextras:x64-linux=skip +qt5-winextras:x64-osx=skip +qt5-x11extras:x86-windows=skip +qt5-x11extras:x64-windows=skip +qt5-x11extras:x64-windows-static=skip +qt5-x11extras:arm64-windows=skip +qt5-x11extras:x64-uwp=skip +qt5-x11extras:arm-uwp=skip quickfast:x64-linux=ignore quickfix:x64-linux=ignore quickfix:x64-windows=ignore @@ -1739,6 +1746,9 @@ vlpp:arm64-windows=fail vlpp:arm-uwp=fail vlpp:x64-osx=fail vlpp:x64-uwp=fail +#unsuporrted archietectures +vtk-m:arm-uwp=skip +vtk-m:arm64-windows=skip vulkan:arm64-windows=fail vulkan:arm-uwp=fail vulkan:x64-linux=fail From 3595c5aeb9cd8a67a930cb0614a8fe2fd2181e2d Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 22 Jan 2020 09:50:05 +0100 Subject: [PATCH 191/419] fix hdf5 CI regression --- ports/hdf5/CONTROL | 2 +- ports/hdf5/export-private.patch | 15 +++++ ports/hdf5/portfile.cmake | 101 +++++++------------------------- ports/hdf5/static-targets.patch | 37 ++++++++++++ 4 files changed, 74 insertions(+), 81 deletions(-) create mode 100644 ports/hdf5/export-private.patch create mode 100644 ports/hdf5/static-targets.patch diff --git a/ports/hdf5/CONTROL b/ports/hdf5/CONTROL index d780cd7e995de7..7132346d6a9e6e 100644 --- a/ports/hdf5/CONTROL +++ b/ports/hdf5/CONTROL @@ -1,5 +1,5 @@ Source: hdf5 -Version: 1.10.5-9 +Version: 1.10.5-10 Homepage: https://www.hdfgroup.org/downloads/hdf5/ Description: HDF5 is a data model, library, and file format for storing and managing data Default-Features: szip, zlib diff --git a/ports/hdf5/export-private.patch b/ports/hdf5/export-private.patch new file mode 100644 index 00000000000000..9dd877846ab30b --- /dev/null +++ b/ports/hdf5/export-private.patch @@ -0,0 +1,15 @@ +diff --git a/hdf5-1.10.5/hl/src/H5LDprivate.h b/hdf5-1.10.5/hl/src/H5LDprivate.h +index b52928b53..5f02ea781 100644 +--- a/hdf5-1.10.5/hl/src/H5LDprivate.h ++++ b/hdf5-1.10.5/hl/src/H5LDprivate.h +@@ -40,8 +40,8 @@ typedef struct H5LD_memb_t { + * #2: these two routines are too specific to be made as public routines + * Decide to do #3 at this point of time after some discussion. + */ +-void H5LD_clean_vector(H5LD_memb_t *listv[]); +-int H5LD_construct_vector(char *fields, H5LD_memb_t *listv[], hid_t par_tid); ++H5_HLDLL void H5LD_clean_vector(H5LD_memb_t *listv[]); ++H5_HLDLL int H5LD_construct_vector(char *fields, H5LD_memb_t *listv[], hid_t par_tid); + + #endif /* end _H5LDprivate_H */ + diff --git a/ports/hdf5/portfile.cmake b/ports/hdf5/portfile.cmake index 481f96870c54c1..cf2be8af7bc968 100644 --- a/ports/hdf5/portfile.cmake +++ b/ports/hdf5/portfile.cmake @@ -11,8 +11,10 @@ vcpkg_extract_source_archive_ex( ARCHIVE ${ARCHIVE} REF hdf5 PATCHES - hdf5_config.patch - fix-generate.patch + hdf5_config.patch + fix-generate.patch # removes the build of static targets in shared builds + static-targets.patch # maps the internal static tagets to the shared targets if building as a dynamic library + export-private.patch # exports two additional functions in shared builds to make hl/tools/h5watch build in shared builds. ) if ("parallel" IN_LIST FEATURES AND "cpp" IN_LIST FEATURES) @@ -66,86 +68,25 @@ string(REPLACE [[${HDF5_PACKAGE_NAME}_TOOLS_DIR "${PACKAGE_PREFIX_DIR}/bin"]] [[ file(WRITE "${CURRENT_PACKAGES_DIR}/share/hdf5/hdf5-config.cmake" ${contents}) if(FEATURES MATCHES "tools") - if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/bin) - if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") # waiting for single build PR to get merged - set(DEBUG_SHARED_BINS - ${CURRENT_PACKAGES_DIR}/debug/bin/h5copy-shared${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/debug/bin/h5diff-shared${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/debug/bin/h5dump-shared${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/debug/bin/h5ls-shared${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/debug/bin/h5repack-shared${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/debug/bin/h5stat-shared${VCPKG_TARGET_EXECUTABLE_SUFFIX}) - else() - set(DEBUG_SHARED_BINS ) - endif() - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/gif2h5${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/debug/bin/h52gif${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/debug/bin/h5clear${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/debug/bin/h5copy${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/debug/bin/h5debug${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/debug/bin/h5diff${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/debug/bin/h5dump${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/debug/bin/h5format_convert${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/debug/bin/h5import${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/debug/bin/h5jam${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/debug/bin/h5ls${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/debug/bin/h5mkgrp${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/debug/bin/h5repack${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/debug/bin/h5repart${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/debug/bin/h5stat${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/debug/bin/h5unjam${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/debug/bin/h5watch${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${DEBUG_SHARED_BINS}) - endif() - if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") # waiting for single build PR to get merged - set(RELEASE_SHARED_BINS - ${CURRENT_PACKAGES_DIR}/bin/h5copy-shared${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/bin/h5diff-shared${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/bin/h5dump-shared${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/bin/h5ls-shared${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/bin/h5repack-shared${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/bin/h5stat-shared${VCPKG_TARGET_EXECUTABLE_SUFFIX}) + set(TOOLS h5copy h5diff h5dump h5ls h5stat gif2h5 h52gif h5clear h5debug h5format_convert h5jam h5unjam h5ls h5mkgrp h5repack h5repart h5watch ph5diff h5import) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(TOOL_SUFFIXES "-shared${VCPKG_TARGET_EXECUTABLE_SUFFIX};${VCPKG_TARGET_EXECUTABLE_SUFFIX}") else() - set(RELEASE_SHARED_BINS ) + set(TOOL_SUFFIXES "-static${VCPKG_TARGET_EXECUTABLE_SUFFIX};${VCPKG_TARGET_EXECUTABLE_SUFFIX}") endif() - file(INSTALL ${CURRENT_PACKAGES_DIR}/bin/gif2h5${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/bin/h52gif${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/bin/h5clear${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/bin/h5copy${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/bin/h5debug${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/bin/h5diff${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/bin/h5dump${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/bin/h5format_convert${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/bin/h5import${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/bin/h5jam${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/bin/h5ls${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/bin/h5mkgrp${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/bin/h5repack${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/bin/h5repart${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/bin/h5stat${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/bin/h5unjam${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/bin/h5watch${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${RELEASE_SHARED_BINS} - DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) - file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/gif2h5${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/bin/h52gif${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/bin/h5clear${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/bin/h5copy${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/bin/h5debug${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/bin/h5diff${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/bin/h5dump${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/bin/h5format_convert${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/bin/h5import${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/bin/h5jam${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/bin/h5ls${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/bin/h5mkgrp${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/bin/h5repack${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/bin/h5repart${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/bin/h5stat${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/bin/h5unjam${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/bin/h5watch${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${RELEASE_SHARED_BINS} - ) + + foreach(tool ${TOOLS}) + foreach(suffix ${TOOL_SUFFIXES}) + if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/${tool}${suffix}") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/${tool}${suffix}") + endif() + if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/${tool}${suffix}") + file(INSTALL "${CURRENT_PACKAGES_DIR}/bin/${tool}${suffix}" + DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/${tool}${suffix}") + endif() + endforeach() + endforeach() vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) endif() diff --git a/ports/hdf5/static-targets.patch b/ports/hdf5/static-targets.patch new file mode 100644 index 00000000000000..3e3dfb181750c4 --- /dev/null +++ b/ports/hdf5/static-targets.patch @@ -0,0 +1,37 @@ +diff --git a/hdf5-1.10.5/CMakeLists.txt b/hdf5-1.10.5/CMakeLists.txt +index 6ca2f5c54..f7a4db9e5 100644 +--- a/hdf5-1.10.5/CMakeLists.txt ++++ b/hdf5-1.10.5/CMakeLists.txt +@@ -150,6 +150,7 @@ set (HDF5_JAVA_TEST_LIB_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_JAVA_TEST_LIB + #----------------------------------------------------------------------------- + # Set the target names of all the libraries + #----------------------------------------------------------------------------- ++if(NOT BUILD_SHARED_LIBS) + set (HDF5_LIB_TARGET "${HDF5_LIB_CORENAME}-static") + set (HDF5_TEST_LIB_TARGET "${HDF5_TEST_LIB_CORENAME}-static") + set (HDF5_CPP_LIB_TARGET "${HDF5_CPP_LIB_CORENAME}-static") +@@ -162,9 +163,24 @@ set (HDF5_F90_TEST_LIB_TARGET "${HDF5_F90_TEST_LIB_CORENAME}-static") + set (HDF5_F90_C_TEST_LIB_TARGET "${HDF5_F90_C_TEST_LIB_CORENAME}-static") + set (HDF5_HL_F90_LIB_TARGET "${HDF5_HL_F90_LIB_CORENAME}-static") + set (HDF5_HL_F90_C_LIB_TARGET "${HDF5_HL_F90_C_LIB_CORENAME}-static") ++else() ++set (HDF5_LIB_TARGET "${HDF5_LIB_CORENAME}-shared") ++set (HDF5_TEST_LIB_TARGET "${HDF5_TEST_LIB_CORENAME}-shared") ++set (HDF5_CPP_LIB_TARGET "${HDF5_CPP_LIB_CORENAME}-shared") ++set (HDF5_HL_LIB_TARGET "${HDF5_HL_LIB_CORENAME}-shared") ++set (HDF5_HL_CPP_LIB_TARGET "${HDF5_HL_CPP_LIB_CORENAME}-shared") ++set (HDF5_TOOLS_LIB_TARGET "${HDF5_TOOLS_LIB_CORENAME}-shared") ++set (HDF5_F90_LIB_TARGET "${HDF5_F90_LIB_CORENAME}-shared") ++set (HDF5_F90_C_LIB_TARGET "${HDF5_F90_C_LIB_CORENAME}-shared") ++set (HDF5_F90_TEST_LIB_TARGET "${HDF5_F90_TEST_LIB_CORENAME}-shared") ++set (HDF5_F90_C_TEST_LIB_TARGET "${HDF5_F90_C_TEST_LIB_CORENAME}-shared") ++set (HDF5_HL_F90_LIB_TARGET "${HDF5_HL_F90_LIB_CORENAME}-shared") ++set (HDF5_HL_F90_C_LIB_TARGET "${HDF5_HL_F90_C_LIB_CORENAME}-shared") ++endif() + set (HDF5_JAVA_JNI_LIB_TARGET "${HDF5_JAVA_JNI_LIB_CORENAME}") + set (HDF5_JAVA_HDF5_LIB_TARGET "${HDF5_JAVA_HDF5_LIB_CORENAME}") + set (HDF5_JAVA_TEST_LIB_TARGET "${HDF5_JAVA_TEST_LIB_CORENAME}") ++ + set (HDF5_LIBSH_TARGET "${HDF5_LIB_CORENAME}-shared") + set (HDF5_TEST_LIBSH_TARGET "${HDF5_TEST_LIB_CORENAME}-shared") + set (HDF5_CPP_LIBSH_TARGET "${HDF5_CPP_LIB_CORENAME}-shared") From edf54b67bc985a6777cfbf90298210c0cdd8a703 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 22 Jan 2020 09:50:13 +0100 Subject: [PATCH 192/419] update baseline --- scripts/ci.baseline.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 8423d0f7661636..93af363f0e2fba 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1749,6 +1749,7 @@ vlpp:x64-uwp=fail #unsuporrted archietectures vtk-m:arm-uwp=skip vtk-m:arm64-windows=skip +vtk-m:x86-windows=skip vulkan:arm64-windows=fail vulkan:arm-uwp=fail vulkan:x64-linux=fail From 04896cfec6c75467bfe0a2356acb30c7ad392e11 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 22 Jan 2020 09:56:06 +0100 Subject: [PATCH 193/419] added warning about the Fortran feature. --- ports/hdf5/portfile.cmake | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ports/hdf5/portfile.cmake b/ports/hdf5/portfile.cmake index cf2be8af7bc968..c40c985649f20a 100644 --- a/ports/hdf5/portfile.cmake +++ b/ports/hdf5/portfile.cmake @@ -21,6 +21,11 @@ if ("parallel" IN_LIST FEATURES AND "cpp" IN_LIST FEATURES) message(FATAL_ERROR "Feature Parallel and C++ options are mutually exclusive.") endif() +if ("fortran" IN_LIST FEATURE) + message(WARNING "Fortran is not yet official supported within VCPKG. Build will most likly fail.") + message(STATUS "It could work in a custom or community triplet by forwarding the required enviromnent/toolchain to make it work") +endif() + vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES # <- Keyword FEATURES is required because INVERTED_FEATURES are being used parallel HDF5_ENABLE_PARALLEL From b95d159267172d4444f80860f947b5d7b874807f Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 22 Jan 2020 10:01:36 +0100 Subject: [PATCH 194/419] [cgns] use loop to remove/copy tools --- ports/cgns/portfile.cmake | 46 ++++++++++++++++----------------------- 1 file changed, 19 insertions(+), 27 deletions(-) diff --git a/ports/cgns/portfile.cmake b/ports/cgns/portfile.cmake index ab7fd2432b55cc..39b65d55f26fc2 100644 --- a/ports/cgns/portfile.cmake +++ b/ports/cgns/portfile.cmake @@ -47,40 +47,32 @@ file(REMOVE ${CURRENT_PACKAGES_DIR}/include/cgnsBuild.defs ${CURRENT_PACKAGES_DI file(INSTALL ${CURRENT_PORT_DIR}/cgnsconfig.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) # we patched the config and the include is all that is needed +set(TOOLS cgnscheck cgnscompress cgnsconvert cgnsdiff cgnslist cgnsnames) + +foreach(tool ${TOOLS}) + set(suffix ${VCPKG_TARGET_EXECUTABLE_SUFFIX}) + if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/${tool}${suffix}") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/${tool}${suffix}") + endif() + if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/${tool}${suffix}") + file(INSTALL "${CURRENT_PACKAGES_DIR}/bin/${tool}${suffix}" + DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/${tool}${suffix}") + endif() +endforeach() + +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) + IF(EXISTS ${CURRENT_PACKAGES_DIR}/debug) file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/include/cgnsBuild.defs ${CURRENT_PACKAGES_DIR}/debug/include/cgnsconfig.h) - file(REMOVE - ${CURRENT_PACKAGES_DIR}/debug/bin/cgnscheck${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/debug/bin/cgnscompress${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/debug/bin/cgnsconvert${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/debug/bin/cgnsdiff${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/debug/bin/cgnslist${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/debug/bin/cgnsnames${VCPKG_TARGET_EXECUTABLE_SUFFIX}) endif() + file(REMOVE ${CURRENT_PACKAGES_DIR}/include/cgnsBuild.defs ${CURRENT_PACKAGES_DIR}/include/cgnsconfig.h) file(GLOB_RECURSE BATCH_FILES ${CURRENT_PACKAGES_DIR}/bin/*.bat) -file(INSTALL - ${BATCH_FILES} - ${CURRENT_PACKAGES_DIR}/bin/cgnscheck${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/bin/cgnscompress${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/bin/cgnsconvert${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/bin/cgnsdiff${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/bin/cgnslist${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/bin/cgnsnames${VCPKG_TARGET_EXECUTABLE_SUFFIX} - DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) + vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) -file(REMOVE - ${BATCH_FILES} - ${CURRENT_PACKAGES_DIR}/bin/cgnscheck${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/bin/cgnscompress${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/bin/cgnsconvert${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/bin/cgnsdiff${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/bin/cgnslist${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/bin/cgnsnames${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ) - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) endif() From aec522427a65255993bacc4b25155d1b676ccccc Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 22 Jan 2020 10:11:30 +0100 Subject: [PATCH 195/419] revert changes to vcpkg_fixup_cmake_targets --- scripts/cmake/vcpkg_fixup_cmake_targets.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/cmake/vcpkg_fixup_cmake_targets.cmake b/scripts/cmake/vcpkg_fixup_cmake_targets.cmake index a936c5770b73f0..a042d9124c41ef 100644 --- a/scripts/cmake/vcpkg_fixup_cmake_targets.cmake +++ b/scripts/cmake/vcpkg_fixup_cmake_targets.cmake @@ -144,7 +144,6 @@ function(vcpkg_fixup_cmake_targets) file(GLOB_RECURSE MAIN_CMAKES "${RELEASE_SHARE}/*.cmake") foreach(MAIN_CMAKE IN LISTS MAIN_CMAKES) file(READ ${MAIN_CMAKE} _contents) - file(WRITE ${MAIN_CMAKE}.bak "${_contents}") string(REGEX REPLACE "get_filename_component\\(_IMPORT_PREFIX \"\\\${CMAKE_CURRENT_LIST_FILE}\" PATH\\)(\nget_filename_component\\(_IMPORT_PREFIX \"\\\${_IMPORT_PREFIX}\" PATH\\))*" "get_filename_component(_IMPORT_PREFIX \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)\nget_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)\nget_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)" From ede74e4c1482941f22d8f9dc57e6e3cb036cba2b Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 22 Jan 2020 10:13:37 +0100 Subject: [PATCH 196/419] revert changes to vcpkg_check_features.cmake --- scripts/cmake/vcpkg_check_features.cmake | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/cmake/vcpkg_check_features.cmake b/scripts/cmake/vcpkg_check_features.cmake index c3def2cf7f8e39..81ebc234d94720 100644 --- a/scripts/cmake/vcpkg_check_features.cmake +++ b/scripts/cmake/vcpkg_check_features.cmake @@ -169,10 +169,8 @@ function(vcpkg_check_features) set(_vcf_FEATURE_VARIABLE ${_vcf_ARG}) if(${_vcf_FEATURE_NAME} IN_LIST FEATURES) list(APPEND _vcf_FEATURE_OPTIONS "-D${_vcf_FEATURE_VARIABLE}=${_set_if}") - set(${_vcf_FEATURE_VARIABLE} ${_set_if} PARENT_SCOPE) else() list(APPEND _vcf_FEATURE_OPTIONS "-D${_vcf_FEATURE_VARIABLE}=${_set_else}") - set(${_vcf_FEATURE_VARIABLE} ${_set_else} PARENT_SCOPE) endif() set(_vcf_IS_FEATURE_NAME_ARG ON) endif() From 86d1d50cc17dbe7eb164fd098382c55255855c83 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 22 Jan 2020 10:30:36 +0100 Subject: [PATCH 197/419] revert changes to netcdf-c portfile --- ports/netcdf-c/portfile.cmake | 7 ------- 1 file changed, 7 deletions(-) diff --git a/ports/netcdf-c/portfile.cmake b/ports/netcdf-c/portfile.cmake index 30522e963dd478..61dd1d88571d8d 100644 --- a/ports/netcdf-c/portfile.cmake +++ b/ports/netcdf-c/portfile.cmake @@ -20,13 +20,6 @@ if(VCPKG_CRT_LINKAGE STREQUAL "static") else() set(NC_USE_STATIC_CRT OFF) endif() -#NC_EXTRA_DEPS -find_library(ZLIB_RELEASE NAMES z zlib PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(ZLIB_DEBUG NAMES z zlib zd zlibd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -find_library(SZIP_RELEASE NAMES libsz libszip szip sz PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(SZIP_DEBUG NAMES libsz libszip szip sz libsz_D libszip_D szip_D sz_D szip_debug PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -#find_library(CURL_RELEASE NAMES curl libcurl PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -#find_library(CURL_DEBUG NAMES curl_d libcurl_d curld libcurld curl libcurl PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} From 5815d115c0711520e1ac39d5f917df6629a71911 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 22 Jan 2020 17:02:15 +0100 Subject: [PATCH 198/419] Upgrade PCL to 1.10 and fix the build of PCL --- ports/pcl/CONTROL | 4 ++-- ports/pcl/fix_cmakelists.patch | 15 +++++++++++++++ ports/pcl/portfile.cmake | 29 +++++++++++++++-------------- 3 files changed, 32 insertions(+), 16 deletions(-) create mode 100644 ports/pcl/fix_cmakelists.patch diff --git a/ports/pcl/CONTROL b/ports/pcl/CONTROL index 9475fa417ee9a5..19c855e8d708a2 100644 --- a/ports/pcl/CONTROL +++ b/ports/pcl/CONTROL @@ -1,8 +1,8 @@ Source: pcl -Version: 1.9.1-10 +Version: 1.10.0 Homepage: https://github.com/PointCloudLibrary/pcl Description: Point Cloud Library (PCL) is open source library for 2D/3D image and point cloud processing. -Build-Depends: eigen3, flann, qhull, vtk, libpng, boost-system, boost-filesystem, boost-thread, boost-date-time, boost-iostreams, boost-random, boost-foreach, boost-dynamic-bitset, boost-property-map, boost-graph, boost-multi-array, boost-signals2, boost-ptr-container, boost-uuid, boost-interprocess, boost-asio +Build-Depends: eigen3, flann, qhull, vtk[core], libpng, boost-system, boost-filesystem, boost-thread, boost-date-time, boost-iostreams, boost-random, boost-foreach, boost-dynamic-bitset, boost-property-map, boost-graph, boost-multi-array, boost-signals2, boost-ptr-container, boost-uuid, boost-interprocess, boost-asio Feature: openni2 Description: OpenNI2 support for PCL diff --git a/ports/pcl/fix_cmakelists.patch b/ports/pcl/fix_cmakelists.patch new file mode 100644 index 00000000000000..1350c4549f2842 --- /dev/null +++ b/ports/pcl/fix_cmakelists.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 93a644876..5a2aa70af 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -144,8 +144,8 @@ if(CMAKE_COMPILER_IS_GNUCXX) + endif() + + if(CMAKE_COMPILER_IS_MSVC) +- add_definitions("-DBOOST_ALL_NO_LIB -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -DNOMINMAX -DPCL_ONLY_CORE_POINT_TYPES /bigobj ${SSE_DEFINITIONS}") +- ++ add_definitions("-DBOOST_ALL_NO_LIB -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -DNOMINMAX -DPCL_ONLY_CORE_POINT_TYPES ${SSE_DEFINITIONS}") ++ add_compile_options("/bigobj") + if("${CMAKE_CXX_FLAGS}" STREQUAL "${CMAKE_CXX_FLAGS_DEFAULT}") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj /fp:precise /wd4800 /wd4521 /wd4251 /wd4275 /wd4305 /wd4355 ${SSE_FLAGS_STR}") + diff --git a/ports/pcl/portfile.cmake b/ports/pcl/portfile.cmake index cd358d41f28fd7..25c160d408b148 100644 --- a/ports/pcl/portfile.cmake +++ b/ports/pcl/portfile.cmake @@ -1,20 +1,21 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO PointCloudLibrary/pcl - REF pcl-1.9.1 - SHA512 ca95028c23861ac2df0fa7e18fdd0202255cb2e49ab714325eb36c35289442c6eedbf489e6f9f232b30fa2a93eff4c9619f8a14d3fdfe58f353a4a6e26206bdf + REF af3ce2530b7ae8ed083a3515168626c587a5bbcd # version 1.10.0 + SHA512 ed580fa3b365f575d51ac637701760ade64cb5f925f326e0acd016e25b2054b8e272094525a6a4104834c11e6ec8743452f8ad881f90f6f212b787fe0eea2475 HEAD_REF master PATCHES - pcl_utils.patch - pcl_config.patch - use_flann_targets.patch - boost-1.70.patch - cuda_10_1.patch + #pcl_utils.patch + #pcl_config.patch + #use_flann_targets.patch + #boost-1.70.patch + #cuda_10_1.patch # Patch for https://github.com/microsoft/vcpkg/issues/7660 - use_target_link_libraries_in_pclconfig.patch + #use_target_link_libraries_in_pclconfig.patch + fix_cmakelists.patch ) -file(REMOVE ${SOURCE_PATH}/cmake/Modules/FindFLANN.cmake) +#file(REMOVE ${SOURCE_PATH}/cmake/Modules/FindFLANN.cmake) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PCL_SHARED_LIBS) @@ -36,15 +37,15 @@ vcpkg_configure_cmake( # BUILD -DBUILD_surface_on_nurbs=ON # PCL - -DPCL_BUILD_WITH_BOOST_DYNAMIC_LINKING_WIN32=${PCL_SHARED_LIBS} - -DPCL_BUILD_WITH_FLANN_DYNAMIC_LINKING_WIN32=${PCL_SHARED_LIBS} - -DPCL_BUILD_WITH_QHULL_DYNAMIC_LINKING_WIN32=${PCL_SHARED_LIBS} + -DPCL_BUILD_WITH_BOOST_DYNAMIC_LINKING_WIN32=${PCL_SHARED_LIBS} # this is incorrect + -DPCL_BUILD_WITH_FLANN_DYNAMIC_LINKING_WIN32=${PCL_SHARED_LIBS} # this is incorrect + -DPCL_BUILD_WITH_QHULL_DYNAMIC_LINKING_WIN32=${PCL_SHARED_LIBS} # this is incorrect -DPCL_SHARED_LIBS=${PCL_SHARED_LIBS} # WITH -DWITH_LIBUSB=OFF -DWITH_PNG=ON -DWITH_QHULL=ON - -DWITH_VTK=ON + -DWITH_VTK=OFF # disable due to API changes in VTK 8.9 # FEATURES ${FEATURE_OPTIONS} ) @@ -57,7 +58,7 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) if("tools" IN_LIST FEATURES) - file(GLOB EXEFILES_RELEASE ${CURRENT_PACKAGES_DIR}/bin/*.exe) + file(GLOB EXEFILES_RELEASE ${CURRENT_PACKAGES_DIR}/bin/*.exe) # This only works on Windows.... file(GLOB EXEFILES_DEBUG ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) file(COPY ${EXEFILES_RELEASE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/pcl) file(REMOVE ${EXEFILES_RELEASE} ${EXEFILES_DEBUG}) From 0982dfd79d3762133bb43925f8ce4069d20c57bb Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 22 Jan 2020 17:18:16 +0100 Subject: [PATCH 199/419] fix cmake config path --- ports/pcl/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/pcl/portfile.cmake b/ports/pcl/portfile.cmake index 25c160d408b148..fadfbfaa79c4e1 100644 --- a/ports/pcl/portfile.cmake +++ b/ports/pcl/portfile.cmake @@ -51,7 +51,7 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() -vcpkg_fixup_cmake_targets() +vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) From f3fac2aa5de20550afcc94995305abf86007692b Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 22 Jan 2020 21:20:45 +0100 Subject: [PATCH 200/419] update baseline --- scripts/ci.baseline.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 93af363f0e2fba..9a4ee04d7892fa 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1746,10 +1746,11 @@ vlpp:arm64-windows=fail vlpp:arm-uwp=fail vlpp:x64-osx=fail vlpp:x64-uwp=fail -#unsuporrted archietectures +#unsupported architectures vtk-m:arm-uwp=skip vtk-m:arm64-windows=skip vtk-m:x86-windows=skip +vtk-m:x64-uwp=skip vulkan:arm64-windows=fail vulkan:arm-uwp=fail vulkan:x64-linux=fail From ac425f42bc0b1593c0d79009c60b7e0962997e97 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 22 Jan 2020 21:20:56 +0100 Subject: [PATCH 201/419] force vtk rebuild --- ports/vtk/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL index e1fc8405c3ae04..5a27e350115875 100644 --- a/ports/vtk/CONTROL +++ b/ports/vtk/CONTROL @@ -1,5 +1,5 @@ Source: vtk -Version: 8.90-PV-v5.7 +Version: 8.90-PV-v5.7_1 Description: Software system for 3D computer graphics, image processing, and visualization Homepage: https://github.com/Kitware/VTK Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, liblzma, libtheora, eigen3, double-conversion, pugixml, libharu[notiffsymbols], sqlite3, netcdf-c, utfcpp, libogg From 2a7f323a92c36f937fc64dfb121b7b60a28153cb Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 22 Jan 2020 22:10:13 +0100 Subject: [PATCH 202/419] introduce vtk-m selector to vtk --- ports/vtk/CONTROL | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL index 5a27e350115875..eabd3f0f68c2ee 100644 --- a/ports/vtk/CONTROL +++ b/ports/vtk/CONTROL @@ -2,11 +2,16 @@ Source: vtk Version: 8.90-PV-v5.7_1 Description: Software system for 3D computer graphics, image processing, and visualization Homepage: https://github.com/Kitware/VTK +Default-Features: selectvtkm Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, liblzma, libtheora, eigen3, double-conversion, pugixml, libharu[notiffsymbols], sqlite3, netcdf-c, utfcpp, libogg +Feature: selectvtkm +Description: Selector to decide if VTK will be build with VTK-m accelerators. +Build-Depends: vtk[vtkm] (!arm&x64&!uwp) + Feature: vtkm Description: Build with vtk-m accelerator and module. -Build-Depends: vtk-m +Build-Depends: vtk-m (!arm&x64&!uwp) Feature: openvr Description: OpenVR functionality for VTK From a03d3d16daef51857391ab68d7f4345104ca1ca9 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 22 Jan 2020 22:44:58 +0100 Subject: [PATCH 203/419] revert change to ci.baseline --- scripts/ci.baseline.txt | 3669 ++++++++++++++++++++------------------- 1 file changed, 1836 insertions(+), 1833 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index cbc1f0a0f85913..e17703b3be61db 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1,1833 +1,1836 @@ -########################################################################### -## This file defines the current expected build state of ports in CI. -## -## States -## pass - (default) the port builds in the CI system. If a port is -## missing from this file then it is assumed to build. -## fail - the port does not build in the CI system. -## This is not necessarily the same as if a port is expected to build -## on a developers machine because it may fail due to the machine -## configuration. When set to fail the CI system will still attempt -## to build the port and will report a CI failure until this file is updated. -## skip - Do not build this port in the CI system. -## This is added to ports that may be flaky or conflict with other -## ports. Please comment for why a port is skipped so it can be -## removed when the issue is resolved. -## ignore - attempt to build the port, but do not fail the CI test if the -## port does not build. Any ignored build failures will be reported -## in the test summary. -## -## -## CI tested triplets: -## arm64-windows -## arm-uwp -## x64-linux -## x64-osx -## x64-uwp -## x64-windows -## x64-windows-static -## x86-windows -## - - -# Add new items alphabetically - -3fd:arm64-windows=fail -3fd:arm-uwp=fail -3fd:x64-linux=fail -3fd:x64-osx=fail -3fd:x64-windows=fail -3fd:x64-windows-static=fail -3fd:x86-windows=ignore -7zip:arm64-windows=fail -7zip:arm-uwp=fail -7zip:x64-linux=fail -7zip:x64-osx=fail -7zip:x64-uwp=fail -abseil:arm-uwp=fail -abseil:x64-uwp=fail -ace:arm64-windows=fail -ace:arm-uwp=fail -ace:x64-osx=fail -ace:x64-uwp=fail -activemq-cpp:x64-windows-static=fail -akali:x64-uwp=fail -akali:arm-uwp=fail -akali:arm64-windows=fail -alac:arm-uwp=fail -alac:x64-uwp=fail -alembic:x64-linux=fail -alembic:x64-osx=fail -alembic:x64-windows-static=fail -ampl-mp:arm64-windows=fail -ampl-mp:arm-uwp=fail -ampl-mp:x64-uwp=fail -angelscript:arm64-windows=fail -angelscript:arm-uwp=fail - -# Conflicts with qt5-base and ms-angle -angle:arm64-windows = skip -angle:arm-uwp = skip -angle:x64-uwp = skip -angle:x64-windows = skip -angle:x64-windows-static = skip -angle:x86-windows = skip -antlr4:arm64-windows=fail -antlr4:arm-uwp=fail -antlr4:x64-uwp=fail -anyrpc:arm-uwp=ignore -anyrpg:x64-uwp=ignore -anyrpc:x64-windows-static=ignore -apr:arm64-windows=fail -apr:arm-uwp=fail -apr:x64-linux=fail -apr:x64-osx=fail -apr:x64-uwp=fail -argtable2:arm-uwp=fail -argtable2:x64-uwp=fail -arrow:arm64-windows=fail -arrow:x64-linux=fail -arrow:x86-windows=fail -asmjit:arm64-windows=fail -asmjit:arm-uwp=fail -asyncplusplus:arm-uwp=fail -asyncplusplus:x64-uwp=fail -atk:x64-osx=fail -atkmm:x64-linux=fail -atlmfc:x64-linux=fail -atlmfc:x64-osx=fail -aubio:x64-linux=fail -aubio:x64-osx=fail -avro-c:arm-uwp=fail -avro-c:x64-linux=fail -avro-c:x64-osx=fail -avro-c:x64-uwp=fail -aws-c-common:arm64-windows=fail -aws-c-common:arm-uwp=fail -aws-c-common:x64-uwp=fail -aws-checksums:arm64-windows=fail -aws-lambda-cpp:arm64-windows=fail -aws-lambda-cpp:arm-uwp=fail -aws-lambda-cpp:x64-uwp=fail -aws-lambda-cpp:x64-windows=fail -aws-lambda-cpp:x64-windows-static=fail -aws-lambda-cpp:x86-windows=fail -aws-sdk-cpp:x64-linux=ignore -azure-c-shared-utility:arm-uwp=fail -azure-c-shared-utility:x64-uwp=fail -basisu:x64-linux=ignore -bde:arm64-windows=fail -bde:arm-uwp=fail -bde:x64-uwp=fail -bde:x64-windows=fail -bde:x64-windows-static=fail -bde:x86-windows=fail -benchmark:arm64-windows=fail -benchmark:arm-uwp=fail -benchmark:x64-uwp=fail -berkeleydb:arm64-windows=fail -berkeleydb:arm-uwp=fail -berkeleydb:x64-linux=fail -berkeleydb:x64-osx=fail -berkeleydb:x64-uwp=fail -blaze:x64-windows=fail -blaze:x64-windows-static=fail -blaze:x86-windows=fail -blend2d:arm64-windows=fail -blend2d:arm-uwp=fail -blend2d:x64-uwp=fail -blosc:arm64-windows=fail -blosc:arm-uwp=fail -blosc:x64-uwp=fail -bond:arm-uwp=fail -bond:x64-osx=fail -bond:x64-uwp=fail -boost-context:arm-uwp=fail -boost-context:x64-uwp=fail -boost-coroutine:arm-uwp=fail -boost-coroutine:arm64-windows=fail -boost-coroutine:x64-uwp=fail -boost-fiber:arm-uwp=fail -boost-fiber:arm64-windows=fail -boost-fiber:x64-osx=fail -boost-fiber:x64-uwp=fail -boost-fiber:x64-linux=ignore -boost-filesystem:arm-uwp=fail -boost-filesystem:x64-uwp=fail -boost-iostreams:arm-uwp=fail -boost-iostreams:x64-uwp=fail -boost-locale:arm-uwp=fail -boost-locale:x64-uwp=fail -boost-log:arm-uwp=fail -boost-log:x64-uwp=fail -boost-python:x64-linux=ignore -boost-mpi:x64-linux=fail -boost-mpi:x64-osx=fail -boost-stacktrace:arm-uwp=fail -boost-stacktrace:x64-uwp=fail -boost-test:arm-uwp=fail -boost-test:x64-uwp=fail -boost-wave:arm-uwp=fail -boost-wave:x64-uwp=fail -botan:arm64-windows=fail -botan:arm-uwp=fail -botan:x64-uwp=fail -box2d:x64-uwp=fail -box2d:arm-uwp=fail -breakpad:arm64-windows=fail -breakpad:x64-osx=fail -brotli:arm-uwp=fail -brotli:x64-uwp=fail -bullet3:arm64-windows=fail -bullet3:arm-uwp=fail -bullet3:x64-uwp=fail -butteraugli:x64-linux=ignore -caf:arm-uwp=fail -caf:arm64-windows=fail -caf:x64-uwp=fail -caf:x64-linux=ignore -caffe2:x86-windows=fail -cairomm:x64-linux=fail -capnproto:arm64-windows=fail -capnproto:arm-uwp=fail -capnproto:x64-uwp=fail -c-ares:arm-uwp=fail -c-ares:x64-uwp=fail -cartographer:x64-osx=fail -casclib:arm-uwp=fail -casclib:x64-uwp=fail -catch-classic:arm64-windows = skip -catch-classic:arm-uwp = skip -catch-classic:x64-linux = skip -catch-classic:x64-osx = skip -catch-classic:x64-uwp = skip -catch-classic:x64-windows = skip -catch-classic:x64-windows-static = skip -catch-classic:x86-windows = skip -ccd:arm-uwp=fail -ccd:x64-uwp=fail -cello:arm-uwp=fail -cello:x64-uwp=fail -cfitsio:arm-uwp=fail -cfitsio:x64-uwp=fail -cgicc:arm-uwp=fail -cgicc:x64-uwp=fail -chakracore:arm64-windows=fail -chakracore:arm-uwp=fail -chakracore:x64-linux=fail -chakracore:x64-osx=fail -chakracore:x64-uwp=fail -chakracore:x64-windows-static=fail -chartdir:arm64-windows=fail -chartdir:arm-uwp=fail -chartdir:x64-uwp=fail -chartdir:x64-windows-static=fail -chipmunk:arm64-windows=fail -chipmunk:arm-uwp=fail -chipmunk:x64-linux=fail -chipmunk:x64-osx=fail -chipmunk:x64-uwp=fail -chmlib:arm-uwp=fail -chmlib:x64-uwp=fail -civetweb:arm64-windows = skip -civetweb:arm-uwp = skip -civetweb:x64-linux = skip -civetweb:x64-osx = skip -civetweb:x64-uwp = skip -civetweb:x64-windows = skip -civetweb:x64-windows-static = skip -civetweb:x86-windows = skip -clapack:x64-uwp=fail -clblast:x64-osx=ignore -clblast:x64-linux=fail -clblast:x64-windows-static=fail -clockutils:x64-linux=fail -clockutils:x64-osx=fail -cmark:x64-windows-static=fail -cmcstl2:arm64-windows = skip -cmcstl2:arm-uwp = skip -cmcstl2:x64-linux = skip -cmcstl2:x64-osx = skip -cmcstl2:x64-uwp = skip -cmcstl2:x64-windows = skip -cmcstl2:x64-windows-static = skip -cmcstl2:x86-windows = skip -collada-dom:x64-osx=fail -collada-dom:x64-windows-static=fail -coolprop:arm-uwp=fail -coolprop:x64-linux=fail -coolprop:x64-osx=fail -coolprop:x64-uwp=fail -coroutine:arm-uwp=fail -coroutine:x64-linux=fail -coroutine:x64-uwp=fail -coroutine:x86-windows=fail -corrade:arm64-windows=fail -corrade:arm-uwp=fail -corrade:x64-uwp=fail -cppcms:x64-linux=fail -cppcms:x64-osx=fail -cppcms:x64-windows-static=fail -cppfs:arm-uwp=fail -cppfs:x64-uwp=fail -cppgraphqlgen:arm-uwp=fail -cppgraphqlgen:x64-uwp=ignore -cppkafka:x64-linux=ignore -cppmicroservices:x86-windows=fail -cppmicroservices:x64-windows=fail -cppmicroservices:arm64-windows=fail -cppmicroservices:arm-uwp=fail -cppmicroservices:x64-uwp=fail -cpp-netlib:arm-uwp=fail -cpp-netlib:x64-uwp=fail -cpp-netlib:x64-linux=ignore -cpprestsdk:arm-uwp=fail -cpprestsdk:x64-uwp=fail -cpp-taskflow:x64-osx=fail -cppunit:arm64-windows=fail -cppunit:arm-uwp=fail -cppunit:x64-linux=fail -cppunit:x64-osx=fail -cppunit:x64-uwp=fail -cpr:x64-linux=ignore -cpuinfo:arm64-windows=ignore -crfsuite:arm-uwp=fail -crfsuite:x64-uwp=fail -crossguid:x64-osx=fail -cspice:arm-uwp=fail -cspice:x64-uwp=fail -ctemplate:arm64-windows=fail -ctemplate:arm-uwp=fail -ctemplate:x64-linux=fail -ctemplate:x64-osx=fail -cuda:x64-linux=fail -cuda:x64-osx=fail -cudnn:arm64-windows=fail -cudnn:arm-uwp=fail -cudnn:x64-uwp=fail -cudnn:x64-windows-static=fail -cudnn:x86-windows=fail -darknet:arm-uwp=fail -darknet:x64-uwp=fail -date:arm64-windows=fail -dbow2:x64-osx=fail -dcmtk:arm64-windows=fail -dcmtk:arm-uwp=fail -dcmtk:x64-uwp=fail -detours:x64-linux=fail -detours:x64-osx=fail -devicenameresolver:arm-uwp=fail -devicenameresolver:x64-linux=fail -devicenameresolver:x64-osx=fail -devicenameresolver:x64-uwp=fail -devicenameresolver:x64-windows-static=fail -dimcli:arm-uwp=fail -dimcli:x64-osx=fail -dimcli:x64-uwp=fail -directxmesh:x64-linux=fail -directxmesh:x64-osx=fail -directxmesh:x64-windows-static=fail -directxtex:x64-linux=fail -directxtex:x64-osx=fail -directxtex:x64-windows-static=fail -directxtk:x64-linux=fail -directxtk:x64-osx=fail -directxtk:x64-windows-static=fail -directxtk12:x64-linux=fail -directxtk12:x64-osx=fail -directxtk12:x64-windows-static=fail -discord-rpc:arm-uwp=fail -discord-rpc:x64-uwp=fail -dlfcn-win32:arm-uwp=fail -dlfcn-win32:x64-linux=fail -dlfcn-win32:x64-osx=fail -dlfcn-win32:x64-uwp=fail -dmlc:arm-uwp=fail -dmlc:x64-uwp=fail -dmlc:x64-windows-static=ignore -dmlc:x86-windows=ignore -dpdk:arm64-windows=fail -dpdk:arm-uwp=fail -dpdk:x64-osx=fail -dpdk:x64-uwp=fail -dpdk:x64-windows=fail -dpdk:x64-windows-static=fail -dpdk:x86-windows=fail -duckx:arm64-windows = skip -duckx:arm-uwp = skip -duckx:x64-linux = skip -duckx:x64-osx = skip -duckx:x64-uwp = skip -duckx:x64-windows = skip -duckx:x64-windows-static = skip -duckx:x86-windows = skip -duilib:arm-uwp=fail -duilib:x64-linux=fail -duilib:x64-osx=fail -duilib:x64-uwp=fail -dxut:arm64-windows=fail -dxut:arm-uwp=fail -dxut:x64-linux=fail -dxut:x64-osx=fail -dxut:x64-windows-static=fail -eastl:arm64-windows=fail -eastl:arm-uwp=fail -easyhook:arm64-windows=fail -easyhook:arm-uwp=fail -easyhook:x64-linux=fail -easyhook:x64-osx=fail -easyhook:x64-uwp=fail -easyhook:x64-windows-static=fail -easyloggingpp:arm-uwp=fail -easyloggingpp:x64-uwp=fail -ebml:arm-uwp=fail -ebml:x64-uwp=fail -ecm:arm64-windows = skip -ecm:arm-uwp = skip -ecm:x64-linux = skip -ecm:x64-osx = skip -ecm:x64-uwp = skip -ecm:x64-windows = skip -ecm:x64-windows-static = skip -ecm:x86-windows = skip -ecsutil:arm64-windows=fail -ecsutil:arm-uwp=fail -ecsutil:x64-linux=fail -ecsutil:x64-osx=fail -ecsutil:x64-uwp=fail -embree2:x64-linux=fail -embree2:x64-osx=fail -embree2:x64-windows-static=fail -enet:arm-uwp=fail -enet:x64-uwp=fail -epsilon:arm-uwp=fail -epsilon:x64-linux=fail -epsilon:x64-osx=fail -epsilon:x64-uwp=fail -evpp:x64-osx=fail -expat:arm-uwp=fail -expat:x64-uwp=fail -faad2:x64-linux=fail -faad2:x64-osx=fail -fann:arm-uwp=fail -fann:x64-linux=fail -fann:x64-osx=fail -fann:x64-uwp=fail -fann:x64-windows-static=fail -fastcdr:x64-linux=fail -fastrtps:arm-uwp=fail -fastrtps:x64-linux=fail -fastrtps:x64-osx=fail -fastrtps:x64-uwp=fail -fastrtps:x64-windows-static=fail -fdk-aac:arm64-windows=fail -fdk-aac:arm-uwp=fail -fdk-aac:x64-uwp=fail -fdlibm:arm-uwp=fail -fdlibm:x64-uwp=fail -fftw3:arm-uwp=fail -fftw3:x64-uwp=fail -field3d:x64-windows=fail -field3d:x64-windows-static=fail -field3d:x86-windows=fail -fizz:x64-windows=fail -fizz:x64-windows-static=fail -flint:x64-linux=fail -flint:x64-osx=fail -fltk:arm-uwp=fail -fltk:x64-linux=fail -fltk:x64-osx=fail -fltk:x64-uwp=fail -fluidsynth:x64-linux=fail -fluidsynth:x64-osx=fail -fmem:arm-uwp=fail -fmem:x64-uwp=fail -fmi4cpp:arm-uwp=fail -fmi4cpp:x64-uwp=fail -fmilib:arm64-windows=fail -fmilib:arm-uwp=fail -fmilib:x64-linux=ignore -fmilib:x64-uwp=fail -fmilib:x64-windows=ignore -fmilib:x64-windows-static=ignore -fmilib:x86-windows=ignore -# Folly fails due to a compiler bug in MSVC 19.22.27905, fixed in newer releases -folly:arm64-windows=fail -folly:x86-windows=fail -folly:x64-windows=fail -folly:x64-windows-static=fail -foonathan-memory:arm64-windows=fail -foonathan-memory:arm-uwp=fail -foonathan-memory:x64-uwp=fail -forge:x86-windows=fail -freeglut:arm64-windows=fail -freeglut:arm-uwp=fail -freeglut:x64-uwp=fail -freeglut:x64-osx=fail -freerdp:arm64-windows=fail -freerdp:arm-uwp=fail -freerdp:x64-osx=fail -freerdp:x64-uwp=fail -freetds:arm64-windows=fail -freetds:arm-uwp=fail -freetds:x64-linux=fail -freetds:x64-osx=fail -freetds:x64-uwp=fail -freetype-gl:x64-uwp=fail -freexl:arm-uwp=fail -freexl:arm64-windows=ignore -freexl:x64-uwp=fail -freexl:x86-windows=ignore -freexl:x64-windows=ignore -freexl:x64-windows-static=ignore -fribidi:arm64-windows=fail -fribidi:arm-uwp=fail -fribidi:x64-linux=fail -fribidi:x64-osx=fail -fribidi:x64-uwp=fail -ftgl:x64-linux=fail -ftgl:x64-osx=fail -ftgl:x64-uwp=fail -fuzzylite:arm-uwp=fail -fuzzylite:x64-linux=fail -fuzzylite:x64-osx=fail -fuzzylite:x64-uwp=fail -g3log:arm64-windows=fail -g3log:arm-uwp=fail -g3log:x64-uwp=fail -gainput:arm-uwp=fail -gainput:x64-linux=fail -gainput:x64-uwp=fail -gainput:x64-windows-static=fail -gamma:x64-linux=fail -gamma:x64-osx=fail -gdcm:arm64-windows=fail -gdcm:x64-linux = skip -geographiclib:x64-linux=ignore -geos:arm-uwp=fail -geos:x64-uwp=fail -getopt:arm-uwp=fail -getopt:x64-uwp=fail -getopt-win32:arm64-windows=fail -getopt-win32:arm-uwp=fail -getopt-win32:x64-linux=fail -getopt-win32:x64-osx=fail -getopt-win32:x64-uwp=fail -getopt-win32:x64-windows-static=fail -gflags:arm-uwp=fail -gflags:x64-uwp=fail - -# Conflicts with libevent -gherkin-c:arm64-windows = skip -gherkin-c:arm-uwp = skip -gherkin-c:x64-linux=fail -gherkin-c:x64-osx=fail -gherkin-c:x64-uwp = skip -gherkin-c:x64-windows = skip -gherkin-c:x64-windows-static = skip -gherkin-c:x86-windows = skip -gl3w:arm64-windows=fail -gl3w:arm-uwp=fail -glew:arm64-windows=fail -glew:arm-uwp=fail -glfw3:arm64-windows=fail -glfw3:arm-uwp=fail -glfw3:x64-uwp=fail -glib:x64-uwp=fail -glib:x64-windows-static=fail -glib:x64-osx=fail -globjects:x64-linux=ignore -gmmlib:arm64-windows=fail -gmmlib:arm-uwp=fail -gmmlib:x64-osx=fail -gmmlib:x64-uwp=fail -gmmlib:x64-windows=fail -gmmlib:x64-windows-static=fail -gmmlib:x86-windows=fail -googleapis:arm64-windows=fail -googleapis:arm-uwp=fail -googleapis:x64-uwp=fail -google-cloud-cpp:x64-linux=ignore -google-cloud-cpp-spanner:x86-windows=fail -gppanel:x64-osx=fail -gperf:x64-uwp=fail -gperf:arm-uwp=fail -graphicsmagick:arm64-windows=fail -graphicsmagick:arm-uwp=fail -graphicsmagick:x64-uwp=fail -graphite2:arm-uwp=fail -graphite2:x64-uwp=fail -graphqlparser:arm-uwp=fail -graphqlparser:x64-uwp=fail -grpc:arm-uwp=fail -grpc:x64-uwp=fail -gsl:arm-uwp=fail -gsl:x64-uwp=fail -gsoap:arm-uwp=ignore -gsoap:x64-linux=fail -gsoap:x64-osx=fail -gsoap:x86-windows=ignore -gtk:x64-linux=fail -gtk:x86-windows=ignore -gts:x64-linux=fail -gts:x64-osx=fail -guetzli:x64-osx=fail -halide:x64-windows-static=fail -hdf5:arm64-windows=fail -hdf5:arm-uwp=fail -hdf5:x64-uwp=fail -hidapi:arm64-windows=fail -hidapi:arm-uwp=fail -hidapi:x64-linux=fail -hidapi:x64-osx=fail -hidapi:x64-uwp=fail -hiredis:arm-uwp=fail -hiredis:x64-uwp=fail -hpx:x64-windows-static=fail -hunspell:x64-linux=fail -hunspell:x64-osx=fail -hwloc:arm64-windows=fail -hwloc:arm-uwp=fail -hwloc:x64-linux=fail -hwloc:x64-osx=fail -hwloc:x64-uwp=fail -hyperscan:x64-linux=ignore -hypre:x64-linux=fail -hypre:x64-osx=fail -icu:arm64-windows=fail -icu:arm-uwp=fail -icu:x64-uwp=fail -ignition-msgs1:arm64-windows=fail -ignition-msgs1:arm-uwp=fail -ignition-msgs1:x64-uwp=fail -imgui:arm-uwp=fail -imgui:x64-uwp=fail -imgui-sfml:x64-linux=ignore -intel-ipsec:arm64-windows=fail -intel-ipsec:arm-uwp=fail -intel-ipsec:x64-osx=fail -intel-ipsec:x64-uwp=fail -intel-ipsec:x64-windows=fail -intel-ipsec:x64-windows-static=fail -intel-ipsec:x86-windows=fail -intel-mkl:arm64-windows=fail -intel-mkl:arm-uwp=fail -intel-mkl:x64-linux=fail -intel-mkl:x64-osx=fail -intel-mkl:x64-uwp=fail -intel-mkl:x64-windows=fail -intel-mkl:x64-windows-static=fail -intel-mkl:x86-windows=fail -intelrdfpmathlib:arm-uwp=fail -intelrdfpmathlib:x64-linux=fail -intelrdfpmathlib:x64-uwp=fail -io2d:x64-linux=fail -irrlicht:arm64-windows=fail -irrlicht:arm-uwp=fail -irrlicht:x64-osx=fail -irrlicht:x64-uwp=fail -isal:arm64-windows=fail -isal:arm-uwp=fail -isal:x64-osx=fail -isal:x64-uwp=fail -isal:x64-windows=fail -isal:x64-windows-static=fail -isal:x86-windows=fail -itk:x64-windows=fail -itk:x64-windows-static=fail -itk:x86-windows=fail -ixwebsocket:x64-linux=ignore -jack2:arm-uwp=fail -jack2:x64-uwp=fail -jbig2dec:arm-uwp=fail -jbig2dec:x64-uwp=fail -jemalloc:arm64-windows=fail -jemalloc:arm-uwp=fail -jemalloc:x64-linux=fail -jemalloc:x64-osx=fail -jemalloc:x64-uwp=fail -jemalloc:x64-windows-static=fail -jinja2cpplight:arm-uwp=fail -jinja2cpplight:x64-uwp=fail -jsonnet:x64-osx=fail -kd-soap:x64-linux=fail -kd-soap:x64-osx=fail -kd-soap:x64-windows-static=fail -keystone:arm64-windows=fail -keystone:arm-uwp=fail -keystone:x64-uwp=fail -kinectsdk1:arm64-windows=fail -kinectsdk1:arm-uwp=fail -kinectsdk1:x64-linux=fail -kinectsdk1:x64-osx=fail -kinectsdk2:arm64-windows=fail -kinectsdk2:arm-uwp=fail -kinectsdk2:x64-linux=fail -kinectsdk2:x64-osx=fail -lastools:arm-uwp=fail -lastools:x64-uwp=fail -laszip:arm-uwp=fail -laszip:x64-uwp=fail -lcm:x64-linux=fail -lcm:x64-osx=fail -leptonica:x64-uwp=fail -leptonica:arm-uwp=fail -leveldb:arm-uwp=fail -leveldb:x64-uwp=fail -libaiff:x64-linux=fail -libarchive:arm64-windows=fail -libarchive:arm-uwp=fail -libarchive:x64-uwp=fail -libass:x64-windows-static=fail -libb2:x86-windows=fail -libb2:x64-windows=fail -libb2:x64-windows-static=fail -libb2:x64-uwp=fail -libb2:arm64-windows=fail -libb2:arm-uwp=fail -libb2:x64-osx=fail -libbf:arm64-windows=fail -libbf:arm-uwp=fail -libbf:x64-uwp=fail -libbf:x64-windows=fail -libbf:x64-windows-static=fail -libbf:x86-windows=fail -libbson:arm-uwp=fail -libbson:x64-uwp=fail -libcds:arm64-windows=fail -libcds:arm-uwp=fail -libcds:x64-uwp=fail -libconfig:x64-osx=fail -libcopp:arm64-windows=fail -libcopp:arm-uwp=fail -libcopp:x64-windows-static=fail -libdatrie:x64-linux=fail -libdatrie:x64-osx=fail -libdisasm:arm-uwp=fail -libdisasm:x64-uwp=fail -libdshowcapture:arm64-windows=fail -libdshowcapture:arm-uwp=fail -libdshowcapture:x64-linux=fail -libdshowcapture:x64-osx=fail -libdshowcapture:x64-uwp=fail -libepoxy:arm64-windows=fail -libepoxy:arm-uwp=fail -libepoxy:x64-osx=fail -libepoxy:x64-uwp=fail -libepoxy:x64-windows-static=fail -libevent:arm-uwp=fail -libevent:x64-uwp=fail -libevhtp:x86-windows=fail -libevhtp:x64-windows=fail -libevhtp:x64-windows-static=fail -libevhtp:x64-uwp=fail -libevhtp:arm64-windows=fail -libevhtp:arm-uwp=fail -libexif:arm-uwp=fail -libexif:x64-uwp=fail -libfabric:arm-uwp=fail -libfabric:x64-linux=fail -libfabric:x64-osx=fail -libfabric:x64-uwp=fail -libfabric:x64-windows=ignore -libffi:arm64-windows=fail -libffi:arm-uwp=fail -libfreenect2:arm64-windows=fail -libgd:x64-linux=ignore -libgit2:arm64-windows=fail -libgit2:arm-uwp=fail -libgit2:x64-uwp=fail -libgo:arm64-windows=fail -libgo:x64-linux=fail -libgo:x64-osx=fail -libgo:x64-windows=fail -libgo:x64-windows-static=fail -libgo:x86-windows=fail -libhydrogen:arm64-windows=fail -libics:arm-uwp=fail -libics:x64-uwp=fail -libidn2:x64-linux=fail -libidn2:x64-osx=fail -libigl:arm64-windows=fail -libigl:arm-uwp=fail -libigl:x64-uwp=fail -liblemon:arm-uwp=fail -liblemon:x64-uwp=fail -liblinear:arm-uwp=fail -liblinear:x64-uwp=fail -liblo:arm-uwp=fail -liblo:x64-linux=fail -liblo:x64-osx=fail -liblo:x64-uwp=fail -liblsl:arm64-windows=fail -liblsl:arm-uwp=fail -liblsl:x64-linux=fail -liblsl:x64-osx=fail -liblsl:x64-uwp=fail -libmad:arm-uwp=fail -libmad:x64-uwp=fail -libmagic:x86-windows=fail -libmagic:x64-windows=fail -libmagic:x64-windows-static=fail -libmagic:x64-uwp=fail -libmagic:arm64-windows=fail -libmagic:arm-uwp=fail -libmariadb:arm64-windows = skip -libmariadb:arm-uwp = skip -libmariadb:x64-linux = skip -libmariadb:x64-osx = skip -libmariadb:x64-uwp = skip -libmariadb:x64-windows = skip -libmariadb:x64-windows-static = skip -libmariadb:x86-windows = skip -libmesh:arm64-windows=fail -libmesh:arm-uwp=fail -libmesh:x64-uwp=fail -libmesh:x64-windows=fail -libmesh:x64-windows-static=fail -libmesh:x86-windows=fail -libmicrohttpd:arm64-windows=fail -libmicrohttpd:arm-uwp=fail -libmicrohttpd:x64-linux=fail -libmicrohttpd:x64-osx=fail -libmicrohttpd:x64-uwp=fail -libmodbus:arm-uwp=fail -libmodbus:x64-uwp=fail -libmodman:arm-uwp=fail -libmodman:x64-uwp=fail -libmodman:x64-windows-static=fail -libmodplug:arm-uwp=fail -libmodplug:x64-uwp=fail -libmupdf:x64-linux=fail -libmupdf:x64-osx=fail -libmysql:x64-osx=fail -libmysql:x86-windows=fail -libnice:x64-linux=fail -libnice:x64-osx=fail -libodb-boost:x64-linux=ignore -libodb-pgsql:x64-linux=ignore -libodb-pgsql:x64-windows=ignore -libopenmpt:x64-linux=fail -libopenmpt:x64-osx=fail -libopusenc:arm-uwp=fail -libopusenc:x64-linux=fail -libopusenc:x64-osx=fail -libopusenc:x64-uwp=fail -libosip2:arm64-windows=fail -libosip2:arm-uwp=fail -libosip2:x64-uwp=fail -libosip2:x64-windows=fail -libosip2:x64-windows-static=fail -libosip2:x86-windows=fail -libp7-baical:arm64-windows = skip -libp7-baical:arm-uwp = skip -libp7-baical:x64-linux = skip -libp7-baical:x64-osx = skip -libp7-baical:x64-uwp = skip -libp7-baical:x64-windows = skip -libp7-baical:x64-windows-static = skip -libp7-baical:x86-windows = skip -libp7client:arm64-windows=fail -libp7client:arm-uwp=fail -libp7client:x64-linux=fail -libp7client:x64-osx=fail -libp7client:x64-uwp=fail -libpcap:arm64-windows=fail -libpcap:arm-uwp=fail -libpcap:x64-osx=fail -libpcap:x64-uwp=fail -libpcap:x64-windows=fail -libpcap:x64-windows-static=fail -libpcap:x86-windows=fail -libpff:arm-uwp=fail -libpff:x64-linux=fail -libpff:x64-osx=fail -libpff:x64-uwp=fail -libpff:x64-windows-static=fail -libplist:x64-windows-static=fail -libpng-apng:arm64-windows = skip -libpng-apng:arm-uwp = skip -libpng-apng:x64-linux = skip -libpng-apng:x64-osx = skip -libpng-apng:x64-uwp = skip -libpng-apng:x64-windows = skip -libpng-apng:x64-windows-static = skip -libpng-apng:x86-windows = skip -libpq:arm-uwp=fail -libpq:x64-uwp=fail -librabbitmq:x64-linux=ignore -libraqm:x64-windows-static=fail -librdkafka:arm-uwp=fail -librdkafka:x64-uwp=fail - -# Conflicts with openssl -libressl:arm64-windows = skip -libressl:arm-uwp = skip -libressl:x64-linux = skip -libressl:x64-osx = skip -libressl:x64-uwp = skip -libressl:x64-windows = skip -libressl:x64-windows-static = skip -libressl:x86-windows = skip -librsync:arm-uwp=fail -librsync:x64-uwp=fail -libsamplerate:arm64-windows=fail -libsamplerate:arm-uwp=fail -libsamplerate:x64-osx=fail -libsoundio:arm64-windows=fail -libsoundio:arm-uwp=fail -libsoundio:x64-uwp=fail -libsrt:arm-uwp=fail -libsrt:x64-uwp=fail -libssh:arm64-windows=fail -libssh:arm-uwp=fail -libssh:x64-uwp=fail -libstk:arm-uwp=fail -libstk:x64-uwp=fail -libtins:arm-uwp=fail -libtins:x64-uwp=fail -libtorrent:arm-uwp=fail -libtorrent:x64-uwp=fail -libudis86:arm-uwp=fail -libudis86:x64-linux=fail -libudis86:x64-osx=fail -libudis86:x64-uwp=fail -libudns:arm64-windows=fail -libudns:arm-uwp=fail -libudns:x64-uwp=fail -libudns:x64-windows=fail -libudns:x64-windows-static=fail -libudns:x86-windows=fail -libudns:x64-osx=fail -libui:arm-uwp=fail -libui:x64-linux=fail -libui:x64-uwp=fail -libusb:arm-uwp=fail -libusb:x64-linux=fail -libusb:x64-osx=fail -libusb:x64-uwp=fail -libusbmuxd:arm64-windows=fail -libusbmuxd:arm-uwp=fail -libusbmuxd:x64-uwp=fail -libusbmuxd:x64-linux=fail -libusbmuxd:x64-osx=fail -libusb-win32:arm64-windows=fail -libusb-win32:arm-uwp=fail -libusb-win32:x64-linux=fail -libusb-win32:x64-osx=fail -libusb-win32:x64-uwp=fail -libuuid:arm64-windows=fail -libuuid:arm-uwp=fail - -# Causes build failures in vxl and podofo on osx -# Conflicts with Darwin kernel sdk uuid.h (has missing definitions) -libuuid:x64-osx = skip -libuuid:x64-uwp=fail -libuuid:x64-windows=fail -libuuid:x64-windows-static=fail -libuuid:x86-windows=fail -libuv:arm64-windows=fail -libuv:arm-uwp=fail -libuv:x64-uwp=fail -libvpx:arm64-windows=fail -libvpx:arm-uwp=fail -libvpx:x64-linux=fail -libvpx:x64-osx=fail -libwandio:x86-windows=fail -libwandio:x64-windows=fail -libwandio:x64-windows-static=fail -libwandio:x64-uwp=fail -libwandio:arm64-windows=fail -libwandio:arm-uwp=fail -libwebsockets:arm-uwp=fail -libwebsockets:x64-uwp=fail -libxmp-lite:x64-linux=fail -libxmp-lite:x64-osx=fail -libxslt:arm-uwp=fail -libxslt:x64-osx=fail -libxslt:x64-uwp=fail -libyuv:arm-uwp=fail -libyuv:x64-uwp=fail -libzen:arm-uwp=fail -libzen:x64-uwp=fail -libzippp:x64-linux=ignore -linenoise-ng:arm-uwp=fail -linenoise-ng:x64-uwp=fail -live555:arm64-windows=fail -live555:arm-uwp=fail -live555:x64-linux=fail -live555:x64-osx=fail -live555:x64-uwp=fail -live555:x64-windows=fail -live555:x64-windows-static=fail -live555:x86-windows=fail -llgl:arm-uwp=fail -llgl:x64-uwp=fail -llvm:arm64-windows=fail -llvm:arm-uwp=fail -llvm:x64-uwp=fail -llvm:x64-linux=ignore -# installing iconv makes building llvm fail; needs to be fixed -llvm:x64-osx=ignore -lmdb:arm64-windows=fail -lmdb:arm-uwp=fail -lmdb:x64-uwp=fail -lodepng:x64-osx=fail -log4cplus:arm-uwp=fail -log4cplus:x64-uwp=fail -log4cpp:arm-uwp=fail -log4cpp:x64-uwp=fail -lpeg:x64-linux=fail -lpeg:x64-osx=fail -lua:arm-uwp=fail -lua:x64-uwp=fail -luafilesystem:x64-linux=fail -luafilesystem:x64-osx=fail -luajit:arm64-windows = skip -luajit:arm-uwp = skip -luajit:x64-linux = skip -luajit:x64-osx = skip -luajit:x64-uwp = skip -luajit:x64-windows = skip -luajit:x64-windows-static = skip -luajit:x86-windows = skip -luasocket:x64-linux=fail -luasocket:x64-osx=fail -lzfse:arm-uwp=fail -marl:arm-uwp=fail -marl:x64-uwp=fail -mathgl:x64-osx=fail -mathgl:x64-uwp=fail -mathgl:x64-linux=ignore -matio:x64-linux=fail -matio:x64-osx=fail -mbedtls:arm-uwp=fail -mbedtls:x64-uwp=fail -mdnsresponder:arm64-windows=fail -mdnsresponder:arm-uwp=fail -mdnsresponder:x64-linux=fail -mdnsresponder:x64-osx=fail -mdnsresponder:x64-uwp=fail -mecab:arm64-windows = skip -mecab:arm-uwp = skip -mecab:x64-linux = skip -mecab:x64-uwp = skip -mecab:x64-windows = skip -mecab:x64-windows-static = skip -mecab:x86-windows = skip -meschach:arm-uwp=fail -meschach:x64-linux=fail -meschach:x64-osx=fail -meschach:x64-uwp=fail -metis:arm-uwp=fail -metis:x64-uwp=fail -mhook:arm64-windows=fail -mhook:arm-uwp=fail -mhook:x64-linux=fail -mhook:x64-osx=fail -mhook:x64-uwp=fail -mhook:x64-windows=fail -mhook:x64-windows-static=fail -mhook:x86-windows=fail -milerius-sfml-imgui:x64-osx=fail -milerius-sfml-imgui:x64-windows-static=fail -milerius-sfml-imgui:x64-linux=ignore -minhook:arm64-windows=fail -minhook:arm-uwp=fail -minhook:x64-linux=fail -minhook:x64-osx=fail -minhook:x64-uwp=fail -minifb:arm-uwp=fail -minifb:x64-uwp=fail -minisat-master-keying:arm-uwp=fail -minisat-master-keying:x64-uwp=fail -miniupnpc:arm-uwp=fail -miniupnpc:x64-uwp=fail -minizip:arm-uwp=fail -minizip:x64-uwp=fail -mlpack:x64-linux=ignore -mman:x64-linux=fail -mman:x64-osx=fail -mmx:x64-windows=ignore -mmx:x64-windows-static=ignore -mmx:x86-windows=ignore -mongo-c-driver:arm64-windows=fail -mongo-c-driver:x64-osx=fail -mongoose:arm-uwp=fail -mongoose:x64-uwp=fail -monkeys-audio:arm64-windows=fail -monkeys-audio:arm-uwp=fail -monkeys-audio:x64-linux=fail -monkeys-audio:x64-osx=fail -monkeys-audio:x64-uwp=fail -monkeys-audio:x64-windows-static=fail -moos-core:arm-uwp=fail -moos-core:x64-uwp=fail -moos-core:x64-windows=ignore -moos-core:x64-windows-static=fail -moos-core:x86-windows=ignore -moos-essential:arm64-windows=fail -moos-essential:x64-windows=fail -moos-essential:x86-windows=fail -moos-essential:x64-linux=ignore -mosquitto:x64-windows-static=fail -mozjpeg:arm64-windows = skip -mozjpeg:arm-uwp = skip -mozjpeg:x64-linux = skip -mozjpeg:x64-osx = skip -mozjpeg:x64-uwp = skip -mozjpeg:x64-windows = skip -mozjpeg:x64-windows-static = skip -mozjpeg:x86-windows = skip -mpg123:arm-uwp=fail -mpg123:x64-uwp=fail -mpir:arm64-windows=fail -mpir:arm-uwp=fail -mpir:x64-uwp=fail - -#Conflicts with angle and qt-5base -ms-angle:arm64-windows = skip -ms-angle:arm-uwp = skip -ms-angle:x64-linux = fail -ms-angle:x64-osx = fail -ms-angle:x64-uwp = skip -ms-angle:x64-windows = skip -ms-angle:x64-windows-static = skip -ms-angle:x86-windows = skip -msix:x64-linux=fail -msix:x64-osx=fail -msix:x64-windows-static=fail -msmpi:arm64-windows=fail -msmpi:arm-uwp=fail -msmpi:x64-linux=fail -msmpi:x64-osx=fail -msmpi:x64-uwp=fail -muparser:arm-uwp=fail -muparser:x64-uwp=fail -nana:arm-uwp=fail -nana:x64-linux=fail -nana:x64-osx=fail -nana:x64-uwp=fail -nanodbc:arm-uwp=fail -nanodbc:x64-linux=fail -nanodbc:x64-osx=fail -nanodbc:x64-uwp=fail -nanorange:arm64-windows=fail -nanorange:arm-uwp=fail -nanorange:x64-linux=fail -nanorange:x64-osx=fail -nanorange:x64-uwp=fail -nanorange:x64-windows=fail -nanorange:x64-windows-static=fail -nanorange:x86-windows=fail -nanovg:arm-uwp=fail -nanovg:arm64-windows=ignore -nanovg:x64-uwp=fail -nanovg:x64-linux=ignore -nanovg:x64-windows=ignore -nanovg:x64-windows-static=ignore -nanovg:x86-windows=ignore -nativefiledialog:arm-uwp=fail -nativefiledialog:x64-uwp=fail -netcdf-cxx4:x64-linux=ignore -nethost:x64-uwp=fail -nethost:arm-uwp=fail -networkdirect-sdk:arm64-windows=fail -networkdirect-sdk:arm-uwp=fail -networkdirect-sdk:x64-linux=fail -networkdirect-sdk:x64-osx=fail -networkdirect-sdk:x64-uwp=fail -networkdirect-sdk:x86-windows=fail -nlopt:arm-uwp=fail -nlopt:x64-uwp=fail -nmslib:arm64-windows=fail -nmslib:arm-uwp=fail -nmslib:x64-uwp=fail -nng:arm-uwp=fail -nng:x64-uwp=fail -nrf-ble-driver:arm-uwp=fail -nrf-ble-driver:x64-uwp=fail -nrf-ble-driver:x64-linux=ignore -numactl:arm64-windows=fail -numactl:arm-uwp=fail -numactl:x64-osx=fail -numactl:x64-uwp=fail -numactl:x64-windows=fail -numactl:x64-windows-static=fail -numactl:x86-windows=fail -nvtt:arm64-windows=fail -nvtt:arm-uwp=fail -nvtt:x64-uwp=fail -octomap:arm-uwp=fail -octomap:x64-uwp=fail -ode:arm64-windows=fail -ode:arm-uwp=fail -ode:x64-uwp=fail -ode:x64-linux=ignore -offscale-libetcd-cpp:arm64-windows=fail -offscale-libetcd-cpp:arm-uwp=fail -offscale-libetcd-cpp:x64-uwp=fail -ogdf:arm64-windows = skip -ogdf:arm-uwp = skip -ogdf:x64-osx=fail -ogdf:x64-uwp = skip -ogdf:x64-windows = skip -ogdf:x64-windows-static = skip -ogdf:x86-windows = skip -ogre:x64-osx=fail -# Conflicts with ogre -ogre-next:arm64-windows = skip -ogre-next:arm-uwp = skip -ogre-next:x64-osx = skip -ogre-next:x64-linux = skip -ogre-next:x64-uwp = skip -ogre-next:x64-windows = skip -ogre-next:x64-windows-static = skip -ogre-next:x86-windows = skip -ois:arm64-windows=fail -ois:arm-uwp=fail -ois:x64-uwp=fail -ompl:x64-osx=fail -ompl:x64-linux=ignore -open62541:arm-uwp=fail -open62541:x64-uwp=fail -openal-soft:arm-uwp=fail -openal-soft:x64-uwp=fail -openblas:arm64-windows=fail -openblas:arm-uwp=fail -opencensus-cpp:arm64-windows=fail -opencensus-cpp:x64-windows=fail -opencensus-cpp:x64-windows-static=fail -opencensus-cpp:x86-windows=fail -opencl:arm64-windows=fail -opencl:arm-uwp=fail -opencl:x64-uwp=fail -opencolorio:x64-linux=ignore -opencsg:x64-uwp=fail -opencv3:arm64-windows = skip -opencv3:arm-uwp = skip -opencv3:x64-linux = skip -opencv3:x64-osx = skip -opencv3:x64-uwp = skip -opencv3:x64-windows = skip -opencv3:x64-windows-static = skip -opencv3:x86-windows = skip -opendnp3:x64-uwp=fail -opendnp3:arm-uwp=fail -openexr:arm64-windows=fail -openexr:arm-uwp=fail -openexr:x64-uwp=fail -opengl:arm64-windows=fail -opengl:arm-uwp=fail -openimageio:x64-linux=ignore -openmama:x64-windows=ignore -openmama:x86-windows=ignore -openmesh:arm64-windows=fail -openmesh:arm-uwp=fail -openmesh:x64-uwp=fail -openmpi:arm64-windows=fail -openmpi:arm-uwp=fail -openmpi:x64-uwp=fail -openmpi:x64-windows=fail -openmpi:x64-windows-static=fail -openmpi:x86-windows=fail -openmvg:x64-linux=ignore -openmvs:x64-linux=fail -openni2:x64-uwp=fail -openni2:x64-windows-static=fail -openscap:x64-linux=fail -openssl-unix:arm64-windows=fail -openssl-unix:arm-uwp=fail -openssl-unix:x64-uwp=fail -openssl-unix:x64-windows=fail -openssl-unix:x64-windows-static=fail -openssl-unix:x86-windows=fail -openssl-uwp:arm64-windows=fail -openssl-uwp:x64-linux=fail -openssl-uwp:x64-osx=fail -openssl-uwp:x64-windows=fail -openssl-uwp:x64-windows-static=fail -openssl-uwp:x86-windows=fail -openssl-windows:arm-uwp=fail -openssl-windows:x64-linux=fail -openssl-windows:x64-osx=fail -openssl-windows:x64-uwp=fail -opentracing:arm-uwp=fail -opentracing:x64-uwp=fail -openvdb:x64-linux=ignore -openvdb:x64-osx=fail -openvdb:x64-windows-static=fail -openvpn3:x64-osx=fail -openvr:arm64-windows=fail -openvr:arm-uwp=fail -openvr:x64-linux=fail -openvr:x64-osx=fail -openvr:x64-uwp=fail -openxr-loader:arm64-windows=fail -openxr-loader:arm-uwp=fail -openxr-loader:x64-osx=fail -openxr-loader:x64-uwp=fail -optional-bare:arm64-windows = skip -optional-bare:arm-uwp = skip -optional-bare:x64-linux = skip -optional-bare:x64-osx = skip -optional-bare:x64-uwp = skip -optional-bare:x64-windows = skip -optional-bare:x64-windows-static = skip -optional-bare:x86-windows = skip -opusfile:arm-uwp=fail -opusfile:x64-uwp=fail -orc:x64-linux=ignore -orocos-kdl:arm-uwp=fail -orocos-kdl:x64-uwp=fail -osg:x64-linux=fail -osg:x64-osx=fail -osg:x64-windows-static=fail -otl:x64-windows=ignore -otl:x64-windows-static=ignore -otl:x64-uwp=ignore -otl:x64-linux=ignore -otl:x86-windows=ignore -paho-mqtt:arm-uwp=fail -paho-mqtt:x64-uwp=fail -pangolin:x64-linux=fail -pangolin:x64-osx=fail -pangolin:x64-uwp=fail -pangolin:x64-windows-static=fail -pangomm:x64-osx=fail -pangomm:x64-windows=ignore -pangomm:x86-windows=ignore -parmetis:x64-linux=fail -parmetis:x64-osx=fail -pbc:arm-uwp=fail -pbc:x64-uwp=fail -pcre2:arm-uwp=fail -pdal:x64-linux=fail -pdal:x64-osx=fail -pdal-c:x64-windows-static=fail -pdcurses:arm-uwp=fail -pdcurses:x64-linux=fail -pdcurses:x64-osx=fail -pdcurses:x64-uwp=fail -pdcurses:x64-windows-static=fail -pfring:arm64-windows=fail -pfring:arm-uwp=fail -pfring:x64-uwp=fail -pfring:x64-windows=fail -pfring:x64-windows-static=fail -pfring:x86-windows=fail -pfring:x64-osx=fail -physfs:arm64-windows=fail -physx:arm64-windows=fail -physx:x64-linux=fail -physx:x64-osx=fail -piex:x64-osx=fail -pistache:arm64-windows=fail -pistache:arm-uwp=fail -pistache:x64-osx=fail -pistache:x64-uwp=fail -pistache:x64-windows=fail -pistache:x64-windows-static=fail -pistache:x86-windows=fail -pixel:x64-uwp=fail -pixel:x64-windows=fail -pixel:x64-windows-static=fail -pixel:x86-windows=fail -pixel:x64-linux=ignore -platform-folders:arm-uwp=fail -platform-folders:x64-uwp=fail -plib:arm-uwp=fail -plib:x64-osx=fail -plib:x64-uwp=fail -plibsys:arm-uwp=fail -plibsys:x64-linux=fail -plibsys:x64-osx=fail -plibsys:x64-uwp=fail -plplot:arm64-windows=fail -plplot:arm-uwp=fail -plplot:x64-uwp=fail -pmdk:arm64-windows=fail -pmdk:arm-uwp=fail -pmdk:x64-linux=fail -pmdk:x64-osx=fail -pmdk:x64-uwp=fail -pmdk:x64-windows-static=fail -pmdk:x86-windows=fail -pngwriter:arm-uwp=fail -pngwriter:x64-uwp=fail -pngwriter:x64-linux=ignore -polyhook2:arm64-windows=fail -polyhook2:arm-uwp=fail -polyhook2:x64-linux=fail -polyhook2:x64-uwp=fail -polyhook2:x64-osx=fail -portable-snippets:arm-uwp=fail -portaudio:arm64-windows=fail -portaudio:arm-uwp=fail -portaudio:x64-uwp=fail -portmidi:arm64-windows=fail -portmidi:arm-uwp=fail -portmidi:x64-linux=fail -portmidi:x64-osx=fail -portmidi:x64-uwp=fail -ppconsul:arm-uwp=fail -ppconsul:x64-uwp=fail -ppconsul:x64-linux=ignore -pqp:arm-uwp=fail -pqp:x64-uwp=fail -proj4:arm64-windows=fail -proj4:arm-uwp=fail -proj4:x64-uwp=fail -protobuf-c:x86-windows=fail -protobuf-c:x64-windows=fail -protobuf-c:x64-windows-static=fail -protobuf-c:x64-uwp=fail -protobuf-c:arm64-windows=fail -protobuf-c:arm-uwp=fail -ptex:arm-uwp=fail -ptex:x64-linux=fail -ptex:x64-osx=fail -ptex:x64-uwp=fail -pthreads:arm64-windows=fail -pthreads:arm-uwp=fail -pthreads:x64-uwp=fail -python2:arm64-windows=fail -python2:arm-uwp=fail -python2:x64-linux=fail -python2:x64-osx=fail -python2:x64-uwp=fail -python3:arm64-windows=fail -python3:arm-uwp=fail -python3:x64-osx=fail -python3:x64-uwp=fail -qca:x64-linux=fail -qca:x64-osx=fail -qca:x64-windows-static=fail -qhull:arm-uwp=ignore -qhull:x64-windows-static=ignore -qhull:x64-uwp=ignore -qpid-proton:arm-uwp=fail -qpid-proton:x64-uwp=fail -qpid-proton:x64-windows-static=fail -qscintilla:x64-linux=fail -qt5-activeqt:x64-linux=fail -qt5-activeqt:x64-osx=fail -qt5-macextras:x64-linux=fail -qt5-macextras:x64-windows=fail -qt5-macextras:x64-windows-static=fail -qt5-macextras:x86-windows=fail -qt5-winextras:x64-linux=fail -qt5-winextras:x64-osx=fail -quickfast:x64-linux=ignore -quickfix:x64-linux=ignore -quickfix:x64-windows=ignore -quickfix:x64-windows-static=ignore -quickfix:x86-windows=ignore -quickfix:x64-uwp=fail -quickfix:arm-uwp=fail -quirc:arm64-windows = skip -quirc:arm-uwp = skip -quirc:x64-linux = skip -quirc:x64-osx = skip -quirc:x64-uwp = skip -quirc:x64-windows = skip -quirc:x64-windows-static = skip -quirc:x86-windows = skip -qwt:x64-osx=ignore -rabit:x64-osx=fail -rabit:x64-linux=ignore -ragel:arm-uwp=fail -ragel:x64-uwp=fail -range-v3-vs2015:arm64-windows = skip -range-v3-vs2015:arm-uwp = skip -range-v3-vs2015:x64-linux = skip -range-v3-vs2015:x64-osx = skip -range-v3-vs2015:x64-uwp = skip -range-v3-vs2015:x64-windows = skip -range-v3-vs2015:x64-windows-static = skip -range-v3-vs2015:x86-windows = skip -rapidstring:arm64-windows=fail -rapidstring:arm-uwp=fail -rapidstring:x64-linux=fail -rapidstring:x64-uwp=fail -rapidstring:x64-windows=fail -rapidstring:x64-windows-static=fail -rapidstring:x86-windows=fail -raylib:arm64-windows=fail -raylib:arm-uwp=fail -raylib:x64-uwp=fail -readline:arm-uwp=fail -readline:x64-uwp=fail -readline-win32:arm64-windows=fail -readline-win32:arm-uwp=fail -readline-win32:x64-linux=fail -readline-win32:x64-osx=fail -readline-win32:x64-uwp=fail -readosm:x64-linux=fail -readosm:x64-osx=fail -realsense2:arm64-windows=fail -realsense2:arm-uwp=fail -realsense2:x64-linux=fail -realsense2:x64-uwp=fail -redis-plus-plus:x86-windows=fail -redis-plus-plus:x64-windows=fail -redis-plus-plus:x64-windows-static=fail -redis-plus-plus:arm64-windows=fail -reproc:arm-uwp=fail -reproc:x64-uwp=fail -restbed:arm-uwp=fail -restbed:x64-uwp=fail -rhash:arm64-windows=fail -rhash:arm-uwp=fail -rhash:x64-uwp=fail -rocksdb:arm-uwp=fail -rocksdb:x64-uwp=fail -rocksdb:x64-linux=ignore -rpclib:arm64-windows=fail -rpclib:arm-uwp=fail -rpclib:x64-uwp=fail -rpclib:x64-windows=ignore -rpclib:x86-windows=ignore -rpclib:x64-windows-static=ignore -rttr:arm-uwp=fail -rttr:x64-uwp=fail -scintilla:arm-uwp=fail -scintilla:x64-linux=fail -scintilla:x64-osx=fail -scintilla:x64-uwp=fail -scintilla:x64-windows-static=fail -sciter:arm64-windows=fail -sciter:arm-uwp=fail -sciter:x64-uwp=fail -sciter:x64-windows-static=fail -scnlib:arm-uwp=fail -scnlib:x64-uwp=fail -scnlib:x86-windows=fail -scylla-wrapper:arm64-windows=fail -scylla-wrapper:arm-uwp=fail -scylla-wrapper:x64-linux=fail -scylla-wrapper:x64-osx=fail -scylla-wrapper:x64-uwp=fail -scylla-wrapper:x64-windows-static=fail -sdformat6:arm64-windows=fail -sdformat6:arm-uwp=fail -sdformat6:x64-uwp=fail -sdformat6:x64-linux=ignore -sdl1:arm-uwp=fail -sdl1:x64-uwp=fail -sdl1:x64-osx=fail -sdl2-gfx:arm64-windows=fail -sdl2-gfx:x64-linux=fail -sdl2-gfx:x64-osx=fail -sdl2-image:arm-uwp=fail -sdl2-image:x64-uwp=fail -sdl2-mixer:arm-uwp=fail -sdl2-mixer:x64-uwp=fail -sdl2-net:arm-uwp=fail -sdl2-net:x64-uwp=fail -secp256k1:x64-linux=fail -secp256k1:x64-osx=fail -selene:x64-linux=ignore -sentencepiece:arm64-windows=fail -sentencepiece:arm-uwp=fail -sentencepiece:x64-uwp=fail -sentencepiece:x64-windows=fail -sentencepiece:x86-windows=fail -septag-sx:arm64-windows=fail -septag-sx:arm-uwp=fail -septag-sx:x64-uwp=fail -sfgui:x64-linux=ignore -sfml:arm64-windows=fail -shapelib:arm-uwp=fail -shapelib:x64-uwp=fail -shiva:x64-windows=fail -shiva:x64-windows-static=fail -shiva-sfml:x64-linux=fail -shiva-sfml:x64-osx=fail -shiva-sfml:x86-windows=fail -shogun:arm64-windows = skip -shogun:arm-uwp = skip -shogun:x64-osx=fail -shogun:x64-uwp = skip -shogun:x64-windows = skip -shogun:x64-windows-static = skip -shogun:x86-windows = skip -simdjson:arm64-windows=fail -simdjson:arm-uwp=fail -simdjson:x86-windows=fail -slikenet:arm-uwp=fail -slikenet:x64-uwp=fail -smpeg2:arm-uwp=fail -smpeg2:x64-linux=fail -smpeg2:x64-uwp=fail -soci:arm-uwp=fail -soci:x64-uwp=fail -soem:x64-uwp=fail -soem:arm-uwp=fail -soil:arm-uwp=fail -soil:x64-uwp=fail -soil2:arm-uwp=fail -soil2:x64-uwp=fail -sophus:x64-linux=fail -soundtouch:arm-uwp=fail -soundtouch:x64-linux=ignore -soundtouch:x64-uwp=fail -soundtouch:x64-windows-static=fail -spaceland:arm64-windows=fail -spaceland:arm-uwp=fail -spaceland:x64-uwp=fail -spaceland:x64-linux=ignore -spdk:x64-linux=fail -spdk-dpdk:arm64-windows=fail -spdk-dpdk:arm-uwp=fail -spdk-dpdk:x64-osx=fail -spdk-dpdk:x64-uwp=fail -spdk-dpdk:x64-windows=fail -spdk-dpdk:x64-windows-static=fail -spdk-dpdk:x86-windows=fail -spdk-ipsec:arm64-windows=fail -spdk-ipsec:arm-uwp=fail -spdk-ipsec:x64-osx=fail -spdk-ipsec:x64-uwp=fail -spdk-ipsec:x64-windows=fail -spdk-ipsec:x64-windows-static=fail -spdk-ipsec:x86-windows=fail -spdk-isal:arm64-windows=fail -spdk-isal:arm-uwp=fail -spdk-isal:x64-osx=fail -spdk-isal:x64-uwp=fail -spdk-isal:x64-windows=fail -spdk-isal:x64-windows-static=fail -spdk-isal:x86-windows=fail -speex:x64-linux=fail -speex:x64-osx=fail -speexdsp:x64-linux=fail -speexdsp:x64-osx=fail -spirv-tools:arm-uwp=fail -spirv-tools:x64-uwp=fail -stormlib:arm-uwp=fail -stormlib:x64-uwp=fail -stxxl:arm-uwp=fail -stxxl:x64-uwp=fail -systemc:arm64-windows=fail -systemc:arm-uwp=fail -systemc:x64-uwp=fail -taglib:x64-linux=ignore -tbb:arm64-windows=fail -tbb:arm-uwp=fail -tbb:x64-uwp=fail -tcl:arm-uwp=ignore -tcl:arm64-windows=ignore -tcl:x64-uwp=ignore -tcl:x64-linux=ignore -tcl:x64-osx=ignore -teemo:x64-uwp=fail -teemo:arm-uwp=fail -teemo:arm64-windows=fail -teemo:x64-osx=fail -telnetpp:arm-uwp=fail -telnetpp:x64-uwp=fail -tensorflow-cc:arm64-windows=fail -tensorflow-cc:x64-linux = skip -tensorflow-cc:x64-osx=fail -tensorflow-cc:x64-windows=fail -tensorflow-cc:x64-windows-static=fail -tensorflow-cc:x86-windows=fail -tesseract:x64-windows=ignore -tesseract:x64-windows-static=ignore -tesseract:x86-windows=ignore -tfhe:x86-windows=fail -tfhe:x64-windows=fail -tfhe:x64-windows-static=fail -tfhe:x64-uwp=fail -tfhe:arm64-windows=fail -tfhe:arm-uwp=fail -theia:arm64-windows = skip -theia:arm-uwp = skip -theia:x64-uwp = skip -theia:x64-windows = skip -theia:x64-windows-static = skip -theia:x86-windows = skip -thor:x64-linux=fail -thor:x64-osx=fail -thrift:x64-osx=fail -tidy-html5:arm-uwp=fail -tidy-html5:x64-linux=fail -tidy-html5:x64-osx=fail -tidy-html5:x64-uwp=fail -tinkerforge:arm-uwp=fail -tinkerforge:x64-uwp=fail -tinyexif:arm-uwp=fail -tinyexif:x64-uwp=fail -tinyfiledialogs:arm64-windows=fail -tinyfiledialogs:arm-uwp=fail -tinyfiledialogs:x64-linux=fail -tinyfiledialogs:x64-uwp=fail -tinyfiledialogs:x64-windows=fail -tinyfiledialogs:x64-windows-static=fail -tinyfiledialogs:x86-windows=fail -tinyfiledialogs:x64-osx=fail -tinynpy:x64-linux=ignore -tiny-process-library:arm-uwp=fail -tiny-process-library:x64-uwp=fail -tinyutf8:arm64-windows=fail -tinyutf8:arm-uwp=fail -tinyutf8:x64-uwp=fail - -#Flaky on windows only due to error PRI210: 0x80070020 - File move failed -tmx:arm64-windows = skip -tmx:arm-uwp = skip -tmx:x64-uwp = skip -tmx:x64-windows = skip -tmx:x64-windows-static = skip -tmx:x86-windows = skip -tmxlite:arm-uwp=fail -tmxlite:x64-uwp=fail -tmxparser:arm64-windows=fail -tmxparser:arm-uwp=fail -tmxparser:x64-uwp=fail -tmxparser:x64-windows=fail -tmxparser:x64-windows-static=fail -tmxparser:x86-windows=fail -torch-th:arm64-windows=fail -torch-th:arm-uwp=fail -torch-th:x64-uwp=fail -torch-th:x64-windows-static=fail -tre:x64-osx=fail -treehopper:x64-windows-static=fail -unicorn:arm64-windows=fail -unicorn:arm-uwp=fail -unicorn:x64-linux=fail -unicorn:x64-osx=fail -unicorn:x64-uwp=fail -unicorn-lib:x64-uwp=fail -unittest-cpp:arm64-windows=fail -unittest-cpp:arm-uwp=fail -unittest-cpp:x64-uwp=fail -unrar:arm64-windows=fail -unrar:arm-uwp=fail -unrar:x64-linux=fail -unrar:x64-osx=fail -unrar:x64-uwp=fail -unrar:x64-windows-static=fail -upb:arm64-windows=fail -upb:arm-uwp=fail -upb:x64-uwp=fail -upb:x64-windows=fail -upb:x64-windows-static=fail -upb:x86-windows=fail -urdfdom:x64-windows-static=fail -usd:x64-linux=ignore -usd:x86-windows=fail -usrsctp:arm-uwp=fail -usrsctp:x64-uwp=fail -uvatlas:arm64-windows=fail -uvatlas:arm-uwp=fail -uvatlas:x64-linux=fail -uvatlas:x64-osx=fail -uvatlas:x64-windows-static=fail -vectorclass:arm64-windows=fail -vectorclass:arm-uwp=fail -vlpp:arm64-windows=fail -vlpp:arm-uwp=fail -vlpp:x64-osx=fail -vlpp:x64-uwp=fail -vulkan:arm64-windows=fail -vulkan:arm-uwp=fail -vulkan:x64-linux=fail -vulkan:x64-osx=fail -vulkan:x64-uwp=fail -vulkan:x64-windows=fail -vulkan:x64-windows-static=fail -vulkan:x86-windows=fail -# Conflicts with latest openjpeg port (vxl ships with an old version of openjpeg) -# conflicts with qt5-location -vxl:arm64-windows = skip -vxl:arm-uwp = skip -vxl:x64-linux = skip -vxl:x64-osx = skip -vxl:x64-uwp = skip -vxl:x64-windows = skip -vxl:x64-windows-static = skip -vxl:x86-windows = skip -wampcc:x64-linux=ignore -wangle:x64-linux=ignore -wavpack:arm64-windows=fail -wavpack:x64-linux=fail -wavpack:x64-osx=fail -wepoll:arm-uwp=ignore -wepoll:x64-uwp=ignore -wepoll:x64-linux=ignore -wepoll:x64-osx=ignore -wildmidi:x64-osx=fail -wincrypt:x64-linux=fail -wincrypt:x64-osx=fail -winpcap:arm64-windows = skip -winpcap:arm-uwp = skip -winpcap:x64-linux=fail -winpcap:x64-osx=fail -winpcap:x64-uwp = skip -winpcap:x64-windows = skip -winpcap:x64-windows-static = skip -winpcap:x86-windows = skip -winsock2:x64-linux=fail -winsock2:x64-osx=fail -wintoast:arm-uwp=fail -wintoast:x64-linux=fail -wintoast:x64-osx=fail -wintoast:x64-uwp=fail -woff2:x64-linux=fail -woff2:x64-osx=fail -woff2:x64-windows-static=fail -wpilib:x64-osx=fail -wxchartdir:x64-osx=fail -wxwidgets:x64-linux=fail -x264:arm64-windows=fail -x264:arm-uwp=fail -x264:x64-uwp=ignore -x264:x64-linux=fail -x264:x64-osx=fail -x264:x86-windows=ignore -x264:x64-windows=ignore -x264:x64-windows-static=ignore -x265:arm64-windows=fail -x265:arm-uwp=fail -x265:x64-uwp=fail -xalan-c:x64-windows-static=fail -xerces-c:arm64-windows=fail -xerces-c:arm-uwp=fail -xerces-c:x64-uwp=fail -xeus:x64-linux=ignore -xmlsec:arm-uwp=fail -xmlsec:x64-uwp=fail -xmsh:arm64-windows=fail -xmsh:arm-uwp=fail -xmsh:x64-uwp=fail -xmsh:x64-windows=fail -xmsh:x64-windows-static=fail -xmsh:x86-windows=fail -xmsh:x64-linux=ignore -xtensor-io:x64-uwp=ignore -x-plane:arm64-windows=fail -x-plane:arm-uwp=fail -x-plane:x64-linux=fail -x-plane:x86-windows=fail -yajl:arm-uwp=fail -yajl:x64-uwp=fail -yara:arm64-windows=fail -yara:arm-uwp=fail -yara:x64-uwp=fail -yasm:arm64-windows=fail -yasm:arm-uwp=fail -yasm:x64-linux=fail -yasm:x64-osx=fail -yasm:x64-uwp=fail -yato:arm64-windows=fail -yato:arm-uwp=fail -yato:x64-uwp=fail -z3:arm64-windows=fail -z3:arm-uwp=fail -z3:x64-uwp=fail -zeromq:arm64-windows=fail -zeromq:arm-uwp=fail -zeromq:x64-uwp=fail +########################################################################### +## This file defines the current expected build state of ports in CI. +## +## States +## pass - (default) the port builds in the CI system. If a port is +## missing from this file then it is assumed to build. +## fail - the port does not build in the CI system. +## This is not necessarily the same as if a port is expected to build +## on a developers machine because it may fail due to the machine +## configuration. When set to fail the CI system will still attempt +## to build the port and will report a CI failure until this file is updated. +## skip - Do not build this port in the CI system. +## This is added to ports that may be flaky or conflict with other +## ports. Please comment for why a port is skipped so it can be +## removed when the issue is resolved. +## ignore - attempt to build the port, but do not fail the CI test if the +## port does not build. Any ignored build failures will be reported +## in the test summary. +## +## +## CI tested triplets: +## arm64-windows +## arm-uwp +## x64-linux +## x64-osx +## x64-uwp +## x64-windows +## x64-windows-static +## x86-windows +## + + +# Add new items alphabetically + +3fd:arm64-windows=fail +3fd:arm-uwp=fail +3fd:x64-linux=fail +3fd:x64-osx=fail +3fd:x64-windows=fail +3fd:x64-windows-static=fail +3fd:x86-windows=ignore +7zip:arm64-windows=fail +7zip:arm-uwp=fail +7zip:x64-linux=fail +7zip:x64-osx=fail +7zip:x64-uwp=fail +abseil:arm-uwp=fail +abseil:x64-uwp=fail +ace:arm64-windows=fail +ace:arm-uwp=fail +ace:x64-osx=fail +ace:x64-uwp=fail +activemq-cpp:x64-windows-static=fail +akali:x64-uwp=fail +akali:arm-uwp=fail +akali:arm64-windows=fail +alac:arm-uwp=fail +alac:x64-uwp=fail +alembic:x64-linux=fail +alembic:x64-osx=fail +alembic:x64-windows-static=fail +ampl-mp:arm64-windows=fail +ampl-mp:arm-uwp=fail +ampl-mp:x64-uwp=fail +angelscript:arm64-windows=fail +angelscript:arm-uwp=fail + +# Conflicts with qt5-base and ms-angle +angle:arm64-windows = skip +angle:arm-uwp = skip +angle:x64-uwp = skip +angle:x64-windows = skip +angle:x64-windows-static = skip +angle:x86-windows = skip +antlr4:arm64-windows=fail +antlr4:arm-uwp=fail +antlr4:x64-uwp=fail +anyrpc:arm-uwp=ignore +anyrpg:x64-uwp=ignore +anyrpc:x64-windows-static=ignore +apr:arm64-windows=fail +apr:arm-uwp=fail +apr:x64-linux=fail +apr:x64-osx=fail +apr:x64-uwp=fail +argtable2:arm-uwp=fail +argtable2:x64-uwp=fail +arrow:arm64-windows=fail +arrow:x64-linux=fail +arrow:x86-windows=fail +asmjit:arm64-windows=fail +asmjit:arm-uwp=fail +asyncplusplus:arm-uwp=fail +asyncplusplus:x64-uwp=fail +atk:x64-osx=fail +atkmm:x64-linux=fail +atlmfc:x64-linux=fail +atlmfc:x64-osx=fail +aubio:x64-linux=fail +aubio:x64-osx=fail +avro-c:arm-uwp=fail +avro-c:x64-linux=fail +avro-c:x64-osx=fail +avro-c:x64-uwp=fail +aws-c-common:arm64-windows=fail +aws-c-common:arm-uwp=fail +aws-c-common:x64-uwp=fail +aws-checksums:arm64-windows=fail +aws-lambda-cpp:arm64-windows=fail +aws-lambda-cpp:arm-uwp=fail +aws-lambda-cpp:x64-uwp=fail +aws-lambda-cpp:x64-windows=fail +aws-lambda-cpp:x64-windows-static=fail +aws-lambda-cpp:x86-windows=fail +aws-sdk-cpp:x64-linux=ignore +azure-c-shared-utility:arm-uwp=fail +azure-c-shared-utility:x64-uwp=fail +basisu:x64-linux=ignore +bde:arm64-windows=fail +bde:arm-uwp=fail +bde:x64-uwp=fail +bde:x64-windows=fail +bde:x64-windows-static=fail +bde:x86-windows=fail +benchmark:arm64-windows=fail +benchmark:arm-uwp=fail +benchmark:x64-uwp=fail +berkeleydb:arm64-windows=fail +berkeleydb:arm-uwp=fail +berkeleydb:x64-linux=fail +berkeleydb:x64-osx=fail +berkeleydb:x64-uwp=fail +blaze:x64-windows=fail +blaze:x64-windows-static=fail +blaze:x86-windows=fail +blend2d:arm64-windows=fail +blend2d:arm-uwp=fail +blend2d:x64-uwp=fail +blosc:arm64-windows=fail +blosc:arm-uwp=fail +blosc:x64-uwp=fail +bond:arm-uwp=fail +bond:x64-osx=fail +bond:x64-uwp=fail +boost-context:arm-uwp=fail +boost-context:x64-uwp=fail +boost-coroutine:arm-uwp=fail +boost-coroutine:arm64-windows=fail +boost-coroutine:x64-uwp=fail +boost-fiber:arm-uwp=fail +boost-fiber:arm64-windows=fail +boost-fiber:x64-osx=fail +boost-fiber:x64-uwp=fail +boost-fiber:x64-linux=ignore +boost-filesystem:arm-uwp=fail +boost-filesystem:x64-uwp=fail +boost-iostreams:arm-uwp=fail +boost-iostreams:x64-uwp=fail +boost-locale:arm-uwp=fail +boost-locale:x64-uwp=fail +boost-log:arm-uwp=fail +boost-log:x64-uwp=fail +boost-python:x64-linux=ignore +boost-mpi:x64-linux=fail +boost-mpi:x64-osx=fail +boost-stacktrace:arm-uwp=fail +boost-stacktrace:x64-uwp=fail +boost-test:arm-uwp=fail +boost-test:x64-uwp=fail +boost-wave:arm-uwp=fail +boost-wave:x64-uwp=fail +botan:arm64-windows=fail +botan:arm-uwp=fail +botan:x64-uwp=fail +box2d:x64-uwp=fail +box2d:arm-uwp=fail +breakpad:arm64-windows=fail +breakpad:x64-osx=fail +brotli:arm-uwp=fail +brotli:x64-uwp=fail +bullet3:arm64-windows=fail +bullet3:arm-uwp=fail +bullet3:x64-uwp=fail +butteraugli:x64-linux=ignore +caf:arm-uwp=fail +caf:arm64-windows=fail +caf:x64-uwp=fail +caf:x64-linux=ignore +caffe2:x86-windows=fail +cairomm:x64-linux=fail +capnproto:arm64-windows=fail +capnproto:arm-uwp=fail +capnproto:x64-uwp=fail +c-ares:arm-uwp=fail +c-ares:x64-uwp=fail +cartographer:x64-osx=fail +casclib:arm-uwp=fail +casclib:x64-uwp=fail +catch-classic:arm64-windows = skip +catch-classic:arm-uwp = skip +catch-classic:x64-linux = skip +catch-classic:x64-osx = skip +catch-classic:x64-uwp = skip +catch-classic:x64-windows = skip +catch-classic:x64-windows-static = skip +catch-classic:x86-windows = skip +ccd:arm-uwp=fail +ccd:x64-uwp=fail +cello:arm-uwp=fail +cello:x64-uwp=fail +cfitsio:arm-uwp=fail +cfitsio:x64-uwp=fail +cgicc:arm-uwp=fail +cgicc:x64-uwp=fail +chakracore:arm64-windows=fail +chakracore:arm-uwp=fail +chakracore:x64-linux=fail +chakracore:x64-osx=fail +chakracore:x64-uwp=fail +chakracore:x64-windows-static=fail +chartdir:arm64-windows=fail +chartdir:arm-uwp=fail +chartdir:x64-uwp=fail +chartdir:x64-windows-static=fail +chipmunk:arm64-windows=fail +chipmunk:arm-uwp=fail +chipmunk:x64-linux=fail +chipmunk:x64-osx=fail +chipmunk:x64-uwp=fail +chmlib:arm-uwp=fail +chmlib:x64-uwp=fail +civetweb:arm64-windows = skip +civetweb:arm-uwp = skip +civetweb:x64-linux = skip +civetweb:x64-osx = skip +civetweb:x64-uwp = skip +civetweb:x64-windows = skip +civetweb:x64-windows-static = skip +civetweb:x86-windows = skip +clapack:x64-uwp=fail +clblast:x64-osx=ignore +clblast:x64-linux=fail +clblast:x64-windows-static=fail +clockutils:x64-linux=fail +clockutils:x64-osx=fail +cmark:x64-windows-static=fail +cmcstl2:arm64-windows = skip +cmcstl2:arm-uwp = skip +cmcstl2:x64-linux = skip +cmcstl2:x64-osx = skip +cmcstl2:x64-uwp = skip +cmcstl2:x64-windows = skip +cmcstl2:x64-windows-static = skip +cmcstl2:x86-windows = skip +collada-dom:x64-osx=fail +collada-dom:x64-windows-static=fail +coolprop:arm-uwp=fail +coolprop:x64-linux=fail +coolprop:x64-osx=fail +coolprop:x64-uwp=fail +coroutine:arm-uwp=fail +coroutine:x64-linux=fail +coroutine:x64-uwp=fail +coroutine:x86-windows=fail +corrade:arm64-windows=fail +corrade:arm-uwp=fail +corrade:x64-uwp=fail +cppcms:x64-linux=fail +cppcms:x64-osx=fail +cppcms:x64-windows-static=fail +cppfs:arm-uwp=fail +cppfs:x64-uwp=fail +cppgraphqlgen:arm-uwp=fail +cppgraphqlgen:x64-uwp=ignore +cppkafka:x64-linux=ignore +cppmicroservices:x86-windows=fail +cppmicroservices:x64-windows=fail +cppmicroservices:arm64-windows=fail +cppmicroservices:arm-uwp=fail +cppmicroservices:x64-uwp=fail +cpp-netlib:arm-uwp=fail +cpp-netlib:x64-uwp=fail +cpp-netlib:x64-linux=ignore +cpprestsdk:arm-uwp=fail +cpprestsdk:x64-uwp=fail +cpp-taskflow:x64-osx=fail +cppunit:arm64-windows=fail +cppunit:arm-uwp=fail +cppunit:x64-linux=fail +cppunit:x64-osx=fail +cppunit:x64-uwp=fail +cpr:x64-linux=ignore +cpuinfo:arm64-windows=ignore +crfsuite:arm-uwp=fail +crfsuite:x64-uwp=fail +crossguid:x64-osx=fail +cspice:arm-uwp=fail +cspice:x64-uwp=fail +ctemplate:arm64-windows=fail +ctemplate:arm-uwp=fail +ctemplate:x64-linux=fail +ctemplate:x64-osx=fail +cuda:x64-linux=fail +cuda:x64-osx=fail +cudnn:arm64-windows=fail +cudnn:arm-uwp=fail +cudnn:x64-uwp=fail +cudnn:x64-windows-static=fail +cudnn:x86-windows=fail +cutelyst2:x64-osx=fail +darknet:arm-uwp=fail +darknet:x64-uwp=fail +date:arm64-windows=fail +dbow2:x64-osx=fail +dcmtk:arm64-windows=fail +dcmtk:arm-uwp=fail +dcmtk:x64-uwp=fail +detours:x64-linux=fail +detours:x64-osx=fail +devicenameresolver:arm-uwp=fail +devicenameresolver:x64-linux=fail +devicenameresolver:x64-osx=fail +devicenameresolver:x64-uwp=fail +devicenameresolver:x64-windows-static=fail +dimcli:arm-uwp=fail +dimcli:x64-osx=fail +dimcli:x64-uwp=fail +directxmesh:x64-linux=fail +directxmesh:x64-osx=fail +directxmesh:x64-windows-static=fail +directxtex:x64-linux=fail +directxtex:x64-osx=fail +directxtex:x64-windows-static=fail +directxtk:x64-linux=fail +directxtk:x64-osx=fail +directxtk:x64-windows-static=fail +directxtk12:x64-linux=fail +directxtk12:x64-osx=fail +directxtk12:x64-windows-static=fail +discord-rpc:arm-uwp=fail +discord-rpc:x64-uwp=fail +dlfcn-win32:arm-uwp=fail +dlfcn-win32:x64-linux=fail +dlfcn-win32:x64-osx=fail +dlfcn-win32:x64-uwp=fail +dmlc:arm-uwp=fail +dmlc:x64-uwp=fail +dmlc:x64-windows-static=ignore +dmlc:x86-windows=ignore +dpdk:arm64-windows=fail +dpdk:arm-uwp=fail +dpdk:x64-osx=fail +dpdk:x64-uwp=fail +dpdk:x64-windows=fail +dpdk:x64-windows-static=fail +dpdk:x86-windows=fail +duckx:arm64-windows = skip +duckx:arm-uwp = skip +duckx:x64-linux = skip +duckx:x64-osx = skip +duckx:x64-uwp = skip +duckx:x64-windows = skip +duckx:x64-windows-static = skip +duckx:x86-windows = skip +duilib:arm-uwp=fail +duilib:x64-linux=fail +duilib:x64-osx=fail +duilib:x64-uwp=fail +dxut:arm64-windows=fail +dxut:arm-uwp=fail +dxut:x64-linux=fail +dxut:x64-osx=fail +dxut:x64-windows-static=fail +eastl:arm64-windows=fail +eastl:arm-uwp=fail +easyhook:arm64-windows=fail +easyhook:arm-uwp=fail +easyhook:x64-linux=fail +easyhook:x64-osx=fail +easyhook:x64-uwp=fail +easyhook:x64-windows-static=fail +easyloggingpp:arm-uwp=fail +easyloggingpp:x64-uwp=fail +ebml:arm-uwp=fail +ebml:x64-uwp=fail +ecm:arm64-windows = skip +ecm:arm-uwp = skip +ecm:x64-linux = skip +ecm:x64-osx = skip +ecm:x64-uwp = skip +ecm:x64-windows = skip +ecm:x64-windows-static = skip +ecm:x86-windows = skip +ecsutil:arm64-windows=fail +ecsutil:arm-uwp=fail +ecsutil:x64-linux=fail +ecsutil:x64-osx=fail +ecsutil:x64-uwp=fail +embree2:x64-linux=fail +embree2:x64-osx=fail +embree2:x64-windows-static=fail +enet:arm-uwp=fail +enet:x64-uwp=fail +epsilon:arm-uwp=fail +epsilon:x64-linux=fail +epsilon:x64-osx=fail +epsilon:x64-uwp=fail +evpp:x64-osx=fail +expat:arm-uwp=fail +expat:x64-uwp=fail +faad2:x64-linux=fail +faad2:x64-osx=fail +fann:arm-uwp=fail +fann:x64-linux=fail +fann:x64-osx=fail +fann:x64-uwp=fail +fann:x64-windows-static=fail +fastcdr:x64-linux=fail +fastrtps:arm-uwp=fail +fastrtps:x64-linux=fail +fastrtps:x64-osx=fail +fastrtps:x64-uwp=fail +fastrtps:x64-windows-static=fail +fdk-aac:arm64-windows=fail +fdk-aac:arm-uwp=fail +fdk-aac:x64-uwp=fail +fdlibm:arm-uwp=fail +fdlibm:x64-uwp=fail +fftw3:arm-uwp=fail +fftw3:x64-uwp=fail +field3d:x64-windows=fail +field3d:x64-windows-static=fail +field3d:x86-windows=fail +fizz:x64-windows=fail +fizz:x64-windows-static=fail +flint:x64-linux=fail +flint:x64-osx=fail +fltk:arm-uwp=fail +fltk:x64-linux=fail +fltk:x64-osx=fail +fltk:x64-uwp=fail +fluidsynth:x64-linux=fail +fluidsynth:x64-osx=fail +fmem:arm-uwp=fail +fmem:x64-uwp=fail +fmi4cpp:arm-uwp=fail +fmi4cpp:x64-uwp=fail +fmilib:arm64-windows=fail +fmilib:arm-uwp=fail +fmilib:x64-linux=ignore +fmilib:x64-uwp=fail +fmilib:x64-windows=ignore +fmilib:x64-windows-static=ignore +fmilib:x86-windows=ignore +# Folly fails due to a compiler bug in MSVC 19.22.27905, fixed in newer releases +folly:arm64-windows=fail +folly:x86-windows=fail +folly:x64-windows=fail +folly:x64-windows-static=fail +foonathan-memory:arm64-windows=fail +foonathan-memory:arm-uwp=fail +foonathan-memory:x64-uwp=fail +forge:x86-windows=fail +freeglut:arm64-windows=fail +freeglut:arm-uwp=fail +freeglut:x64-uwp=fail +freeglut:x64-osx=fail +freerdp:arm64-windows=fail +freerdp:arm-uwp=fail +freerdp:x64-osx=fail +freerdp:x64-uwp=fail +freetds:arm64-windows=fail +freetds:arm-uwp=fail +freetds:x64-linux=fail +freetds:x64-osx=fail +freetds:x64-uwp=fail +freetype-gl:x64-uwp=fail +freexl:arm-uwp=fail +freexl:arm64-windows=ignore +freexl:x64-uwp=fail +freexl:x86-windows=ignore +freexl:x64-windows=ignore +freexl:x64-windows-static=ignore +fribidi:arm64-windows=fail +fribidi:arm-uwp=fail +fribidi:x64-linux=fail +fribidi:x64-osx=fail +fribidi:x64-uwp=fail +ftgl:x64-linux=fail +ftgl:x64-osx=fail +ftgl:x64-uwp=fail +fuzzylite:arm-uwp=fail +fuzzylite:x64-linux=fail +fuzzylite:x64-osx=fail +fuzzylite:x64-uwp=fail +g3log:arm64-windows=fail +g3log:arm-uwp=fail +g3log:x64-uwp=fail +gainput:arm-uwp=fail +gainput:x64-linux=fail +gainput:x64-uwp=fail +gainput:x64-windows-static=fail +gamma:x64-linux=fail +gamma:x64-osx=fail +gdcm:arm64-windows=fail +gdcm:x64-linux = skip +geographiclib:x64-linux=ignore +geos:arm-uwp=fail +geos:x64-uwp=fail +getopt:arm-uwp=fail +getopt:x64-uwp=fail +getopt-win32:arm64-windows=fail +getopt-win32:arm-uwp=fail +getopt-win32:x64-linux=fail +getopt-win32:x64-osx=fail +getopt-win32:x64-uwp=fail +getopt-win32:x64-windows-static=fail +gflags:arm-uwp=fail +gflags:x64-uwp=fail + +# Conflicts with libevent +gherkin-c:arm64-windows = skip +gherkin-c:arm-uwp = skip +gherkin-c:x64-linux=fail +gherkin-c:x64-osx=fail +gherkin-c:x64-uwp = skip +gherkin-c:x64-windows = skip +gherkin-c:x64-windows-static = skip +gherkin-c:x86-windows = skip +gl3w:arm64-windows=fail +gl3w:arm-uwp=fail +glew:arm64-windows=fail +glew:arm-uwp=fail +glfw3:arm64-windows=fail +glfw3:arm-uwp=fail +glfw3:x64-uwp=fail +glib:x64-uwp=fail +glib:x64-windows-static=fail +glib:x64-osx=fail +globjects:x64-linux=ignore +gmmlib:arm64-windows=fail +gmmlib:arm-uwp=fail +gmmlib:x64-osx=fail +gmmlib:x64-uwp=fail +gmmlib:x64-windows=fail +gmmlib:x64-windows-static=fail +gmmlib:x86-windows=fail +googleapis:arm64-windows=fail +googleapis:arm-uwp=fail +googleapis:x64-uwp=fail +google-cloud-cpp:x64-linux=ignore +google-cloud-cpp-spanner:x86-windows=fail +gppanel:x64-osx=fail +gperf:x64-uwp=fail +gperf:arm-uwp=fail +graphicsmagick:arm64-windows=fail +graphicsmagick:arm-uwp=fail +graphicsmagick:x64-uwp=fail +graphite2:arm-uwp=fail +graphite2:x64-uwp=fail +graphqlparser:arm-uwp=fail +graphqlparser:x64-uwp=fail +grpc:arm-uwp=fail +grpc:x64-uwp=fail +gsl:arm-uwp=fail +gsl:x64-uwp=fail +gsoap:arm-uwp=ignore +gsoap:x64-linux=fail +gsoap:x64-osx=fail +gsoap:x86-windows=ignore +gtk:x64-linux=fail +gtk:x86-windows=ignore +gts:x64-linux=fail +gts:x64-osx=fail +guetzli:x64-osx=fail +halide:x64-windows-static=fail +hdf5:arm64-windows=fail +hdf5:arm-uwp=fail +hdf5:x64-uwp=fail +hidapi:arm64-windows=fail +hidapi:arm-uwp=fail +hidapi:x64-linux=fail +hidapi:x64-osx=fail +hidapi:x64-uwp=fail +hiredis:arm-uwp=fail +hiredis:x64-uwp=fail +hpx:x64-windows-static=fail +hunspell:x64-linux=fail +hunspell:x64-osx=fail +hwloc:arm64-windows=fail +hwloc:arm-uwp=fail +hwloc:x64-linux=fail +hwloc:x64-osx=fail +hwloc:x64-uwp=fail +hyperscan:x64-linux=ignore +hypre:x64-linux=fail +hypre:x64-osx=fail +icu:arm64-windows=fail +icu:arm-uwp=fail +icu:x64-uwp=fail +ignition-msgs1:arm64-windows=fail +ignition-msgs1:arm-uwp=fail +ignition-msgs1:x64-uwp=fail +imgui:arm-uwp=fail +imgui:x64-uwp=fail +imgui-sfml:x64-linux=ignore +intel-ipsec:arm64-windows=fail +intel-ipsec:arm-uwp=fail +intel-ipsec:x64-osx=fail +intel-ipsec:x64-uwp=fail +intel-ipsec:x64-windows=fail +intel-ipsec:x64-windows-static=fail +intel-ipsec:x86-windows=fail +intel-mkl:arm64-windows=fail +intel-mkl:arm-uwp=fail +intel-mkl:x64-linux=fail +intel-mkl:x64-osx=fail +intel-mkl:x64-uwp=fail +intel-mkl:x64-windows=fail +intel-mkl:x64-windows-static=fail +intel-mkl:x86-windows=fail +intelrdfpmathlib:arm-uwp=fail +intelrdfpmathlib:x64-linux=fail +intelrdfpmathlib:x64-uwp=fail +io2d:x64-linux=fail +irrlicht:arm64-windows=fail +irrlicht:arm-uwp=fail +irrlicht:x64-osx=fail +irrlicht:x64-uwp=fail +isal:arm64-windows=fail +isal:arm-uwp=fail +isal:x64-osx=fail +isal:x64-uwp=fail +isal:x64-windows=fail +isal:x64-windows-static=fail +isal:x86-windows=fail +itk:x64-windows=fail +itk:x64-windows-static=fail +itk:x86-windows=fail +ixwebsocket:x64-linux=ignore +jack2:arm-uwp=fail +jack2:x64-uwp=fail +jbig2dec:arm-uwp=fail +jbig2dec:x64-uwp=fail +jemalloc:arm64-windows=fail +jemalloc:arm-uwp=fail +jemalloc:x64-linux=fail +jemalloc:x64-osx=fail +jemalloc:x64-uwp=fail +jemalloc:x64-windows-static=fail +jinja2cpplight:arm-uwp=fail +jinja2cpplight:x64-uwp=fail +jsonnet:x64-osx=fail +kd-soap:x64-linux=fail +kd-soap:x64-osx=fail +kd-soap:x64-windows-static=fail +keystone:arm64-windows=fail +keystone:arm-uwp=fail +keystone:x64-uwp=fail +kinectsdk1:arm64-windows=fail +kinectsdk1:arm-uwp=fail +kinectsdk1:x64-linux=fail +kinectsdk1:x64-osx=fail +kinectsdk2:arm64-windows=fail +kinectsdk2:arm-uwp=fail +kinectsdk2:x64-linux=fail +kinectsdk2:x64-osx=fail +lastools:arm-uwp=fail +lastools:x64-uwp=fail +laszip:arm-uwp=fail +laszip:x64-uwp=fail +lcm:x64-linux=fail +lcm:x64-osx=fail +leptonica:x64-uwp=fail +leptonica:arm-uwp=fail +leveldb:arm-uwp=fail +leveldb:x64-uwp=fail +libaiff:x64-linux=fail +libarchive:arm64-windows=fail +libarchive:arm-uwp=fail +libarchive:x64-uwp=fail +libass:x64-windows-static=fail +libb2:x86-windows=fail +libb2:x64-windows=fail +libb2:x64-windows-static=fail +libb2:x64-uwp=fail +libb2:arm64-windows=fail +libb2:arm-uwp=fail +libb2:x64-osx=fail +libbf:arm64-windows=fail +libbf:arm-uwp=fail +libbf:x64-uwp=fail +libbf:x64-windows=fail +libbf:x64-windows-static=fail +libbf:x86-windows=fail +libbson:arm-uwp=fail +libbson:x64-uwp=fail +libcds:arm64-windows=fail +libcds:arm-uwp=fail +libcds:x64-uwp=fail +libconfig:x64-osx=fail +libcopp:arm64-windows=fail +libcopp:arm-uwp=fail +libcopp:x64-windows-static=fail +libdatrie:x64-linux=fail +libdatrie:x64-osx=fail +libdisasm:arm-uwp=fail +libdisasm:x64-uwp=fail +libdshowcapture:arm64-windows=fail +libdshowcapture:arm-uwp=fail +libdshowcapture:x64-linux=fail +libdshowcapture:x64-osx=fail +libdshowcapture:x64-uwp=fail +libepoxy:arm64-windows=fail +libepoxy:arm-uwp=fail +libepoxy:x64-osx=fail +libepoxy:x64-uwp=fail +libepoxy:x64-windows-static=fail +libevent:arm-uwp=fail +libevent:x64-uwp=fail +libevhtp:x86-windows=fail +libevhtp:x64-windows=fail +libevhtp:x64-windows-static=fail +libevhtp:x64-uwp=fail +libevhtp:arm64-windows=fail +libevhtp:arm-uwp=fail +libexif:arm-uwp=fail +libexif:x64-uwp=fail +libfabric:arm-uwp=fail +libfabric:x64-linux=fail +libfabric:x64-osx=fail +libfabric:x64-uwp=fail +libfabric:x64-windows=ignore +libffi:arm64-windows=fail +libffi:arm-uwp=fail +libfreenect2:arm64-windows=fail +libgd:x64-linux=ignore +libgit2:arm64-windows=fail +libgit2:arm-uwp=fail +libgit2:x64-uwp=fail +libgo:arm64-windows=fail +libgo:x64-linux=fail +libgo:x64-osx=fail +libgo:x64-windows=fail +libgo:x64-windows-static=fail +libgo:x86-windows=fail +libhydrogen:arm64-windows=fail +libics:arm-uwp=fail +libics:x64-uwp=fail +libidn2:x64-linux=fail +libidn2:x64-osx=fail +libigl:arm64-windows=fail +libigl:arm-uwp=fail +libigl:x64-uwp=fail +liblemon:arm-uwp=fail +liblemon:x64-uwp=fail +liblinear:arm-uwp=fail +liblinear:x64-uwp=fail +liblo:arm-uwp=fail +liblo:x64-linux=fail +liblo:x64-osx=fail +liblo:x64-uwp=fail +liblsl:arm64-windows=fail +liblsl:arm-uwp=fail +liblsl:x64-linux=fail +liblsl:x64-osx=fail +liblsl:x64-uwp=fail +libmad:arm-uwp=fail +libmad:x64-uwp=fail +libmagic:x86-windows=fail +libmagic:x64-windows=fail +libmagic:x64-windows-static=fail +libmagic:x64-uwp=fail +libmagic:arm64-windows=fail +libmagic:arm-uwp=fail +libmariadb:arm64-windows = skip +libmariadb:arm-uwp = skip +libmariadb:x64-linux = skip +libmariadb:x64-osx = skip +libmariadb:x64-uwp = skip +libmariadb:x64-windows = skip +libmariadb:x64-windows-static = skip +libmariadb:x86-windows = skip +libmesh:arm64-windows=fail +libmesh:arm-uwp=fail +libmesh:x64-uwp=fail +libmesh:x64-windows=fail +libmesh:x64-windows-static=fail +libmesh:x86-windows=fail +libmicrohttpd:arm64-windows=fail +libmicrohttpd:arm-uwp=fail +libmicrohttpd:x64-linux=fail +libmicrohttpd:x64-osx=fail +libmicrohttpd:x64-uwp=fail +libmodbus:arm-uwp=fail +libmodbus:x64-uwp=fail +libmodman:arm-uwp=fail +libmodman:x64-uwp=fail +libmodman:x64-windows-static=fail +libmodplug:arm-uwp=fail +libmodplug:x64-uwp=fail +libmupdf:x64-linux=fail +libmupdf:x64-osx=fail +libmysql:x64-osx=fail +libmysql:x86-windows=fail +libnice:x64-linux=fail +libnice:x64-osx=fail +libodb-boost:x64-linux=ignore +libodb-pgsql:x64-linux=ignore +libodb-pgsql:x64-windows=ignore +libopenmpt:x64-linux=fail +libopenmpt:x64-osx=fail +libopusenc:arm-uwp=fail +libopusenc:x64-linux=fail +libopusenc:x64-osx=fail +libopusenc:x64-uwp=fail +libosip2:arm64-windows=fail +libosip2:arm-uwp=fail +libosip2:x64-uwp=fail +libosip2:x64-windows=fail +libosip2:x64-windows-static=fail +libosip2:x86-windows=fail +libp7-baical:arm64-windows = skip +libp7-baical:arm-uwp = skip +libp7-baical:x64-linux = skip +libp7-baical:x64-osx = skip +libp7-baical:x64-uwp = skip +libp7-baical:x64-windows = skip +libp7-baical:x64-windows-static = skip +libp7-baical:x86-windows = skip +libp7client:arm64-windows=fail +libp7client:arm-uwp=fail +libp7client:x64-linux=fail +libp7client:x64-osx=fail +libp7client:x64-uwp=fail +libpcap:arm64-windows=fail +libpcap:arm-uwp=fail +libpcap:x64-osx=fail +libpcap:x64-uwp=fail +libpcap:x64-windows=fail +libpcap:x64-windows-static=fail +libpcap:x86-windows=fail +libpff:arm-uwp=fail +libpff:x64-linux=fail +libpff:x64-osx=fail +libpff:x64-uwp=fail +libpff:x64-windows-static=fail +libplist:x64-windows-static=fail +libpng-apng:arm64-windows = skip +libpng-apng:arm-uwp = skip +libpng-apng:x64-linux = skip +libpng-apng:x64-osx = skip +libpng-apng:x64-uwp = skip +libpng-apng:x64-windows = skip +libpng-apng:x64-windows-static = skip +libpng-apng:x86-windows = skip +libpq:arm-uwp=fail +libpq:x64-uwp=fail +librabbitmq:x64-linux=ignore +libraqm:x64-windows-static=fail +librdkafka:arm-uwp=fail +librdkafka:x64-uwp=fail + +# Conflicts with openssl +libressl:arm64-windows = skip +libressl:arm-uwp = skip +libressl:x64-linux = skip +libressl:x64-osx = skip +libressl:x64-uwp = skip +libressl:x64-windows = skip +libressl:x64-windows-static = skip +libressl:x86-windows = skip +librsync:arm-uwp=fail +librsync:x64-uwp=fail +libsamplerate:arm64-windows=fail +libsamplerate:arm-uwp=fail +libsamplerate:x64-osx=fail +libsoundio:arm64-windows=fail +libsoundio:arm-uwp=fail +libsoundio:x64-uwp=fail +libsrt:arm-uwp=fail +libsrt:x64-uwp=fail +libssh:arm64-windows=fail +libssh:arm-uwp=fail +libssh:x64-uwp=fail +libstk:arm-uwp=fail +libstk:x64-uwp=fail +libtins:arm-uwp=fail +libtins:x64-uwp=fail +libtorrent:arm-uwp=fail +libtorrent:x64-uwp=fail +libudis86:arm-uwp=fail +libudis86:x64-linux=fail +libudis86:x64-osx=fail +libudis86:x64-uwp=fail +libudns:arm64-windows=fail +libudns:arm-uwp=fail +libudns:x64-uwp=fail +libudns:x64-windows=fail +libudns:x64-windows-static=fail +libudns:x86-windows=fail +libudns:x64-osx=fail +libui:arm-uwp=fail +libui:x64-linux=fail +libui:x64-uwp=fail +libusb:arm-uwp=fail +libusb:x64-linux=fail +libusb:x64-osx=fail +libusb:x64-uwp=fail +libusbmuxd:arm64-windows=fail +libusbmuxd:arm-uwp=fail +libusbmuxd:x64-uwp=fail +libusbmuxd:x64-linux=fail +libusbmuxd:x64-osx=fail +libusb-win32:arm64-windows=fail +libusb-win32:arm-uwp=fail +libusb-win32:x64-linux=fail +libusb-win32:x64-osx=fail +libusb-win32:x64-uwp=fail +libuuid:arm64-windows=fail +libuuid:arm-uwp=fail + +# Causes build failures in vxl and podofo on osx +# Conflicts with Darwin kernel sdk uuid.h (has missing definitions) +libuuid:x64-osx = skip +libuuid:x64-uwp=fail +libuuid:x64-windows=fail +libuuid:x64-windows-static=fail +libuuid:x86-windows=fail +libuv:arm64-windows=fail +libuv:arm-uwp=fail +libuv:x64-uwp=fail +libvpx:arm64-windows=fail +libvpx:arm-uwp=fail +libvpx:x64-linux=fail +libvpx:x64-osx=fail +libwandio:x86-windows=fail +libwandio:x64-windows=fail +libwandio:x64-windows-static=fail +libwandio:x64-uwp=fail +libwandio:arm64-windows=fail +libwandio:arm-uwp=fail +libwebsockets:arm-uwp=fail +libwebsockets:x64-uwp=fail +libxmp-lite:x64-linux=fail +libxmp-lite:x64-osx=fail +libxslt:arm-uwp=fail +libxslt:x64-osx=fail +libxslt:x64-uwp=fail +libyuv:arm-uwp=fail +libyuv:x64-uwp=fail +libzen:arm-uwp=fail +libzen:x64-uwp=fail +libzippp:x64-linux=ignore +linenoise-ng:arm-uwp=fail +linenoise-ng:x64-uwp=fail +live555:arm64-windows=fail +live555:arm-uwp=fail +live555:x64-linux=fail +live555:x64-osx=fail +live555:x64-uwp=fail +live555:x64-windows=fail +live555:x64-windows-static=fail +live555:x86-windows=fail +llgl:arm-uwp=fail +llgl:x64-uwp=fail +llvm:arm64-windows=fail +llvm:arm-uwp=fail +llvm:x64-uwp=fail +llvm:x64-linux=ignore +# installing iconv makes building llvm fail; needs to be fixed +llvm:x64-osx=ignore +lmdb:arm64-windows=fail +lmdb:arm-uwp=fail +lmdb:x64-uwp=fail +lodepng:x64-osx=fail +log4cplus:arm-uwp=fail +log4cplus:x64-uwp=fail +log4cpp:arm-uwp=fail +log4cpp:x64-uwp=fail +lpeg:x64-linux=fail +lpeg:x64-osx=fail +lua:arm-uwp=fail +lua:x64-uwp=fail +luafilesystem:x64-linux=fail +luafilesystem:x64-osx=fail +luajit:arm64-windows = skip +luajit:arm-uwp = skip +luajit:x64-linux = skip +luajit:x64-osx = skip +luajit:x64-uwp = skip +luajit:x64-windows = skip +luajit:x64-windows-static = skip +luajit:x86-windows = skip +luasocket:x64-linux=fail +luasocket:x64-osx=fail +lzfse:arm-uwp=fail +marl:arm-uwp=fail +marl:x64-uwp=fail +mathgl:x64-osx=fail +mathgl:x64-uwp=fail +mathgl:x64-linux=ignore +matio:x64-linux=fail +matio:x64-osx=fail +mbedtls:arm-uwp=fail +mbedtls:x64-uwp=fail +mdnsresponder:arm64-windows=fail +mdnsresponder:arm-uwp=fail +mdnsresponder:x64-linux=fail +mdnsresponder:x64-osx=fail +mdnsresponder:x64-uwp=fail +mecab:arm64-windows = skip +mecab:arm-uwp = skip +mecab:x64-linux = skip +mecab:x64-uwp = skip +mecab:x64-windows = skip +mecab:x64-windows-static = skip +mecab:x86-windows = skip +meschach:arm-uwp=fail +meschach:x64-linux=fail +meschach:x64-osx=fail +meschach:x64-uwp=fail +metis:arm-uwp=fail +metis:x64-uwp=fail +mhook:arm64-windows=fail +mhook:arm-uwp=fail +mhook:x64-linux=fail +mhook:x64-osx=fail +mhook:x64-uwp=fail +mhook:x64-windows=fail +mhook:x64-windows-static=fail +mhook:x86-windows=fail +milerius-sfml-imgui:x64-osx=fail +milerius-sfml-imgui:x64-windows-static=fail +milerius-sfml-imgui:x64-linux=ignore +minhook:arm64-windows=fail +minhook:arm-uwp=fail +minhook:x64-linux=fail +minhook:x64-osx=fail +minhook:x64-uwp=fail +minifb:arm-uwp=fail +minifb:x64-uwp=fail +minisat-master-keying:arm-uwp=fail +minisat-master-keying:x64-uwp=fail +miniupnpc:arm-uwp=fail +miniupnpc:x64-uwp=fail +minizip:arm-uwp=fail +minizip:x64-uwp=fail +mlpack:x64-linux=ignore +mman:x64-linux=fail +mman:x64-osx=fail +mmx:x64-windows=ignore +mmx:x64-windows-static=ignore +mmx:x86-windows=ignore +mongo-c-driver:arm64-windows=fail +mongo-c-driver:x64-osx=fail +mongoose:arm-uwp=fail +mongoose:x64-uwp=fail +monkeys-audio:arm64-windows=fail +monkeys-audio:arm-uwp=fail +monkeys-audio:x64-linux=fail +monkeys-audio:x64-osx=fail +monkeys-audio:x64-uwp=fail +monkeys-audio:x64-windows-static=fail +moos-core:arm-uwp=fail +moos-core:x64-uwp=fail +moos-core:x64-windows=ignore +moos-core:x64-windows-static=fail +moos-core:x86-windows=ignore +moos-essential:arm64-windows=fail +moos-essential:x64-windows=fail +moos-essential:x86-windows=fail +moos-essential:x64-linux=ignore +mosquitto:x64-windows-static=fail +mozjpeg:arm64-windows = skip +mozjpeg:arm-uwp = skip +mozjpeg:x64-linux = skip +mozjpeg:x64-osx = skip +mozjpeg:x64-uwp = skip +mozjpeg:x64-windows = skip +mozjpeg:x64-windows-static = skip +mozjpeg:x86-windows = skip +mpg123:arm-uwp=fail +mpg123:x64-uwp=fail +mpir:arm64-windows=fail +mpir:arm-uwp=fail +mpir:x64-uwp=fail + +#Conflicts with angle and qt-5base +ms-angle:arm64-windows = skip +ms-angle:arm-uwp = skip +ms-angle:x64-linux = fail +ms-angle:x64-osx = fail +ms-angle:x64-uwp = skip +ms-angle:x64-windows = skip +ms-angle:x64-windows-static = skip +ms-angle:x86-windows = skip +msix:x64-linux=fail +msix:x64-osx=fail +msix:x64-windows-static=fail +msmpi:arm64-windows=fail +msmpi:arm-uwp=fail +msmpi:x64-linux=fail +msmpi:x64-osx=fail +msmpi:x64-uwp=fail +muparser:arm-uwp=fail +muparser:x64-uwp=fail +nana:arm-uwp=fail +nana:x64-linux=fail +nana:x64-osx=fail +nana:x64-uwp=fail +nanodbc:arm-uwp=fail +nanodbc:x64-linux=fail +nanodbc:x64-osx=fail +nanodbc:x64-uwp=fail +nanorange:arm64-windows=fail +nanorange:arm-uwp=fail +nanorange:x64-linux=fail +nanorange:x64-osx=fail +nanorange:x64-uwp=fail +nanorange:x64-windows=fail +nanorange:x64-windows-static=fail +nanorange:x86-windows=fail +nanovg:arm-uwp=fail +nanovg:arm64-windows=ignore +nanovg:x64-uwp=fail +nanovg:x64-linux=ignore +nanovg:x64-windows=ignore +nanovg:x64-windows-static=ignore +nanovg:x86-windows=ignore +nativefiledialog:arm-uwp=fail +nativefiledialog:x64-uwp=fail +netcdf-cxx4:x64-linux=ignore +nethost:x64-uwp=fail +nethost:arm-uwp=fail +networkdirect-sdk:arm64-windows=fail +networkdirect-sdk:arm-uwp=fail +networkdirect-sdk:x64-linux=fail +networkdirect-sdk:x64-osx=fail +networkdirect-sdk:x64-uwp=fail +networkdirect-sdk:x86-windows=fail +nlopt:arm-uwp=fail +nlopt:x64-uwp=fail +nmslib:arm64-windows=fail +nmslib:arm-uwp=fail +nmslib:x64-uwp=fail +nng:arm-uwp=fail +nng:x64-uwp=fail +nrf-ble-driver:arm-uwp=fail +nrf-ble-driver:x64-uwp=fail +nrf-ble-driver:x64-linux=ignore +numactl:arm64-windows=fail +numactl:arm-uwp=fail +numactl:x64-osx=fail +numactl:x64-uwp=fail +numactl:x64-windows=fail +numactl:x64-windows-static=fail +numactl:x86-windows=fail +nvtt:arm64-windows=fail +nvtt:arm-uwp=fail +nvtt:x64-uwp=fail +octomap:arm-uwp=fail +octomap:x64-uwp=fail +ode:arm64-windows=fail +ode:arm-uwp=fail +ode:x64-uwp=fail +ode:x64-linux=ignore +offscale-libetcd-cpp:arm64-windows=fail +offscale-libetcd-cpp:arm-uwp=fail +offscale-libetcd-cpp:x64-uwp=fail +ogdf:arm64-windows = skip +ogdf:arm-uwp = skip +ogdf:x64-osx=fail +ogdf:x64-uwp = skip +ogdf:x64-windows = skip +ogdf:x64-windows-static = skip +ogdf:x86-windows = skip +ogre:x64-osx=fail +# Conflicts with ogre +ogre-next:arm64-windows = skip +ogre-next:arm-uwp = skip +ogre-next:x64-osx = skip +ogre-next:x64-linux = skip +ogre-next:x64-uwp = skip +ogre-next:x64-windows = skip +ogre-next:x64-windows-static = skip +ogre-next:x86-windows = skip +ois:arm64-windows=fail +ois:arm-uwp=fail +ois:x64-uwp=fail +ompl:x64-osx=fail +ompl:x64-linux=ignore +open62541:arm-uwp=fail +open62541:x64-uwp=fail +openal-soft:arm-uwp=fail +openal-soft:x64-uwp=fail +openblas:arm64-windows=fail +openblas:arm-uwp=fail +opencensus-cpp:arm64-windows=fail +opencensus-cpp:x64-windows=fail +opencensus-cpp:x64-windows-static=fail +opencensus-cpp:x86-windows=fail +opencl:arm64-windows=fail +opencl:arm-uwp=fail +opencl:x64-uwp=fail +opencolorio:x64-linux=ignore +opencsg:x64-uwp=fail +opencv3:arm64-windows = skip +opencv3:arm-uwp = skip +opencv3:x64-linux = skip +opencv3:x64-osx = skip +opencv3:x64-uwp = skip +opencv3:x64-windows = skip +opencv3:x64-windows-static = skip +opencv3:x86-windows = skip +opendnp3:x64-uwp=fail +opendnp3:arm-uwp=fail +openexr:arm64-windows=fail +openexr:arm-uwp=fail +openexr:x64-uwp=fail +opengl:arm64-windows=fail +opengl:arm-uwp=fail +openimageio:x64-linux=ignore +openmama:x64-windows=ignore +openmama:x86-windows=ignore +openmesh:arm64-windows=fail +openmesh:arm-uwp=fail +openmesh:x64-uwp=fail +openmpi:arm64-windows=fail +openmpi:arm-uwp=fail +openmpi:x64-uwp=fail +openmpi:x64-windows=fail +openmpi:x64-windows-static=fail +openmpi:x86-windows=fail +openmvg:x64-linux=ignore +openmvs:x64-linux=fail +openni2:x64-uwp=fail +openni2:x64-windows-static=fail +openscap:x64-linux=fail +openssl-unix:arm64-windows=fail +openssl-unix:arm-uwp=fail +openssl-unix:x64-uwp=fail +openssl-unix:x64-windows=fail +openssl-unix:x64-windows-static=fail +openssl-unix:x86-windows=fail +openssl-uwp:arm64-windows=fail +openssl-uwp:x64-linux=fail +openssl-uwp:x64-osx=fail +openssl-uwp:x64-windows=fail +openssl-uwp:x64-windows-static=fail +openssl-uwp:x86-windows=fail +openssl-windows:arm-uwp=fail +openssl-windows:x64-linux=fail +openssl-windows:x64-osx=fail +openssl-windows:x64-uwp=fail +opentracing:arm-uwp=fail +opentracing:x64-uwp=fail +openvdb:x64-linux=ignore +openvdb:x64-osx=fail +openvdb:x64-windows-static=fail +openvpn3:x64-osx=fail +openvr:arm64-windows=fail +openvr:arm-uwp=fail +openvr:x64-linux=fail +openvr:x64-osx=fail +openvr:x64-uwp=fail +openxr-loader:arm64-windows=fail +openxr-loader:arm-uwp=fail +openxr-loader:x64-osx=fail +openxr-loader:x64-uwp=fail +optional-bare:arm64-windows = skip +optional-bare:arm-uwp = skip +optional-bare:x64-linux = skip +optional-bare:x64-osx = skip +optional-bare:x64-uwp = skip +optional-bare:x64-windows = skip +optional-bare:x64-windows-static = skip +optional-bare:x86-windows = skip +opusfile:arm-uwp=fail +opusfile:x64-uwp=fail +orc:x64-linux=ignore +orocos-kdl:arm-uwp=fail +orocos-kdl:x64-uwp=fail +osg:x64-linux=fail +osg:x64-osx=fail +osg:x64-windows-static=fail +otl:x64-windows=ignore +otl:x64-windows-static=ignore +otl:x64-uwp=ignore +otl:x64-linux=ignore +otl:x86-windows=ignore +paho-mqtt:arm-uwp=fail +paho-mqtt:x64-uwp=fail +pangolin:x64-linux=fail +pangolin:x64-osx=fail +pangolin:x64-uwp=fail +pangolin:x64-windows-static=fail +pangomm:x64-osx=fail +pangomm:x64-windows=ignore +pangomm:x86-windows=ignore +parmetis:x64-linux=fail +parmetis:x64-osx=fail +pbc:arm-uwp=fail +pbc:x64-uwp=fail +pcre2:arm-uwp=fail +pdal:x64-linux=fail +pdal:x64-osx=fail +pdal-c:x64-windows-static=fail +pdcurses:arm-uwp=fail +pdcurses:x64-linux=fail +pdcurses:x64-osx=fail +pdcurses:x64-uwp=fail +pdcurses:x64-windows-static=fail +pfring:arm64-windows=fail +pfring:arm-uwp=fail +pfring:x64-uwp=fail +pfring:x64-windows=fail +pfring:x64-windows-static=fail +pfring:x86-windows=fail +pfring:x64-osx=fail +physfs:arm64-windows=fail +physx:arm64-windows=fail +physx:x64-linux=fail +physx:x64-osx=fail +piex:x64-osx=fail +pistache:arm64-windows=fail +pistache:arm-uwp=fail +pistache:x64-osx=fail +pistache:x64-uwp=fail +pistache:x64-windows=fail +pistache:x64-windows-static=fail +pistache:x86-windows=fail +pixel:x64-uwp=fail +pixel:x64-windows=fail +pixel:x64-windows-static=fail +pixel:x86-windows=fail +pixel:x64-linux=ignore +platform-folders:arm-uwp=fail +platform-folders:x64-uwp=fail +plib:arm-uwp=fail +plib:x64-osx=fail +plib:x64-uwp=fail +plibsys:arm-uwp=fail +plibsys:x64-linux=fail +plibsys:x64-osx=fail +plibsys:x64-uwp=fail +plplot:arm64-windows=fail +plplot:arm-uwp=fail +plplot:x64-uwp=fail +pmdk:arm64-windows=fail +pmdk:arm-uwp=fail +pmdk:x64-linux=fail +pmdk:x64-osx=fail +pmdk:x64-uwp=fail +pmdk:x64-windows-static=fail +pmdk:x86-windows=fail +pngwriter:arm-uwp=fail +pngwriter:x64-uwp=fail +pngwriter:x64-linux=ignore +polyhook2:arm64-windows=fail +polyhook2:arm-uwp=fail +polyhook2:x64-linux=fail +polyhook2:x64-uwp=fail +polyhook2:x64-osx=fail +portable-snippets:arm-uwp=fail +portaudio:arm64-windows=fail +portaudio:arm-uwp=fail +portaudio:x64-uwp=fail +portmidi:arm64-windows=fail +portmidi:arm-uwp=fail +portmidi:x64-linux=fail +portmidi:x64-osx=fail +portmidi:x64-uwp=fail +ppconsul:arm-uwp=fail +ppconsul:x64-uwp=fail +ppconsul:x64-linux=ignore +pqp:arm-uwp=fail +pqp:x64-uwp=fail +proj4:arm64-windows=fail +proj4:arm-uwp=fail +proj4:x64-uwp=fail +protobuf-c:x86-windows=fail +protobuf-c:x64-windows=fail +protobuf-c:x64-windows-static=fail +protobuf-c:x64-uwp=fail +protobuf-c:arm64-windows=fail +protobuf-c:arm-uwp=fail +ptex:arm-uwp=fail +ptex:x64-linux=fail +ptex:x64-osx=fail +ptex:x64-uwp=fail +pthreads:arm64-windows=fail +pthreads:arm-uwp=fail +pthreads:x64-uwp=fail +python2:arm64-windows=fail +python2:arm-uwp=fail +python2:x64-linux=fail +python2:x64-osx=fail +python2:x64-uwp=fail +python3:arm64-windows=fail +python3:arm-uwp=fail +python3:x64-osx=fail +python3:x64-uwp=fail +qca:x64-linux=fail +qca:x64-osx=fail +qca:x64-windows-static=fail +qcustomplot:x64-osx=fail +qhull:arm-uwp=ignore +qhull:x64-windows-static=ignore +qhull:x64-uwp=ignore +qpid-proton:arm-uwp=fail +qpid-proton:x64-uwp=fail +qpid-proton:x64-windows-static=fail +qscintilla:x64-linux=fail +qscintilla:x64-osx=fail +qt5-activeqt:x64-linux=fail +qt5-activeqt:x64-osx=fail +qt5-macextras:x64-linux=fail +qt5-macextras:x64-windows=fail +qt5-macextras:x64-windows-static=fail +qt5-macextras:x86-windows=fail +qt5-winextras:x64-linux=fail +qt5-winextras:x64-osx=fail +quickfast:x64-linux=ignore +quickfix:x64-linux=ignore +quickfix:x64-windows=ignore +quickfix:x64-windows-static=ignore +quickfix:x86-windows=ignore +quickfix:x64-uwp=fail +quickfix:arm-uwp=fail +quirc:arm64-windows = skip +quirc:arm-uwp = skip +quirc:x64-linux = skip +quirc:x64-osx = skip +quirc:x64-uwp = skip +quirc:x64-windows = skip +quirc:x64-windows-static = skip +quirc:x86-windows = skip +qwt:x64-osx=ignore +rabit:x64-osx=fail +rabit:x64-linux=ignore +ragel:arm-uwp=fail +ragel:x64-uwp=fail +range-v3-vs2015:arm64-windows = skip +range-v3-vs2015:arm-uwp = skip +range-v3-vs2015:x64-linux = skip +range-v3-vs2015:x64-osx = skip +range-v3-vs2015:x64-uwp = skip +range-v3-vs2015:x64-windows = skip +range-v3-vs2015:x64-windows-static = skip +range-v3-vs2015:x86-windows = skip +rapidstring:arm64-windows=fail +rapidstring:arm-uwp=fail +rapidstring:x64-linux=fail +rapidstring:x64-uwp=fail +rapidstring:x64-windows=fail +rapidstring:x64-windows-static=fail +rapidstring:x86-windows=fail +raylib:arm64-windows=fail +raylib:arm-uwp=fail +raylib:x64-uwp=fail +readline:arm-uwp=fail +readline:x64-uwp=fail +readline-win32:arm64-windows=fail +readline-win32:arm-uwp=fail +readline-win32:x64-linux=fail +readline-win32:x64-osx=fail +readline-win32:x64-uwp=fail +readosm:x64-linux=fail +readosm:x64-osx=fail +realsense2:arm64-windows=fail +realsense2:arm-uwp=fail +realsense2:x64-linux=fail +realsense2:x64-uwp=fail +redis-plus-plus:x86-windows=fail +redis-plus-plus:x64-windows=fail +redis-plus-plus:x64-windows-static=fail +redis-plus-plus:arm64-windows=fail +reproc:arm-uwp=fail +reproc:x64-uwp=fail +restbed:arm-uwp=fail +restbed:x64-uwp=fail +rhash:arm64-windows=fail +rhash:arm-uwp=fail +rhash:x64-uwp=fail +rocksdb:arm-uwp=fail +rocksdb:x64-uwp=fail +rocksdb:x64-linux=ignore +rpclib:arm64-windows=fail +rpclib:arm-uwp=fail +rpclib:x64-uwp=fail +rpclib:x64-windows=ignore +rpclib:x86-windows=ignore +rpclib:x64-windows-static=ignore +rttr:arm-uwp=fail +rttr:x64-uwp=fail +scintilla:arm-uwp=fail +scintilla:x64-linux=fail +scintilla:x64-osx=fail +scintilla:x64-uwp=fail +scintilla:x64-windows-static=fail +sciter:arm64-windows=fail +sciter:arm-uwp=fail +sciter:x64-uwp=fail +sciter:x64-windows-static=fail +scnlib:arm-uwp=fail +scnlib:x64-uwp=fail +scnlib:x86-windows=fail +scylla-wrapper:arm64-windows=fail +scylla-wrapper:arm-uwp=fail +scylla-wrapper:x64-linux=fail +scylla-wrapper:x64-osx=fail +scylla-wrapper:x64-uwp=fail +scylla-wrapper:x64-windows-static=fail +sdformat6:arm64-windows=fail +sdformat6:arm-uwp=fail +sdformat6:x64-uwp=fail +sdformat6:x64-linux=ignore +sdl1:arm-uwp=fail +sdl1:x64-uwp=fail +sdl1:x64-osx=fail +sdl2-gfx:arm64-windows=fail +sdl2-gfx:x64-linux=fail +sdl2-gfx:x64-osx=fail +sdl2-image:arm-uwp=fail +sdl2-image:x64-uwp=fail +sdl2-mixer:arm-uwp=fail +sdl2-mixer:x64-uwp=fail +sdl2-net:arm-uwp=fail +sdl2-net:x64-uwp=fail +secp256k1:x64-linux=fail +secp256k1:x64-osx=fail +selene:x64-linux=ignore +sentencepiece:arm64-windows=fail +sentencepiece:arm-uwp=fail +sentencepiece:x64-uwp=fail +sentencepiece:x64-windows=fail +sentencepiece:x86-windows=fail +septag-sx:arm64-windows=fail +septag-sx:arm-uwp=fail +septag-sx:x64-uwp=fail +sfgui:x64-linux=ignore +sfml:arm64-windows=fail +shapelib:arm-uwp=fail +shapelib:x64-uwp=fail +shiva:x64-windows=fail +shiva:x64-windows-static=fail +shiva-sfml:x64-linux=fail +shiva-sfml:x64-osx=fail +shiva-sfml:x86-windows=fail +shogun:arm64-windows = skip +shogun:arm-uwp = skip +shogun:x64-osx=fail +shogun:x64-uwp = skip +shogun:x64-windows = skip +shogun:x64-windows-static = skip +shogun:x86-windows = skip +simdjson:arm64-windows=fail +simdjson:arm-uwp=fail +simdjson:x86-windows=fail +slikenet:arm-uwp=fail +slikenet:x64-uwp=fail +smpeg2:arm-uwp=fail +smpeg2:x64-linux=fail +smpeg2:x64-uwp=fail +soci:arm-uwp=fail +soci:x64-uwp=fail +soem:x64-uwp=fail +soem:arm-uwp=fail +soil:arm-uwp=fail +soil:x64-uwp=fail +soil2:arm-uwp=fail +soil2:x64-uwp=fail +sophus:x64-linux=fail +soundtouch:arm-uwp=fail +soundtouch:x64-linux=ignore +soundtouch:x64-uwp=fail +soundtouch:x64-windows-static=fail +spaceland:arm64-windows=fail +spaceland:arm-uwp=fail +spaceland:x64-uwp=fail +spaceland:x64-linux=ignore +spdk:x64-linux=fail +spdk-dpdk:arm64-windows=fail +spdk-dpdk:arm-uwp=fail +spdk-dpdk:x64-osx=fail +spdk-dpdk:x64-uwp=fail +spdk-dpdk:x64-windows=fail +spdk-dpdk:x64-windows-static=fail +spdk-dpdk:x86-windows=fail +spdk-ipsec:arm64-windows=fail +spdk-ipsec:arm-uwp=fail +spdk-ipsec:x64-osx=fail +spdk-ipsec:x64-uwp=fail +spdk-ipsec:x64-windows=fail +spdk-ipsec:x64-windows-static=fail +spdk-ipsec:x86-windows=fail +spdk-isal:arm64-windows=fail +spdk-isal:arm-uwp=fail +spdk-isal:x64-osx=fail +spdk-isal:x64-uwp=fail +spdk-isal:x64-windows=fail +spdk-isal:x64-windows-static=fail +spdk-isal:x86-windows=fail +speex:x64-linux=fail +speex:x64-osx=fail +speexdsp:x64-linux=fail +speexdsp:x64-osx=fail +spirv-tools:arm-uwp=fail +spirv-tools:x64-uwp=fail +stormlib:arm-uwp=fail +stormlib:x64-uwp=fail +stxxl:arm-uwp=fail +stxxl:x64-uwp=fail +systemc:arm64-windows=fail +systemc:arm-uwp=fail +systemc:x64-uwp=fail +taglib:x64-linux=ignore +tbb:arm64-windows=fail +tbb:arm-uwp=fail +tbb:x64-uwp=fail +tcl:arm-uwp=ignore +tcl:arm64-windows=ignore +tcl:x64-uwp=ignore +tcl:x64-linux=ignore +tcl:x64-osx=ignore +teemo:x64-uwp=fail +teemo:arm-uwp=fail +teemo:arm64-windows=fail +teemo:x64-osx=fail +telnetpp:arm-uwp=fail +telnetpp:x64-uwp=fail +tensorflow-cc:arm64-windows=fail +tensorflow-cc:x64-linux = skip +tensorflow-cc:x64-osx=fail +tensorflow-cc:x64-windows=fail +tensorflow-cc:x64-windows-static=fail +tensorflow-cc:x86-windows=fail +tesseract:x64-windows=ignore +tesseract:x64-windows-static=ignore +tesseract:x86-windows=ignore +tfhe:x86-windows=fail +tfhe:x64-windows=fail +tfhe:x64-windows-static=fail +tfhe:x64-uwp=fail +tfhe:arm64-windows=fail +tfhe:arm-uwp=fail +theia:arm64-windows = skip +theia:arm-uwp = skip +theia:x64-uwp = skip +theia:x64-windows = skip +theia:x64-windows-static = skip +theia:x86-windows = skip +thor:x64-linux=fail +thor:x64-osx=fail +thrift:x64-osx=fail +tidy-html5:arm-uwp=fail +tidy-html5:x64-linux=fail +tidy-html5:x64-osx=fail +tidy-html5:x64-uwp=fail +tinkerforge:arm-uwp=fail +tinkerforge:x64-uwp=fail +tinyexif:arm-uwp=fail +tinyexif:x64-uwp=fail +tinyfiledialogs:arm64-windows=fail +tinyfiledialogs:arm-uwp=fail +tinyfiledialogs:x64-linux=fail +tinyfiledialogs:x64-uwp=fail +tinyfiledialogs:x64-windows=fail +tinyfiledialogs:x64-windows-static=fail +tinyfiledialogs:x86-windows=fail +tinyfiledialogs:x64-osx=fail +tinynpy:x64-linux=ignore +tiny-process-library:arm-uwp=fail +tiny-process-library:x64-uwp=fail +tinyutf8:arm64-windows=fail +tinyutf8:arm-uwp=fail +tinyutf8:x64-uwp=fail + +#Flaky on windows only due to error PRI210: 0x80070020 - File move failed +tmx:arm64-windows = skip +tmx:arm-uwp = skip +tmx:x64-uwp = skip +tmx:x64-windows = skip +tmx:x64-windows-static = skip +tmx:x86-windows = skip +tmxlite:arm-uwp=fail +tmxlite:x64-uwp=fail +tmxparser:arm64-windows=fail +tmxparser:arm-uwp=fail +tmxparser:x64-uwp=fail +tmxparser:x64-windows=fail +tmxparser:x64-windows-static=fail +tmxparser:x86-windows=fail +torch-th:arm64-windows=fail +torch-th:arm-uwp=fail +torch-th:x64-uwp=fail +torch-th:x64-windows-static=fail +tre:x64-osx=fail +treehopper:x64-windows-static=fail +unicorn:arm64-windows=fail +unicorn:arm-uwp=fail +unicorn:x64-linux=fail +unicorn:x64-osx=fail +unicorn:x64-uwp=fail +unicorn-lib:x64-uwp=fail +unittest-cpp:arm64-windows=fail +unittest-cpp:arm-uwp=fail +unittest-cpp:x64-uwp=fail +unrar:arm64-windows=fail +unrar:arm-uwp=fail +unrar:x64-linux=fail +unrar:x64-osx=fail +unrar:x64-uwp=fail +unrar:x64-windows-static=fail +upb:arm64-windows=fail +upb:arm-uwp=fail +upb:x64-uwp=fail +upb:x64-windows=fail +upb:x64-windows-static=fail +upb:x86-windows=fail +urdfdom:x64-windows-static=fail +usd:x64-linux=ignore +usd:x86-windows=fail +usrsctp:arm-uwp=fail +usrsctp:x64-uwp=fail +uvatlas:arm64-windows=fail +uvatlas:arm-uwp=fail +uvatlas:x64-linux=fail +uvatlas:x64-osx=fail +uvatlas:x64-windows-static=fail +vectorclass:arm64-windows=fail +vectorclass:arm-uwp=fail +vlpp:arm64-windows=fail +vlpp:arm-uwp=fail +vlpp:x64-osx=fail +vlpp:x64-uwp=fail +vulkan:arm64-windows=fail +vulkan:arm-uwp=fail +vulkan:x64-linux=fail +vulkan:x64-osx=fail +vulkan:x64-uwp=fail +vulkan:x64-windows=fail +vulkan:x64-windows-static=fail +vulkan:x86-windows=fail +# Conflicts with latest openjpeg port (vxl ships with an old version of openjpeg) +# conflicts with qt5-location +vxl:arm64-windows = skip +vxl:arm-uwp = skip +vxl:x64-linux = skip +vxl:x64-osx = skip +vxl:x64-uwp = skip +vxl:x64-windows = skip +vxl:x64-windows-static = skip +vxl:x86-windows = skip +wampcc:x64-linux=ignore +wangle:x64-linux=ignore +wavpack:arm64-windows=fail +wavpack:x64-linux=fail +wavpack:x64-osx=fail +wepoll:arm-uwp=ignore +wepoll:x64-uwp=ignore +wepoll:x64-linux=ignore +wepoll:x64-osx=ignore +wildmidi:x64-osx=fail +wincrypt:x64-linux=fail +wincrypt:x64-osx=fail +winpcap:arm64-windows = skip +winpcap:arm-uwp = skip +winpcap:x64-linux=fail +winpcap:x64-osx=fail +winpcap:x64-uwp = skip +winpcap:x64-windows = skip +winpcap:x64-windows-static = skip +winpcap:x86-windows = skip +winsock2:x64-linux=fail +winsock2:x64-osx=fail +wintoast:arm-uwp=fail +wintoast:x64-linux=fail +wintoast:x64-osx=fail +wintoast:x64-uwp=fail +woff2:x64-linux=fail +woff2:x64-osx=fail +woff2:x64-windows-static=fail +wpilib:x64-osx=fail +wxchartdir:x64-osx=fail +wxwidgets:x64-linux=fail +x264:arm64-windows=fail +x264:arm-uwp=fail +x264:x64-uwp=ignore +x264:x64-linux=fail +x264:x64-osx=fail +x264:x86-windows=ignore +x264:x64-windows=ignore +x264:x64-windows-static=ignore +x265:arm64-windows=fail +x265:arm-uwp=fail +x265:x64-uwp=fail +xalan-c:x64-windows-static=fail +xerces-c:arm64-windows=fail +xerces-c:arm-uwp=fail +xerces-c:x64-uwp=fail +xeus:x64-linux=ignore +xmlsec:arm-uwp=fail +xmlsec:x64-uwp=fail +xmsh:arm64-windows=fail +xmsh:arm-uwp=fail +xmsh:x64-uwp=fail +xmsh:x64-windows=fail +xmsh:x64-windows-static=fail +xmsh:x86-windows=fail +xmsh:x64-linux=ignore +xtensor-io:x64-uwp=ignore +x-plane:arm64-windows=fail +x-plane:arm-uwp=fail +x-plane:x64-linux=fail +x-plane:x86-windows=fail +yajl:arm-uwp=fail +yajl:x64-uwp=fail +yara:arm64-windows=fail +yara:arm-uwp=fail +yara:x64-uwp=fail +yasm:arm64-windows=fail +yasm:arm-uwp=fail +yasm:x64-linux=fail +yasm:x64-osx=fail +yasm:x64-uwp=fail +yato:arm64-windows=fail +yato:arm-uwp=fail +yato:x64-uwp=fail +z3:arm64-windows=fail +z3:arm-uwp=fail +z3:x64-uwp=fail +zeromq:arm64-windows=fail +zeromq:arm-uwp=fail +zeromq:x64-uwp=fail From 535cd93162e219545070225efcdc837cdc26aeed Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 23 Jan 2020 00:24:36 +0100 Subject: [PATCH 204/419] fix vtk x64-windows-static regression by fixing hdf5 --- ports/hdf5/CONTROL | 2 +- ports/hdf5/hdf5_config.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/hdf5/CONTROL b/ports/hdf5/CONTROL index 7132346d6a9e6e..dc513656bd725a 100644 --- a/ports/hdf5/CONTROL +++ b/ports/hdf5/CONTROL @@ -1,5 +1,5 @@ Source: hdf5 -Version: 1.10.5-10 +Version: 1.10.5-11 Homepage: https://www.hdfgroup.org/downloads/hdf5/ Description: HDF5 is a data model, library, and file format for storing and managing data Default-Features: szip, zlib diff --git a/ports/hdf5/hdf5_config.patch b/ports/hdf5/hdf5_config.patch index c9966b30f457e8..2b44a5320ec5ab 100644 --- a/ports/hdf5/hdf5_config.patch +++ b/ports/hdf5/hdf5_config.patch @@ -8,7 +8,7 @@ index 3bd9e1d..7f6699c 100644 if (NOT TARGET "@HDF5_PACKAGE@") - if (${HDF5_PACKAGE_NAME}_ENABLE_Z_LIB_SUPPORT AND ${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS AND NOT TARGET "zlib") - include (@PACKAGE_SHARE_INSTALL_DIR@/@ZLIB_PACKAGE_NAME@/@ZLIB_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake) -+ if (${HDF5_PACKAGE_NAME}_ENABLE_Z_LIB_SUPPORT AND NOT TARGET "zlib") ++ if (${HDF5_PACKAGE_NAME}_ENABLE_Z_LIB_SUPPORT AND NOT TARGET ZLIB::ZLIB) + find_package(ZLIB REQUIRED) endif () - if (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_SUPPORT AND ${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS AND NOT TARGET "szip") From b0390843dac7d8bc4e897e502aa55fd8ea48ae26 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 23 Jan 2020 08:20:34 +0100 Subject: [PATCH 205/419] update ci baseline --- scripts/ci.baseline.txt | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index e17703b3be61db..f75614e9fe0d69 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -307,7 +307,6 @@ cudnn:arm-uwp=fail cudnn:x64-uwp=fail cudnn:x64-windows-static=fail cudnn:x86-windows=fail -cutelyst2:x64-osx=fail darknet:arm-uwp=fail darknet:x64-uwp=fail date:arm64-windows=fail @@ -1404,7 +1403,6 @@ python3:x64-uwp=fail qca:x64-linux=fail qca:x64-osx=fail qca:x64-windows-static=fail -qcustomplot:x64-osx=fail qhull:arm-uwp=ignore qhull:x64-windows-static=ignore qhull:x64-uwp=ignore @@ -1412,15 +1410,15 @@ qpid-proton:arm-uwp=fail qpid-proton:x64-uwp=fail qpid-proton:x64-windows-static=fail qscintilla:x64-linux=fail -qscintilla:x64-osx=fail -qt5-activeqt:x64-linux=fail -qt5-activeqt:x64-osx=fail -qt5-macextras:x64-linux=fail -qt5-macextras:x64-windows=fail -qt5-macextras:x64-windows-static=fail -qt5-macextras:x86-windows=fail -qt5-winextras:x64-linux=fail -qt5-winextras:x64-osx=fail +#unsupported platforms/systems +qt5-activeqt:x64-linux=skip +qt5-activeqt:x64-osx=skip +qt5-macextras:x64-linux=skip +qt5-macextras:x64-windows=skip +qt5-macextras:x64-windows-static=skip +qt5-macextras:x86-windows=skip +qt5-winextras:x64-linux=skip +qt5-winextras:x64-osx=skip quickfast:x64-linux=ignore quickfix:x64-linux=ignore quickfix:x64-windows=ignore From d8916533c54db1b5f244d8a1d16031d3797f567f Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 23 Jan 2020 22:14:47 +0100 Subject: [PATCH 206/419] BUILD_STATIC_EXECS is meant for static CRT linkage an not static library linkage --- ports/hdf5/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/hdf5/portfile.cmake b/ports/hdf5/portfile.cmake index c40c985649f20a..aae944a591c0ff 100644 --- a/ports/hdf5/portfile.cmake +++ b/ports/hdf5/portfile.cmake @@ -39,7 +39,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS file(REMOVE ${SOURCE_PATH}/config/cmake_ext_mod/FindSZIP.cmake)#Outdated; does not find debug szip -if(FEATURES MATCHES "tools" AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") +if(FEATURES MATCHES "tools" AND VCPKG_CRT_LINKAGE STREQUAL "static") list(APPEND FEATURE_OPTIONS -DBUILD_STATIC_EXECS=ON) endif() From ea6227aff09b26f67f5e29797dcff0b010af962a Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 23 Jan 2020 23:54:49 +0100 Subject: [PATCH 207/419] fix movement of tools on linux --- ports/hdf5/portfile.cmake | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ports/hdf5/portfile.cmake b/ports/hdf5/portfile.cmake index aae944a591c0ff..f3c7bde2981a0c 100644 --- a/ports/hdf5/portfile.cmake +++ b/ports/hdf5/portfile.cmake @@ -73,15 +73,15 @@ string(REPLACE [[${HDF5_PACKAGE_NAME}_TOOLS_DIR "${PACKAGE_PREFIX_DIR}/bin"]] [[ file(WRITE "${CURRENT_PACKAGES_DIR}/share/hdf5/hdf5-config.cmake" ${contents}) if(FEATURES MATCHES "tools") - set(TOOLS h5copy h5diff h5dump h5ls h5stat gif2h5 h52gif h5clear h5debug h5format_convert h5jam h5unjam h5ls h5mkgrp h5repack h5repart h5watch ph5diff h5import) + set(TOOLS h5cc h5hlcc h5c++ h5hlc++ h5copy h5diff h5dump h5ls h5stat gif2h5 h52gif h5clear h5debug h5format_convert h5jam h5unjam h5ls h5mkgrp h5repack h5repart h5watch ph5diff h5import) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") set(TOOL_SUFFIXES "-shared${VCPKG_TARGET_EXECUTABLE_SUFFIX};${VCPKG_TARGET_EXECUTABLE_SUFFIX}") else() set(TOOL_SUFFIXES "-static${VCPKG_TARGET_EXECUTABLE_SUFFIX};${VCPKG_TARGET_EXECUTABLE_SUFFIX}") endif() - foreach(tool ${TOOLS}) - foreach(suffix ${TOOL_SUFFIXES}) + foreach(tool IN LISTS TOOLS) + foreach(suffix IN LISTS TOOL_SUFFIXES) if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/${tool}${suffix}") file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/${tool}${suffix}") endif() @@ -95,7 +95,6 @@ if(FEATURES MATCHES "tools") vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) endif() -#Linux build create additional scripts here. I dont know what they are doing so I am deleting them and hope for the best if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) endif() From 51fa47bd775f48deb32ad4af0fb4b86b650e37e2 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 24 Jan 2020 00:53:13 +0100 Subject: [PATCH 208/419] OSX is automatically LFS --- ports/cgns/CONTROL | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ports/cgns/CONTROL b/ports/cgns/CONTROL index 4a238605874571..d33034fd246cc2 100644 --- a/ports/cgns/CONTROL +++ b/ports/cgns/CONTROL @@ -2,8 +2,7 @@ Source: cgns Version: 3.4.0 Homepage: http://cgns.org/ Description: The CFD General Notation System (CGNS) provides a standard for recording and recovering computer data associated with the numerical solution of fluid dynamics equations. -Build-Depends: -Default-Features: hdf5, lfs +Default-Features: hdf5, lfselector Feature: mpi Description: Compile with support for the message passage interface (MPI) @@ -22,6 +21,10 @@ Feature: hdf5 Description: Enable hdf5 support Build-Depends: hdf5[tools] +Feature: lfsselector +Description: Selector for LFS +Build-Depends: cgns[lfs] (!osx) + Feature: lfs Description: Enable LFS support From ed5ffaddbb778866e754304732a56f2b579527c7 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 24 Jan 2020 08:46:44 +0100 Subject: [PATCH 209/419] retry CI build --- ports/cgns/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/cgns/CONTROL b/ports/cgns/CONTROL index d33034fd246cc2..1bef287cb74c69 100644 --- a/ports/cgns/CONTROL +++ b/ports/cgns/CONTROL @@ -1,5 +1,5 @@ Source: cgns -Version: 3.4.0 +Version: 3.4.0-1 Homepage: http://cgns.org/ Description: The CFD General Notation System (CGNS) provides a standard for recording and recovering computer data associated with the numerical solution of fluid dynamics equations. Default-Features: hdf5, lfselector From aab579aa4804e6c1eda8e1b62c86072f9fef11ff Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 24 Jan 2020 09:16:09 +0100 Subject: [PATCH 210/419] fix typo in feature --- ports/cgns/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/cgns/CONTROL b/ports/cgns/CONTROL index 1bef287cb74c69..411929f1cf7886 100644 --- a/ports/cgns/CONTROL +++ b/ports/cgns/CONTROL @@ -2,7 +2,7 @@ Source: cgns Version: 3.4.0-1 Homepage: http://cgns.org/ Description: The CFD General Notation System (CGNS) provides a standard for recording and recovering computer data associated with the numerical solution of fluid dynamics equations. -Default-Features: hdf5, lfselector +Default-Features: hdf5, lfsselector Feature: mpi Description: Compile with support for the message passage interface (MPI) From 3b8b90e646e0950a348e7577e90a7faca844bc50 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 24 Jan 2020 12:36:22 +0100 Subject: [PATCH 211/419] fix PCL static regression with the wrong patch ideally flann would be patched correctly --- ports/pcl/FindFLANN.patch | 24 ++++++++++++++++++++++++ ports/pcl/portfile.cmake | 12 +++++------- 2 files changed, 29 insertions(+), 7 deletions(-) create mode 100644 ports/pcl/FindFLANN.patch diff --git a/ports/pcl/FindFLANN.patch b/ports/pcl/FindFLANN.patch new file mode 100644 index 00000000000000..461c43569cfd54 --- /dev/null +++ b/ports/pcl/FindFLANN.patch @@ -0,0 +1,24 @@ +diff --git a/cmake/Modules/FindFLANN.cmake b/cmake/Modules/FindFLANN.cmake +index 782ee01c7..7598a62d0 100644 +--- a/cmake/Modules/FindFLANN.cmake ++++ b/cmake/Modules/FindFLANN.cmake +@@ -48,7 +48,7 @@ if(flann_FOUND) + # Create interface library that effectively becomes an alias for the appropriate (static/dynamic) imported FLANN target + add_library(FLANN::FLANN INTERFACE IMPORTED) + if(FLANN_USE_STATIC) +- set_property(TARGET FLANN::FLANN APPEND PROPERTY INTERFACE_LINK_LIBRARIES flann::flann_cpp_s) ++ set_property(TARGET FLANN::FLANN APPEND PROPERTY INTERFACE_LINK_LIBRARIES flann::flann_cpp) + else() + set_property(TARGET FLANN::FLANN APPEND PROPERTY INTERFACE_LINK_LIBRARIES flann::flann_cpp) + endif() +@@ -82,8 +82,8 @@ find_path(FLANN_INCLUDE_DIR + ) + + if(FLANN_USE_STATIC) +- set(FLANN_RELEASE_NAME flann_cpp_s) +- set(FLANN_DEBUG_NAME flann_cpp_s-gd) ++ set(FLANN_RELEASE_NAME flann_cpp) ++ set(FLANN_DEBUG_NAME flann_cpp-gd) + set(FLANN_LIBRARY_TYPE STATIC) + else() + set(FLANN_RELEASE_NAME flann_cpp) diff --git a/ports/pcl/portfile.cmake b/ports/pcl/portfile.cmake index fadfbfaa79c4e1..575c99edd8edf7 100644 --- a/ports/pcl/portfile.cmake +++ b/ports/pcl/portfile.cmake @@ -13,10 +13,8 @@ vcpkg_from_github( # Patch for https://github.com/microsoft/vcpkg/issues/7660 #use_target_link_libraries_in_pclconfig.patch fix_cmakelists.patch + findFLANN.patch # This is necessary to accomodate vcpkg changes to Flann. In an ideal world the flann port would not rename its targets and this would not be necessary. ) - -#file(REMOVE ${SOURCE_PATH}/cmake/Modules/FindFLANN.cmake) - string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PCL_SHARED_LIBS) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -37,15 +35,15 @@ vcpkg_configure_cmake( # BUILD -DBUILD_surface_on_nurbs=ON # PCL - -DPCL_BUILD_WITH_BOOST_DYNAMIC_LINKING_WIN32=${PCL_SHARED_LIBS} # this is incorrect - -DPCL_BUILD_WITH_FLANN_DYNAMIC_LINKING_WIN32=${PCL_SHARED_LIBS} # this is incorrect - -DPCL_BUILD_WITH_QHULL_DYNAMIC_LINKING_WIN32=${PCL_SHARED_LIBS} # this is incorrect + -DPCL_BUILD_WITH_BOOST_DYNAMIC_LINKING_WIN32=${PCL_SHARED_LIBS} # this is incorrect since VCPKG_LIBRARY_LINKAGE might be only set to dynamic for this port + -DPCL_BUILD_WITH_FLANN_DYNAMIC_LINKING_WIN32=OFF # this is incorrect since flann in vcpkg is currently always build as a static library. + -DPCL_BUILD_WITH_QHULL_DYNAMIC_LINKING_WIN32=${PCL_SHARED_LIBS} # this is incorrect since VCPKG_LIBRARY_LINKAGE might be only set to dynamic for this port -DPCL_SHARED_LIBS=${PCL_SHARED_LIBS} # WITH -DWITH_LIBUSB=OFF -DWITH_PNG=ON -DWITH_QHULL=ON - -DWITH_VTK=OFF # disable due to API changes in VTK 8.9 + -DWITH_VTK=OFF # disabled due to API changes in VTK 8.9 # FEATURES ${FEATURE_OPTIONS} ) From f8ca71fe9c4765ba3b238879b3906a8900459cc9 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sun, 26 Jan 2020 14:30:39 +0100 Subject: [PATCH 212/419] introduce prl parser and "remove" wrapper from qt5-base --- ports/qt5-base/patches/prl_parser.patch | 236 +++++++++++++++++++++++ ports/qt5-base/portfile.cmake | 1 + ports/qt5-base/vcpkg-cmake-wrapper.cmake | 168 ++++++++-------- 3 files changed, 321 insertions(+), 84 deletions(-) create mode 100644 ports/qt5-base/patches/prl_parser.patch diff --git a/ports/qt5-base/patches/prl_parser.patch b/ports/qt5-base/patches/prl_parser.patch new file mode 100644 index 00000000000000..0b4f1e7f0731a8 --- /dev/null +++ b/ports/qt5-base/patches/prl_parser.patch @@ -0,0 +1,236 @@ +diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +index 81db0d92c..51016f3fa 100644 +--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in ++++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +@@ -1,6 +1,6 @@ + +-if (CMAKE_VERSION VERSION_LESS 3.1.0) +- message(FATAL_ERROR \"Qt 5 $${CMAKE_MODULE_NAME} module requires at least CMake version 3.1.0\") ++if (CMAKE_VERSION VERSION_LESS 3.6.0) # Increase for cmake_parse_arguments ++ message(FATAL_ERROR \"Qt 5 $${CMAKE_MODULE_NAME} module requires at least CMake version 3.6.0\") + endif() + + !!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND) +@@ -34,6 +34,143 @@ set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.VERSION)") + set(Qt5$${CMAKE_MODULE_NAME}_LIBRARIES Qt5::$${CMAKE_MODULE_NAME}) + !!ENDIF // TEMPLATE != aux + ++###### Added by VCPKG ++function(_qt5_$${CMAKE_MODULE_NAME}_parse_prl) ++ cmake_parse_arguments(_qt_prl \"\" \"CONFIGURATION;TARGET;PRL_FILE;LIB_FILE;OUT_DEPS;OUT_FLAGS\" \"\" ${ARGN}) ++ if(NOT _qt_prl_CONFIGURATION) ++ message(FATAL_ERROR \"qt_parse_prl requires parameter CONFIGURATION\") ++ endif() ++ if(NOT _qt_prl_TARGET) ++ message(FATAL_ERROR \"qt_parse_prl requires parameter TARGET\") ++ endif() ++ if(NOT _qt_prl_PRL_FILE AND NOT _qt_prl_LIB_FILE) ++ message(FATAL_ERROR \"qt_parse_prl requires parameter PRL_FILE or LIB_FILE\") ++ endif() ++ if(NOT _qt_prl_OUT_DEPS) ++ message(FATAL_ERROR \"qt_parse_prl requires parameter OUT_DEPS\") ++ endif() ++ if(NOT _qt_prl_OUT_FLAGS) ++ message(FATAL_ERROR \"qt_parse_prl requires parameter OUT_FLAGS\") ++ endif() ++ ++ if(_qt_prl_LIB_FILE) ++ set(_parsed_prl \"${_qt_prl_LIB_FILE}\") ++ string(REGEX REPLACE \"${CMAKE_STATIC_LIBRARY_SUFFIX}$\" \".prl\" _parsed_prl \"${_parsed_prl}\") ++ else() ++ set(_parsed_prl \"${_qt_prl_PRL_FILE}\") ++ endif() ++ ++ message(STATUS \"Reading file: ${_parsed_prl}\") ++ if(NOT EXISTS \"${_parsed_prl}\") ++ message(FATAL_ERROR \"Could not find PRL file: ${_parsed_prl}\") ++ endif() ++ file(STRINGS \"${_parsed_prl}\" _static_depends REGEX \"^QMAKE_PRL_LIBS[ \\t]+=[ \\t]+.+$\") ++ message(STATUS \"QMAKE_PRL_LIBS as read : ${_static_depends}\n\n\") ++ string(REGEX REPLACE \"QMAKE_PRL_LIBS[ \\t]+=[ \\t]+\" \"\" _static_depends \"${_static_depends}\") ++ string(REGEX REPLACE \" -L\\\\$\\\\$([^ ]+)\" [[ ;-L\$\$\\1; ]] _static_depends \"${_static_depends}\") # - L Normal Case ++ if(WIN32) ++ string(REGEX REPLACE \"-L\\\\\\\"([^\\\\\\\"]+)\\\\\\\"\" \" ;-L\\\"\\\\1\\\"; \" _static_depends \"${_static_depends}\") # -L Tricky Case with spaces ++ string(REGEX REPLACE [[\\\"?[A-Z]:\\\\\\\\Program Files( \\(x86\\))*\\\\\\\\Windows Kits\\\\\\\\[0-9]+\\\\\\\\lib\\\\\\\\[0-9|.]+\\\\\\\\um\\\\\\\\x64\\\\\\\\([^\\\"]+)\\\"?]] \";\\\\2;\" _static_depends \"${_static_depends}\") ++ string(REGEX REPLACE [[ \\\"([^\\"]+)\\\" ]] \" ;\\\"\\\\1\\\"; \" _static_depends \"${_static_depends}\") ++ # Every path with a space in it should be handled now! ++ else() ++ string(REGEX REPLACE \" -l([^ ]+)\" [[;-l\$\$\\1;]] _static_depends \"${_static_depends}\") # - l case on targets other than windows ++ endif() ++ string(REGEX REPLACE \" +[^\\\\\\\"]([^( |\\\\\\\")]+)[^\\\\\\\"] +\" \";\\\\0; \" _static_depends \"${_static_depends}\") ++ string(REGEX REPLACE \"[\\t ]*;[\\t ]*\" \";\" _static_depends \"${_static_depends}\") # remove unnecessary whitespaces ++ string(REGEX REPLACE \"(;[\\t ]*;)+\" \";\" _static_depends \"${_static_depends}\") # remove empty elements from the list ++ #string(REGEX REPLACE \" [\\"]\" \";\\\\\\\"\" _static_depends \"${_static_depends}\") ++ message(STATUS \"QMAKE_PRL_LIBS as a list : ${_static_depends}\n\n\") ++ ++ #Logic Backported from Qt 5.14 ++ set(_prl_location \"${_parsed_prl}\") ++ string(REGEX REPLACE \"/[^/]+$\" \"\" _prl_location "${_prl_location}") ++ string(REPLACE \"\$\$[QT_INSTALL_LIBS]\" \"${_prl_location}\" _static_depends \"${_static_depends}\") ++ string(REGEX REPLACE \"[ \t]+\" \";\" _standard_libraries \"${CMAKE_CXX_STANDARD_LIBRARIES}\") ++ foreach(_flag IN LISTS _static_depends) ++ if(_flag MATCHES \"^-l(.*)$\") ++ # Handle normal libraries passed as -lfoo ++ set(_lib \"${CMAKE_MATCH_1}\") ++ foreach(_standard_library ${_standard_libraries}) ++ if(_standard_library MATCHES \"^${_lib}(\\.lib)?$\") ++ set(_lib_is_default_linked TRUE) ++ break() ++ endif() ++ endforeach() ++ if (_lib_is_default_linked) ++ unset(_lib_is_default_linked) ++ elseif(_lib MATCHES \"^pthread$\") ++ find_package(Threads REQUIRED) ++ list(APPEND _lib_deps Threads::Threads) ++ else() ++ if(_search_paths) ++ find_library(_Qt5$${CMAKE_MODULE_NAME}_${Configuration}_${_lib}_PATH ${_lib} HINTS ${_search_paths} NO_DEFAULT_PATH) ++ endif() ++ find_library(_Qt5$${CMAKE_MODULE_NAME}_${Configuration}_${_lib}_PATH ${_lib}) ++ mark_as_advanced(_Qt5$${CMAKE_MODULE_NAME}_${Configuration}_${_lib}_PATH) ++ if(_Qt5$${CMAKE_MODULE_NAME}_${Configuration}_${_lib}_PATH) ++ list(APPEND _lib_deps ++ ${_Qt5$${CMAKE_MODULE_NAME}_${Configuration}_${_lib}_PATH} ++ ) ++ else() ++ message(FATAL_ERROR \"Library not found: ${_lib}\") ++ endif() ++ endif() ++ elseif(EXISTS \"${_flag}\") ++ # The flag is an absolute path to an existing library ++ list(APPEND _lib_deps \"${_flag}\") ++ elseif(_flag MATCHES \"^-L(.*)$\") ++ # Handle -Lfoo flags by putting their paths in the search path used by find_library above ++ list(APPEND _search_paths \"${CMAKE_MATCH_1}\") ++ elseif(_flag MATCHES \"\\\.(lib|a|so)$\") #Library name only. No -l. Probably missing some cases ++ #message(STATUS \"Added to link deps (${Configuration}): ${_flag}\") ++ list(APPEND _lib_deps ${_flag}) # changed from _link_flags ++ else() ++ # Handle all remaining flags by simply passing them to the linker ++ #message(STATUS \"Added to link flags (${Configuration}): ${_flag}\") ++ list(APPEND _lib_flags ${_flag}) # changed from _link_flags ++ endif() ++ endforeach() ++ ++ message(STATUS \"${_qt_prl_TARGET} links (via PRL ${_qt_prl_CONFIGURATION}): ${_lib_deps}\") ++ message(STATUS \"${_qt_prl_TARGET} has linker flags (via PRL): ${_lib_flags}\") ++ #get_target_property(_test_interface ${_qt_prl_TARGET} INTERFACE_LINK_LIBRARIES) ++ #message(STATUS \"INTERFACE_LINK_LIBRARIES of target before ${_qt_prl_TARGET}: ${_test_interface} \") ++ set(_prl_out_libs) ++ foreach(_prl_lib IN LISTS _lib_deps) ++ if(\"${_qt_prl_CONFIGURATION}\" STREQUAL \"DEBUG\") ++ #message(STATUS \"DEBUG: ${_prl_lib}\") ++ #set_property(TARGET ${_qt_prl_TARGET} APPEND PROPERTY INTERFACE_LINK_LIBRARIES \"\\$<\\$:${_prl_lib}>\") ++ list(APPEND _prl_out_libs \"\\$<\\$:${_prl_lib}>\") ++ else() ++ #message(STATUS \"RELEASE: ${_prl_lib}\") ++ #set_property(TARGET ${_qt_prl_TARGET} APPEND PROPERTY INTERFACE_LINK_LIBRARIES \"\\$<\\$>:${_prl_lib}>\") ++ list(APPEND _prl_out_libs \"\\$<\\$>:${_prl_lib}>\") ++ endif() ++ endforeach() ++ set(${_qt_prl_OUT_DEPS} "${_prl_out_libs}" PARENT_SCOPE) ++ unset(_prl_lib) ++ ++ set(_prl_out_flags) ++ foreach(_prl_flag IN LISTS _lib_flags) ++ if(\"${_qt_prl_CONFIGURATION}\" STREQUAL \"DEBUG\") ++ #set_property(TARGET ${_qt_prl_TARGET} APPEND PROPERTY INTERFACE_LINK_LIBRARIES \"\\$<\\$:${_prl_flag}>\") ++ list(APPEND _prl_out_flags \"\\$<\\$:${_prl_flag}>\") ++ else() ++ #set_property(TARGET ${_qt_prl_TARGET} APPEND PROPERTY INTERFACE_LINK_LIBRARIES \"\\$<\\$>:${_prl_flag}>\") ++ list(APPEND _prl_out_flags \"\\$<\\$>:${_prl_flag}>\") ++ endif() ++ endforeach() ++ set(${_qt_prl_OUT_FLAGS} "${_prl_out_flags}" PARENT_SCOPE) ++ unset(_prl_flag) ++ ++ #get_target_property(_test_interface ${_qt_prl_TARGET} INTERFACE_LINK_LIBRARIES) ++ #message(STATUS \"INTERFACE_LINK_LIBRARIES of target after ${_qt_prl_TARGET}: ${_test_interface} \") ++endfunction() ++ ++###### END Added by VCPKG ++ ++ + macro(_qt5_$${CMAKE_MODULE_NAME}_check_file_exists file) + if(NOT EXISTS \"${file}\" ) + message(FATAL_ERROR \"The imported target \\\"Qt5::$${CMAKE_MODULE_NAME}\\\" references the file +@@ -52,6 +189,24 @@ endmacro() + macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATION IMPLIB_LOCATION) + set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) + ++!!IF !isEmpty(CMAKE_WINDOWS_BUILD) ++!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) ++ if(\"${Configuration}\" STREQUAL \"DEBUG\") ++ set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") ++ else() ++ set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") ++ endif() ++!!ELSE ++ set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") ++!!ENDIF ++ _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib}) ++ if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\") ++ set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES ++ \"IMPORTED_IMPLIB_${Configuration}\" ${imported_implib} ++ ) ++ endif() ++!!ENDIF ++ + !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) + if(\"${Configuration}\" STREQUAL \"DEBUG\") + set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") +@@ -60,35 +215,24 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI + endif() + !!ELSE + set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") ++!!ENDIF ++!!IF !isEmpty(CMAKE_STATIC_TYPE) ++ _qt5_$${CMAKE_MODULE_NAME}_parse_prl(TARGET Qt5::$${CMAKE_MODULE_NAME} LIB_FILE \"${imported_location}\" CONFIGURATION \"${Configuration}\" OUT_DEPS PRL_DEPS OUT_FLAGS PRL_FLAGS) ++!!ELSE ++ _qt5_$${CMAKE_MODULE_NAME}_parse_prl(TARGET Qt5::$${CMAKE_MODULE_NAME} LIB_FILE \"${imported_implib}\" CONFIGURATION \"${Configuration}\" OUT_DEPS PRL_DEPS OUT_FLAGS PRL_FLAGS) + !!ENDIF + _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) ++ set_property(TARGET ${_qt_prl_TARGET} APPEND PROPERTY INTERFACE_LINK_LIBRARIES \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES};${PRL_DEPS};${PRL_FLAGS}\") + set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES +- \"INTERFACE_LINK_LIBRARIES\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\" ++ #\"INTERFACE_LINK_LIBRARIES\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES};${PRL_DEPS};${PRL_FLAGS}\" + \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} + !!IF !isEmpty(CMAKE_LIB_SONAME) + \"IMPORTED_SONAME_${Configuration}\" \"$${CMAKE_LIB_SONAME}\" + !!ENDIF + # For backward compatibility with CMake < 2.8.12 +- \"IMPORTED_LINK_INTERFACE_LIBRARIES_${Configuration}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\" ++ \"IMPORTED_LINK_INTERFACE_LIBRARIES_${Configuration}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES};${PRL_DEPS};${PRL_FLAGS}\" + ) + +-!!IF !isEmpty(CMAKE_WINDOWS_BUILD) +-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- if(\"${Configuration}\" STREQUAL \"DEBUG\") +- set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") +- else() +- set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") +- endif() +-!!ELSE +- set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") +-!!ENDIF +- _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib}) +- if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\") +- set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES +- \"IMPORTED_IMPLIB_${Configuration}\" ${imported_implib} +- ) +- endif() +-!!ENDIF + endmacro() + !!ENDIF + +@@ -366,6 +510,8 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + set_target_properties(Qt5::${Plugin} PROPERTIES + \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} + ) ++ _qt5_$${CMAKE_MODULE_NAME}_parse_prl(TARGET Qt5::$${Plugin} LIB_FILE \"${imported_location}\" CONFIGURATION \"${Configuration}\" OUT_DEPS PRL_DEPS OUT_FLAGS PRL_FLAGS) ++ set_property(TARGET Qt5::${Plugin} APPEND PROPERTY INTERFACE_LINK_LIBRARIES "${PRL_DEPS};${PRL_FLAGS}") + endmacro() + + if (pluginTargets) + diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 93a0eb53f24ec4..39cbad8d86a340 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -45,6 +45,7 @@ qt_download_submodule( OUT_SOURCE_PATH SOURCE_PATH #CMake fixes patches/Qt5BasicConfig.patch patches/Qt5PluginTarget.patch + patches/prl_parser.patch ) # Remove vendored dependencies to ensure they are not picked up by the build diff --git a/ports/qt5-base/vcpkg-cmake-wrapper.cmake b/ports/qt5-base/vcpkg-cmake-wrapper.cmake index 701e89b73d4036..cd496e35d32d02 100644 --- a/ports/qt5-base/vcpkg-cmake-wrapper.cmake +++ b/ports/qt5-base/vcpkg-cmake-wrapper.cmake @@ -17,97 +17,97 @@ endfunction() get_target_property(_target_type Qt5::Core TYPE) if("${_target_type}" STREQUAL "STATIC_LIBRARY") - find_package(ZLIB) - find_package(JPEG) - find_package(PNG) - find_package(Freetype) - find_package(sqlite3 CONFIG) - find_package(PostgreSQL MODULE REQUIRED) - find_package(double-conversion CONFIG) - find_package(OpenSSL) - find_package(harfbuzz CONFIG) + # find_package(ZLIB) + # find_package(JPEG) + # find_package(PNG) + # find_package(Freetype) + # find_package(sqlite3 CONFIG) + # find_package(PostgreSQL MODULE REQUIRED) + # find_package(double-conversion CONFIG) + # find_package(OpenSSL) + # find_package(harfbuzz CONFIG) - set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES - ZLIB::ZLIB JPEG::JPEG PNG::PNG Freetype::Freetype sqlite3 harfbuzz::harfbuzz - double-conversion::double-conversion OpenSSL::SSL OpenSSL::Crypto PostgreSQL::PostgreSQL - ) - if(WIN32 AND NOT WINDOWS_STORE) - set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES - UxTheme.lib d2d1.lib Dwrite.lib d3d11.lib) # Should probably be added to Qt5:Gui and not core but currently we only have that one wrapper - endif() + # set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES + # ZLIB::ZLIB JPEG::JPEG PNG::PNG Freetype::Freetype sqlite3 harfbuzz::harfbuzz + # double-conversion::double-conversion OpenSSL::SSL OpenSSL::Crypto PostgreSQL::PostgreSQL + # ) + # if(WIN32 AND NOT WINDOWS_STORE) + # set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES + # UxTheme.lib d2d1.lib Dwrite.lib d3d11.lib) # Should probably be added to Qt5:Gui and not core but currently we only have that one wrapper + # endif() - add_qt_library(Qt5::Core - pcre2-16 - jasper - webp webpdemux webpdecoder - icuin icui18n - icutu icuuc icuio - icudt icudata - Qt5ThemeSupport - Qt5EventDispatcherSupport - Qt5PlatformCompositorSupport - Qt5FontDatabaseSupport) + # add_qt_library(Qt5::Core + # pcre2-16 + # jasper + # webp webpdemux webpdecoder + # icuin icui18n + # icutu icuuc icuio + # icudt icudata + # Qt5ThemeSupport + # Qt5EventDispatcherSupport + # Qt5PlatformCompositorSupport + # Qt5FontDatabaseSupport) if(MSVC) - set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES - Netapi32.lib Ws2_32.lib Mincore.lib Winmm.lib Iphlpapi.lib Wtsapi32.lib Dwmapi.lib Imm32.lib) + # set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES + # Netapi32.lib Ws2_32.lib Mincore.lib Winmm.lib Iphlpapi.lib Wtsapi32.lib Dwmapi.lib Imm32.lib) - add_qt_library(Qt5::Core Qt5WindowsUIAutomationSupport qwindows qdirect2d) + # add_qt_library(Qt5::Core Qt5WindowsUIAutomationSupport qwindows qdirect2d) elseif(UNIX AND NOT APPLE) - add_qt_library(Qt5::Core - Qt5GraphicsSupport - Qt5ClipboardSupport - Qt5LinuxAccessibilitySupport - Qt5AccessibilitySupport - Qt5ServiceSupport - Qt5FbSupport - Qt5EglSupport - Qt5InputSupport - Qt5DeviceDiscoverySupport - Qt5EdidSupport - Qt5KmsSupport - Qt5GlxSupport - Qt5EglFSDeviceIntegration - Qt5EglFsKmsSupport - Qt5XcbQpa - EGL - fontconfig expat - Qt5Gui - Qt5DBus - Qt5Core) - #find_package(X11 REQUIRED) - set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES - xcb-glx X11-xcb xcb-xinput xcb-icccm xcb-image xcb-shm xcb-keysyms xcb-randr xcb-render-util - xcb-render xcb-shape xcb-sync xcb-xfixes xcb-xinerama xcb-xkb xcb Xrender Xext X11 - m SM ICE mtdev input xkbcommon-x11 xkbcommon dl GL gbm udev - OpenSSL::SSL OpenSSL::Crypto Freetype::Freetype - dbus-1 drm gthread-2.0 glib-2.0 gtk-3 gdk-3 pangocairo-1.0 pango-1.0 atk-1.0 cairo-gobject cairo gdk_pixbuf-2.0 gio-2.0 gobject-2.0 glib-2.0 Xext X11 - ) - #xcb-damage xcb-glx - #${X11_LIBRARIES} Xau Xdmcp - #gthread-2.0 ) + # add_qt_library(Qt5::Core + # Qt5GraphicsSupport + # Qt5ClipboardSupport + # Qt5LinuxAccessibilitySupport + # Qt5AccessibilitySupport + # Qt5ServiceSupport + # Qt5FbSupport + # Qt5EglSupport + # Qt5InputSupport + # Qt5DeviceDiscoverySupport + # Qt5EdidSupport + # Qt5KmsSupport + # Qt5GlxSupport + # Qt5EglFSDeviceIntegration + # Qt5EglFsKmsSupport + # Qt5XcbQpa + # EGL + # fontconfig expat + # Qt5Gui + # Qt5DBus + # Qt5Core) + # #find_package(X11 REQUIRED) + # set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES + # xcb-glx X11-xcb xcb-xinput xcb-icccm xcb-image xcb-shm xcb-keysyms xcb-randr xcb-render-util + # xcb-render xcb-shape xcb-sync xcb-xfixes xcb-xinerama xcb-xkb xcb Xrender Xext X11 + # m SM ICE mtdev input xkbcommon-x11 xkbcommon dl GL gbm udev + # OpenSSL::SSL OpenSSL::Crypto Freetype::Freetype + # dbus-1 drm gthread-2.0 glib-2.0 gtk-3 gdk-3 pangocairo-1.0 pango-1.0 atk-1.0 cairo-gobject cairo gdk_pixbuf-2.0 gio-2.0 gobject-2.0 glib-2.0 Xext X11 + # ) + # #xcb-damage xcb-glx + # #${X11_LIBRARIES} Xau Xdmcp + # #gthread-2.0 ) elseif(APPLE) - set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES - "-weak_framework DiskArbitration" "-weak_framework IOKit" "-weak_framework Foundation" "-weak_framework CoreServices" - "-weak_framework AppKit" "-weak_framework Security" "-weak_framework ApplicationServices" - "-weak_framework CoreFoundation" "-weak_framework SystemConfiguration" - "-weak_framework Carbon" - "-weak_framework QuartzCore" - "-weak_framework CoreVideo" - "-weak_framework Metal" - "-weak_framework CoreText" - "-weak_framework ApplicationServices" - "-weak_framework CoreGraphics" - "-weak_framework OpenGL" - "-weak_framework AGL" - "-weak_framework ImageIO" - "z" "m" - cups) - add_qt_library(Qt5::Core - Qt5GraphicsSupport - Qt5ClipboardSupport - Qt5AccessibilitySupport - qcocoa) + # set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES + # "-weak_framework DiskArbitration" "-weak_framework IOKit" "-weak_framework Foundation" "-weak_framework CoreServices" + # "-weak_framework AppKit" "-weak_framework Security" "-weak_framework ApplicationServices" + # "-weak_framework CoreFoundation" "-weak_framework SystemConfiguration" + # "-weak_framework Carbon" + # "-weak_framework QuartzCore" + # "-weak_framework CoreVideo" + # "-weak_framework Metal" + # "-weak_framework CoreText" + # "-weak_framework ApplicationServices" + # "-weak_framework CoreGraphics" + # "-weak_framework OpenGL" + # "-weak_framework AGL" + # "-weak_framework ImageIO" + # "z" "m" + # cups) + # add_qt_library(Qt5::Core + # Qt5GraphicsSupport + # Qt5ClipboardSupport + # Qt5AccessibilitySupport + # qcocoa) endif() endif() From a22711801e1e4ba0c7e5fe962ec76779004c9c7d Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sun, 26 Jan 2020 21:02:01 +0100 Subject: [PATCH 213/419] fix prl patch details - Split regex was incorrect at line ends due to regex assuming trailing whitespace - _prl_location was wrong for plugins due to deriving location from prl file path which only works for libraries. --- ports/qt5-base/patches/prl_parser.patch | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/ports/qt5-base/patches/prl_parser.patch b/ports/qt5-base/patches/prl_parser.patch index 0b4f1e7f0731a8..e30fe7f694c71c 100644 --- a/ports/qt5-base/patches/prl_parser.patch +++ b/ports/qt5-base/patches/prl_parser.patch @@ -11,7 +11,7 @@ index 81db0d92c..51016f3fa 100644 endif() !!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND) -@@ -34,6 +34,143 @@ set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.VERSION)") +@@ -34,6 +34,147 @@ set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.VERSION)") set(Qt5$${CMAKE_MODULE_NAME}_LIBRARIES Qt5::$${CMAKE_MODULE_NAME}) !!ENDIF // TEMPLATE != aux @@ -57,14 +57,18 @@ index 81db0d92c..51016f3fa 100644 + else() + string(REGEX REPLACE \" -l([^ ]+)\" [[;-l\$\$\\1;]] _static_depends \"${_static_depends}\") # - l case on targets other than windows + endif() -+ string(REGEX REPLACE \" +[^\\\\\\\"]([^( |\\\\\\\")]+)[^\\\\\\\"] +\" \";\\\\0; \" _static_depends \"${_static_depends}\") ++ string(REGEX REPLACE \"[ \\t]+[^\\\\\\\"]([^( |\\\\\\\")]+)[^\\\\\\\"]([ \\t]|$)+\" \";\\\\0; \" _static_depends \"${_static_depends}\") + string(REGEX REPLACE \"[\\t ]*;[\\t ]*\" \";\" _static_depends \"${_static_depends}\") # remove unnecessary whitespaces + string(REGEX REPLACE \"(;[\\t ]*;)+\" \";\" _static_depends \"${_static_depends}\") # remove empty elements from the list + #string(REGEX REPLACE \" [\\"]\" \";\\\\\\\"\" _static_depends \"${_static_depends}\") + message(STATUS \"QMAKE_PRL_LIBS as a list : ${_static_depends}\n\n\") + + #Logic Backported from Qt 5.14 -+ set(_prl_location \"${_parsed_prl}\") ++ if(\"${_qt_prl_CONFIGURATION}\" STREQUAL \"DEBUG\") ++ set(_prl_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}${LIB_LOCATION}\") ++ else() ++ set(_prl_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${LIB_LOCATION}\") ++ endif() + string(REGEX REPLACE \"/[^/]+$\" \"\" _prl_location "${_prl_location}") + string(REPLACE \"\$\$[QT_INSTALL_LIBS]\" \"${_prl_location}\" _static_depends \"${_static_depends}\") + string(REGEX REPLACE \"[ \t]+\" \";\" _standard_libraries \"${CMAKE_CXX_STANDARD_LIBRARIES}\") From 8cb8ad4abce3aee83ceffc4d6f0d1d97d6800b2d Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sun, 26 Jan 2020 23:59:04 +0100 Subject: [PATCH 214/419] fix the regex. $ cannot be used with + --- ports/qt5-base/patches/prl_parser.patch | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ports/qt5-base/patches/prl_parser.patch b/ports/qt5-base/patches/prl_parser.patch index e30fe7f694c71c..8b446af4631bd3 100644 --- a/ports/qt5-base/patches/prl_parser.patch +++ b/ports/qt5-base/patches/prl_parser.patch @@ -11,7 +11,7 @@ index 81db0d92c..51016f3fa 100644 endif() !!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND) -@@ -34,6 +34,147 @@ set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.VERSION)") +@@ -34,6 +34,146 @@ set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.VERSION)") set(Qt5$${CMAKE_MODULE_NAME}_LIBRARIES Qt5::$${CMAKE_MODULE_NAME}) !!ENDIF // TEMPLATE != aux @@ -57,7 +57,7 @@ index 81db0d92c..51016f3fa 100644 + else() + string(REGEX REPLACE \" -l([^ ]+)\" [[;-l\$\$\\1;]] _static_depends \"${_static_depends}\") # - l case on targets other than windows + endif() -+ string(REGEX REPLACE \"[ \\t]+[^\\\\\\\"]([^( |\\\\\\\")]+)[^\\\\\\\"]([ \\t]|$)+\" \";\\\\0; \" _static_depends \"${_static_depends}\") ++ string(REGEX REPLACE \"[\\t ]+[^\\\\\\\"]([^( |\\\\\\\")]+)[^\\\\\\\"]([\\t ]+|[\\t ]*$)\" \";\\\\0; \" _static_depends \"${_static_depends}\") + string(REGEX REPLACE \"[\\t ]*;[\\t ]*\" \";\" _static_depends \"${_static_depends}\") # remove unnecessary whitespaces + string(REGEX REPLACE \"(;[\\t ]*;)+\" \";\" _static_depends \"${_static_depends}\") # remove empty elements from the list + #string(REGEX REPLACE \" [\\"]\" \";\\\\\\\"\" _static_depends \"${_static_depends}\") @@ -69,7 +69,6 @@ index 81db0d92c..51016f3fa 100644 + else() + set(_prl_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${LIB_LOCATION}\") + endif() -+ string(REGEX REPLACE \"/[^/]+$\" \"\" _prl_location "${_prl_location}") + string(REPLACE \"\$\$[QT_INSTALL_LIBS]\" \"${_prl_location}\" _static_depends \"${_static_depends}\") + string(REGEX REPLACE \"[ \t]+\" \";\" _standard_libraries \"${CMAKE_CXX_STANDARD_LIBRARIES}\") + foreach(_flag IN LISTS _static_depends) From 529bcf3015a9b9f5894b39739c3f704294f34abb Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 27 Jan 2020 00:02:06 +0100 Subject: [PATCH 215/419] add missing backslashes --- ports/qt5-base/patches/prl_parser.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/qt5-base/patches/prl_parser.patch b/ports/qt5-base/patches/prl_parser.patch index 8b446af4631bd3..29255f9eacdd6b 100644 --- a/ports/qt5-base/patches/prl_parser.patch +++ b/ports/qt5-base/patches/prl_parser.patch @@ -232,7 +232,7 @@ index 81db0d92c..51016f3fa 100644 \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} ) + _qt5_$${CMAKE_MODULE_NAME}_parse_prl(TARGET Qt5::$${Plugin} LIB_FILE \"${imported_location}\" CONFIGURATION \"${Configuration}\" OUT_DEPS PRL_DEPS OUT_FLAGS PRL_FLAGS) -+ set_property(TARGET Qt5::${Plugin} APPEND PROPERTY INTERFACE_LINK_LIBRARIES "${PRL_DEPS};${PRL_FLAGS}") ++ set_property(TARGET Qt5::${Plugin} APPEND PROPERTY INTERFACE_LINK_LIBRARIES \"${PRL_DEPS};${PRL_FLAGS}\") endmacro() if (pluginTargets) From 46c5aa311e41a11dcc426921abf143af9f223233 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 27 Jan 2020 07:41:52 +0100 Subject: [PATCH 216/419] forward slashes are a case on windows --- ports/qt5-base/patches/prl_parser.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/qt5-base/patches/prl_parser.patch b/ports/qt5-base/patches/prl_parser.patch index 29255f9eacdd6b..a899c91c83e1cc 100644 --- a/ports/qt5-base/patches/prl_parser.patch +++ b/ports/qt5-base/patches/prl_parser.patch @@ -51,7 +51,7 @@ index 81db0d92c..51016f3fa 100644 + string(REGEX REPLACE \" -L\\\\$\\\\$([^ ]+)\" [[ ;-L\$\$\\1; ]] _static_depends \"${_static_depends}\") # - L Normal Case + if(WIN32) + string(REGEX REPLACE \"-L\\\\\\\"([^\\\\\\\"]+)\\\\\\\"\" \" ;-L\\\"\\\\1\\\"; \" _static_depends \"${_static_depends}\") # -L Tricky Case with spaces -+ string(REGEX REPLACE [[\\\"?[A-Z]:\\\\\\\\Program Files( \\(x86\\))*\\\\\\\\Windows Kits\\\\\\\\[0-9]+\\\\\\\\lib\\\\\\\\[0-9|.]+\\\\\\\\um\\\\\\\\x64\\\\\\\\([^\\\"]+)\\\"?]] \";\\\\2;\" _static_depends \"${_static_depends}\") ++ string(REGEX REPLACE [[\\\"?[A-Z]:\\\\\\\\Program Files( \\(x86\\))*\\\\\\\\Windows Kits\\\\\\\\[0-9]+\\\\\\\\lib\\\\\\\\[0-9|.]+\\\\\\\\um\\\\\\\\x64(\\\\\\\\|/)([^\\\"]+)\\\"?]] \";\\\\2;\" _static_depends \"${_static_depends}\") + string(REGEX REPLACE [[ \\\"([^\\"]+)\\\" ]] \" ;\\\"\\\\1\\\"; \" _static_depends \"${_static_depends}\") + # Every path with a space in it should be handled now! + else() From c6c3c7b81db8f5ca0c59bf76b6d1c0eab2b3a497 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 27 Jan 2020 07:43:22 +0100 Subject: [PATCH 217/419] remove the double // from the paths --- ports/qt5-base/patches/prl_parser.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/qt5-base/patches/prl_parser.patch b/ports/qt5-base/patches/prl_parser.patch index a899c91c83e1cc..79a480426e20d4 100644 --- a/ports/qt5-base/patches/prl_parser.patch +++ b/ports/qt5-base/patches/prl_parser.patch @@ -69,7 +69,7 @@ index 81db0d92c..51016f3fa 100644 + else() + set(_prl_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${LIB_LOCATION}\") + endif() -+ string(REPLACE \"\$\$[QT_INSTALL_LIBS]\" \"${_prl_location}\" _static_depends \"${_static_depends}\") ++ string(REPLACE \"\$\$[QT_INSTALL_LIBS]/\" \"${_prl_location}\" _static_depends \"${_static_depends}\") + string(REGEX REPLACE \"[ \t]+\" \";\" _standard_libraries \"${CMAKE_CXX_STANDARD_LIBRARIES}\") + foreach(_flag IN LISTS _static_depends) + if(_flag MATCHES \"^-l(.*)$\") From 42147253b3a39bd5256d9717fa022392609db878 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 27 Jan 2020 07:52:02 +0100 Subject: [PATCH 218/419] remove unnecessary $$. should fix linux regressions --- ports/qt5-base/patches/prl_parser.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/qt5-base/patches/prl_parser.patch b/ports/qt5-base/patches/prl_parser.patch index 79a480426e20d4..79e83ceecd2983 100644 --- a/ports/qt5-base/patches/prl_parser.patch +++ b/ports/qt5-base/patches/prl_parser.patch @@ -55,7 +55,7 @@ index 81db0d92c..51016f3fa 100644 + string(REGEX REPLACE [[ \\\"([^\\"]+)\\\" ]] \" ;\\\"\\\\1\\\"; \" _static_depends \"${_static_depends}\") + # Every path with a space in it should be handled now! + else() -+ string(REGEX REPLACE \" -l([^ ]+)\" [[;-l\$\$\\1;]] _static_depends \"${_static_depends}\") # - l case on targets other than windows ++ string(REGEX REPLACE \" -l([^ ]+)\" [[;-l\\1;]] _static_depends \"${_static_depends}\") # - l case on targets other than windows + endif() + string(REGEX REPLACE \"[\\t ]+[^\\\\\\\"]([^( |\\\\\\\")]+)[^\\\\\\\"]([\\t ]+|[\\t ]*$)\" \";\\\\0; \" _static_depends \"${_static_depends}\") + string(REGEX REPLACE \"[\\t ]*;[\\t ]*\" \";\" _static_depends \"${_static_depends}\") # remove unnecessary whitespaces From 948836b78f8608ed3a022b547728c5e40fca676a Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 27 Jan 2020 12:50:09 +0100 Subject: [PATCH 219/419] fix plugin targets --- ports/qt5-base/patches/prl_parser.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/qt5-base/patches/prl_parser.patch b/ports/qt5-base/patches/prl_parser.patch index 79e83ceecd2983..730c676e3280ce 100644 --- a/ports/qt5-base/patches/prl_parser.patch +++ b/ports/qt5-base/patches/prl_parser.patch @@ -231,7 +231,7 @@ index 81db0d92c..51016f3fa 100644 set_target_properties(Qt5::${Plugin} PROPERTIES \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} ) -+ _qt5_$${CMAKE_MODULE_NAME}_parse_prl(TARGET Qt5::$${Plugin} LIB_FILE \"${imported_location}\" CONFIGURATION \"${Configuration}\" OUT_DEPS PRL_DEPS OUT_FLAGS PRL_FLAGS) ++ _qt5_$${CMAKE_MODULE_NAME}_parse_prl(TARGET Qt5::${Plugin} LIB_FILE \"${imported_location}\" CONFIGURATION \"${Configuration}\" OUT_DEPS PRL_DEPS OUT_FLAGS PRL_FLAGS) + set_property(TARGET Qt5::${Plugin} APPEND PROPERTY INTERFACE_LINK_LIBRARIES \"${PRL_DEPS};${PRL_FLAGS}\") endmacro() From ebaff922ec01e324b4741d9095fb320eaeef26a4 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 27 Jan 2020 12:50:22 +0100 Subject: [PATCH 220/419] fix linux config --- ports/qt5-base/patches/Qt5BasicConfig.patch | 24 ++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/ports/qt5-base/patches/Qt5BasicConfig.patch b/ports/qt5-base/patches/Qt5BasicConfig.patch index d113fb6695bee1..75a0142f361812 100644 --- a/ports/qt5-base/patches/Qt5BasicConfig.patch +++ b/ports/qt5-base/patches/Qt5BasicConfig.patch @@ -29,7 +29,18 @@ index c72989288..a88234dca 100644 !!ELSE set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") !!ENDIF -@@ -270,9 +278,8 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -265,14 +265,19 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + !!IF !isEmpty(CMAKE_RELEASE_TYPE) + !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) + _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" ) ++ if(EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\") ++ _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) ++ endif() + !!ELSE + _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) ++ if(EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\") ++ _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) ++ endif() !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) @@ -76,3 +87,14 @@ index c72989288..a88234dca 100644 !!ELSE set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") !!ENDIF +@@ -482,6 +482,9 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) + !!ENDIF + _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) ++ if(EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\") ++ _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) ++ endif() + !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD + endif() + !!ENDIF // CMAKE_RELEASE_TYPE + \ No newline at end of file From 3e06eb61dcc33e578e62ab3d39c5d830e5554ac8 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 27 Jan 2020 22:34:18 +0100 Subject: [PATCH 221/419] fix the replace expressions after the / windows commit --- ports/qt5-base/patches/prl_parser.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/qt5-base/patches/prl_parser.patch b/ports/qt5-base/patches/prl_parser.patch index 730c676e3280ce..b71b06c8256008 100644 --- a/ports/qt5-base/patches/prl_parser.patch +++ b/ports/qt5-base/patches/prl_parser.patch @@ -51,7 +51,7 @@ index 81db0d92c..51016f3fa 100644 + string(REGEX REPLACE \" -L\\\\$\\\\$([^ ]+)\" [[ ;-L\$\$\\1; ]] _static_depends \"${_static_depends}\") # - L Normal Case + if(WIN32) + string(REGEX REPLACE \"-L\\\\\\\"([^\\\\\\\"]+)\\\\\\\"\" \" ;-L\\\"\\\\1\\\"; \" _static_depends \"${_static_depends}\") # -L Tricky Case with spaces -+ string(REGEX REPLACE [[\\\"?[A-Z]:\\\\\\\\Program Files( \\(x86\\))*\\\\\\\\Windows Kits\\\\\\\\[0-9]+\\\\\\\\lib\\\\\\\\[0-9|.]+\\\\\\\\um\\\\\\\\x64(\\\\\\\\|/)([^\\\"]+)\\\"?]] \";\\\\2;\" _static_depends \"${_static_depends}\") ++ string(REGEX REPLACE [[\\\"?[A-Z]:\\\\\\\\Program Files( \\(x86\\))*\\\\\\\\Windows Kits\\\\\\\\[0-9]+\\\\\\\\lib\\\\\\\\[0-9|.]+\\\\\\\\um\\\\\\\\x64(\\\\\\\\|/)([^\\\"]+)\\\"?]] \";\\\\3;\" _static_depends \"${_static_depends}\") + string(REGEX REPLACE [[ \\\"([^\\"]+)\\\" ]] \" ;\\\"\\\\1\\\"; \" _static_depends \"${_static_depends}\") + # Every path with a space in it should be handled now! + else() From 91f3a0b86159132aee10f0c7aded9609826ec40f Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 29 Jan 2020 10:29:19 +0100 Subject: [PATCH 222/419] add xlib port --- ports/qt5-x11extras/CONTROL | 2 +- ports/xlib/CONTROL | 10 ++++ ports/xlib/portfile.cmake | 100 ++++++++++++++++++++++++++++++++++++ 3 files changed, 111 insertions(+), 1 deletion(-) create mode 100644 ports/xlib/CONTROL create mode 100644 ports/xlib/portfile.cmake diff --git a/ports/qt5-x11extras/CONTROL b/ports/qt5-x11extras/CONTROL index d09435d19afeb0..615a34d2cefc92 100644 --- a/ports/qt5-x11extras/CONTROL +++ b/ports/qt5-x11extras/CONTROL @@ -1,4 +1,4 @@ Source: qt5-x11extras Version: 5.12.5-2 Description: Qt5 x11extras Module; -Build-Depends: qt5-base +Build-Depends: qt5-base, xlib diff --git a/ports/xlib/CONTROL b/ports/xlib/CONTROL new file mode 100644 index 00000000000000..f00fcad2c40a4d --- /dev/null +++ b/ports/xlib/CONTROL @@ -0,0 +1,10 @@ +Source: xlib +Version: 11-1.6.9 +Homepage: https://www.x.org/wiki/ +Description: The X Window System is a network-transparent window system that was designed at MIT. +Build-Depends: bzip2, icu +Default-Features: + +Feature: no-feature +Description: just a dummy +Build-Depends: diff --git a/ports/xlib/portfile.cmake b/ports/xlib/portfile.cmake new file mode 100644 index 00000000000000..a5224f2f98275e --- /dev/null +++ b/ports/xlib/portfile.cmake @@ -0,0 +1,100 @@ +# Common Ambient Variables: +# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} +# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} +# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} +# CURRENT_INSTALLED_DIR = ${VCPKG_ROOT_DIR}\installed\${TRIPLET} +# DOWNLOADS = ${VCPKG_ROOT_DIR}\downloads +# PORT = current port name (zlib, etc) +# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) +# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) +# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) +# VCPKG_ROOT_DIR = +# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) +# VCPKG_TOOLCHAIN = ON OFF +# TRIPLET_SYSTEM_ARCH = arm x86 x64 +# BUILD_ARCH = "Win32" "x64" "ARM" +# MSBUILD_PLATFORM = "Win32"/"x64"/${TRIPLET_SYSTEM_ARCH} +# DEBUG_CONFIG = "Debug Static" "Debug Dll" +# RELEASE_CONFIG = "Release Static"" "Release DLL" +# VCPKG_TARGET_IS_WINDOWS +# VCPKG_TARGET_IS_UWP +# VCPKG_TARGET_IS_LINUX +# VCPKG_TARGET_IS_OSX +# VCPKG_TARGET_IS_FREEBSD +# VCPKG_TARGET_IS_ANDROID +# VCPKG_TARGET_IS_MINGW +# VCPKG_TARGET_EXECUTABLE_SUFFIX +# VCPKG_TARGET_STATIC_LIBRARY_SUFFIX +# VCPKG_TARGET_SHARED_LIBRARY_SUFFIX +# +# See additional helpful variables in /docs/maintainers/vcpkg_common_definitions.md + +# # Specifies if the port install should fail immediately given a condition +# vcpkg_fail_port_install(MESSAGE "Xlib currently only supports Linux and Mac platforms" ON_TARGET "Windows") +vcpkg_fail_port_install(MESSAGE "Xlib currently only supports Linux and Mac platforms" ON_TARGET "Windows") + +## requires AUTOCONF, LIBTOOL and PKCONF +message(WARNING "${PORT} requires autoconf, libtool and pkconf from the system package manager!") + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH_MACROS + REPO freedesktop/xorg-macros + REF 4b6b1dfea16214b5104b5373341dc8bc7016d0b5 # xorg-macros v1.19.1 + SHA512 af103ee80ab998701de63b2b0c3ce38b0d10417d1516bec15abe573876fcaa04eda8906f74697f5557de9b25f3c2309b677b35a5e99de8e52e8292e7b7d4ffca + HEAD_REF master +) +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH_MACROS} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL ${SHELL_PATH} + OPTIONS + # --enable-loadable-i18n # TODO + #OPTIONS_DEBUG + #OPTIONS_RELEASE +) + +vcpkg_install_make() + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libx11 + REF db7cca17ad7807e92a928da9d4c68a00f4836da2 #x11 v 1.6.9 + SHA512 63106422bf74071f73e47a954607472a7df6f4094c197481a100fa10676a22e81ece0459108790d3ebda6a1664c5cba6809bdb80cd5bc4befa1a76bd87188616 + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) + +file(COPY "${CURRENT_PACKAGES_DIR}/share/aclocal/xorg-macros.m4" DESTINATION "${SOURCE_PATH}/m4") + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL ${SHELL_PATH} + #OPTIONS + #OPTIONS_DEBUG + #OPTIONS_RELEASE +) + +vcpkg_install_make() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Moves all .cmake files from /debug/share/Xlib/ to /share/Xlib/ +# # See /docs/maintainers/vcpkg_fixup_cmake_targets.md for more details +# vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/Xlib) + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/xlib" RENAME copyright) + +# # Post-build test for cmake libraries +# vcpkg_test_cmake(PACKAGE_NAME Xlib) From a0b2615dc6f6826be4b37519a6210600d0406246 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 29 Jan 2020 10:46:50 +0100 Subject: [PATCH 223/419] update baseline --- scripts/ci.baseline.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index d38e13d06cb6cc..b5ccbb5ab5a137 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1813,6 +1813,9 @@ xerces-c:arm64-windows=fail xerces-c:arm-uwp=fail xerces-c:x64-uwp=fail xeus:x64-linux=ignore +xlib:x86-windows=skip +xlib:x64-windows=skip +xlib:x64-windows-static=skip xmlsec:arm-uwp=fail xmlsec:x64-uwp=fail xmsh:arm64-windows=fail From f2ddad2d4ea9a4d829d57b55ef165999d43981b3 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 29 Jan 2020 10:47:13 +0100 Subject: [PATCH 224/419] add verbose option --- ports/qt5-x11extras/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/qt5-x11extras/portfile.cmake b/ports/qt5-x11extras/portfile.cmake index 214726759f3cf1..8697756453a87b 100644 --- a/ports/qt5-x11extras/portfile.cmake +++ b/ports/qt5-x11extras/portfile.cmake @@ -1,2 +1,2 @@ include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) -qt_submodule_installation() \ No newline at end of file +qt_submodule_installation(OPTIONS --verbose) \ No newline at end of file From e1168c4c5e3a469c239b6e06c3b471a813b81578 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 29 Jan 2020 11:07:54 +0100 Subject: [PATCH 225/419] trying to get log info from qt5-x11extras --- ports/qt5-x11extras/portfile.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ports/qt5-x11extras/portfile.cmake b/ports/qt5-x11extras/portfile.cmake index 8697756453a87b..346919218c26e6 100644 --- a/ports/qt5-x11extras/portfile.cmake +++ b/ports/qt5-x11extras/portfile.cmake @@ -1,2 +1,4 @@ include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) -qt_submodule_installation(OPTIONS --verbose) \ No newline at end of file +qt_submodule_installation(OPTIONS -verbose) +file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/config.log" DESTINATION "${CURRENT_BUILDTREES_DIR}/config-dbg.log") +file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/config.log" DESTINATION "${CURRENT_BUILDTREES_DIR}/config-rel.log") \ No newline at end of file From b7cde1ecac839fc48e9c12a7b624f9aa301913f6 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 29 Jan 2020 11:15:22 +0100 Subject: [PATCH 226/419] still trying to get log info --- ports/qt5-x11extras/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/qt5-x11extras/portfile.cmake b/ports/qt5-x11extras/portfile.cmake index 346919218c26e6..8a8258bfbec4dd 100644 --- a/ports/qt5-x11extras/portfile.cmake +++ b/ports/qt5-x11extras/portfile.cmake @@ -1,4 +1,4 @@ include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) -qt_submodule_installation(OPTIONS -verbose) +qt_submodule_installation(BUILD_OPTIONS -verbose) file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/config.log" DESTINATION "${CURRENT_BUILDTREES_DIR}/config-dbg.log") file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/config.log" DESTINATION "${CURRENT_BUILDTREES_DIR}/config-rel.log") \ No newline at end of file From b68cd9e2c46754522a063d2942383e2dd872ed47 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 29 Jan 2020 12:01:45 +0100 Subject: [PATCH 227/419] still trying to get log info --- ports/qt5-x11extras/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/qt5-x11extras/portfile.cmake b/ports/qt5-x11extras/portfile.cmake index 8a8258bfbec4dd..b28865cb1f945e 100644 --- a/ports/qt5-x11extras/portfile.cmake +++ b/ports/qt5-x11extras/portfile.cmake @@ -1,4 +1,4 @@ include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) -qt_submodule_installation(BUILD_OPTIONS -verbose) +qt_submodule_installation() file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/config.log" DESTINATION "${CURRENT_BUILDTREES_DIR}/config-dbg.log") file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/config.log" DESTINATION "${CURRENT_BUILDTREES_DIR}/config-rel.log") \ No newline at end of file From ef3d3246c9d19556c0c8c4500912689978ea0e30 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 29 Jan 2020 20:55:29 +0100 Subject: [PATCH 228/419] add xorg libraries working commit 1/N --- ports/qt5-x11extras/CONTROL | 2 +- ports/qt5-x11extras/portfile.cmake | 2 - ports/xcb-proto/CONTROL | 10 +++ ports/xcb-proto/portfile.cmake | 100 ++++++++++++++++++++++++++ ports/xcb/CONTROL | 10 +++ ports/xcb/portfile.cmake | 108 +++++++++++++++++++++++++++++ ports/xlib/CONTROL | 2 +- ports/xorg-macros/CONTROL | 4 ++ ports/xorg-macros/portfile.cmake | 67 ++++++++++++++++++ 9 files changed, 301 insertions(+), 4 deletions(-) create mode 100644 ports/xcb-proto/CONTROL create mode 100644 ports/xcb-proto/portfile.cmake create mode 100644 ports/xcb/CONTROL create mode 100644 ports/xcb/portfile.cmake create mode 100644 ports/xorg-macros/CONTROL create mode 100644 ports/xorg-macros/portfile.cmake diff --git a/ports/qt5-x11extras/CONTROL b/ports/qt5-x11extras/CONTROL index 615a34d2cefc92..d09435d19afeb0 100644 --- a/ports/qt5-x11extras/CONTROL +++ b/ports/qt5-x11extras/CONTROL @@ -1,4 +1,4 @@ Source: qt5-x11extras Version: 5.12.5-2 Description: Qt5 x11extras Module; -Build-Depends: qt5-base, xlib +Build-Depends: qt5-base diff --git a/ports/qt5-x11extras/portfile.cmake b/ports/qt5-x11extras/portfile.cmake index b28865cb1f945e..99716f7a0cd121 100644 --- a/ports/qt5-x11extras/portfile.cmake +++ b/ports/qt5-x11extras/portfile.cmake @@ -1,4 +1,2 @@ include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) qt_submodule_installation() -file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/config.log" DESTINATION "${CURRENT_BUILDTREES_DIR}/config-dbg.log") -file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/config.log" DESTINATION "${CURRENT_BUILDTREES_DIR}/config-rel.log") \ No newline at end of file diff --git a/ports/xcb-proto/CONTROL b/ports/xcb-proto/CONTROL new file mode 100644 index 00000000000000..a485a413f30e89 --- /dev/null +++ b/ports/xcb-proto/CONTROL @@ -0,0 +1,10 @@ +Source: xcb-proto +Version: 1.13 +Homepage: https://xcb.freedesktop.org/ +Description: XML-XCB protocol descriptions used by libxcb for the X11 protocol & extensions +Build-Depends: bzip2, xorg-macros +Default-Features: + +Feature: no-feature +Description: just a dummy +Build-Depends: diff --git a/ports/xcb-proto/portfile.cmake b/ports/xcb-proto/portfile.cmake new file mode 100644 index 00000000000000..eb82f5dd23a325 --- /dev/null +++ b/ports/xcb-proto/portfile.cmake @@ -0,0 +1,100 @@ +# Common Ambient Variables: +# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} +# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} +# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} +# CURRENT_INSTALLED_DIR = ${VCPKG_ROOT_DIR}\installed\${TRIPLET} +# DOWNLOADS = ${VCPKG_ROOT_DIR}\downloads +# PORT = current port name (zlib, etc) +# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) +# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) +# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) +# VCPKG_ROOT_DIR = +# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) +# VCPKG_TOOLCHAIN = ON OFF +# TRIPLET_SYSTEM_ARCH = arm x86 x64 +# BUILD_ARCH = "Win32" "x64" "ARM" +# MSBUILD_PLATFORM = "Win32"/"x64"/${TRIPLET_SYSTEM_ARCH} +# DEBUG_CONFIG = "Debug Static" "Debug Dll" +# RELEASE_CONFIG = "Release Static"" "Release DLL" +# VCPKG_TARGET_IS_WINDOWS +# VCPKG_TARGET_IS_UWP +# VCPKG_TARGET_IS_LINUX +# VCPKG_TARGET_IS_OSX +# VCPKG_TARGET_IS_FREEBSD +# VCPKG_TARGET_IS_ANDROID +# VCPKG_TARGET_IS_MINGW +# VCPKG_TARGET_EXECUTABLE_SUFFIX +# VCPKG_TARGET_STATIC_LIBRARY_SUFFIX +# VCPKG_TARGET_SHARED_LIBRARY_SUFFIX +# +# See additional helpful variables in /docs/maintainers/vcpkg_common_definitions.md + +# # Specifies if the port install should fail immediately given a condition +# vcpkg_fail_port_install(MESSAGE "Xlib currently only supports Linux and Mac platforms" ON_TARGET "Windows") +vcpkg_fail_port_install(MESSAGE "Xlib currently only supports Linux and Mac platforms" ON_TARGET "Windows") + +## requires AUTOCONF, LIBTOOL and PKCONF +message(WARNING "${PORT} requires autoconf, libtool and pkconf from the system package manager!") + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH_MACROS + REPO freedesktop/xorg-macros + REF 4b6b1dfea16214b5104b5373341dc8bc7016d0b5 # xorg-macros v1.19.1 + SHA512 af103ee80ab998701de63b2b0c3ce38b0d10417d1516bec15abe573876fcaa04eda8906f74697f5557de9b25f3c2309b677b35a5e99de8e52e8292e7b7d4ffca + HEAD_REF master +) +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH_MACROS} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL ${SHELL_PATH} + OPTIONS + # --enable-loadable-i18n # TODO + #OPTIONS_DEBUG + #OPTIONS_RELEASE +) + +vcpkg_install_make() + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO proto/xcbproto + REF 94228cde97d9aecfda04a8e699d462ba2b89e3a0 #v1.13 + SHA512 a6d44efb2fe7ff0b731e6024436cc6b07633839c69716e835c4aa8c02d67686068e966f811da61722ea5e2545cd621b76fb6a0f5775840387727acb61a9bdd44 + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) + +file(COPY "${CURRENT_INSTALLED_DIR}/share/aclocal/xorg-macros.m4" DESTINATION "${SOURCE_PATH}/m4") + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL ${SHELL_PATH} + #OPTIONS + #OPTIONS_DEBUG + #OPTIONS_RELEASE +) + +vcpkg_install_make() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Moves all .cmake files from /debug/share/Xlib/ to /share/Xlib/ +# # See /docs/maintainers/vcpkg_fixup_cmake_targets.md for more details +# vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/Xlib) + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +# # Post-build test for cmake libraries +# vcpkg_test_cmake(PACKAGE_NAME Xlib) diff --git a/ports/xcb/CONTROL b/ports/xcb/CONTROL new file mode 100644 index 00000000000000..a40d34776164b8 --- /dev/null +++ b/ports/xcb/CONTROL @@ -0,0 +1,10 @@ +Source: xcb +Version: 1.13.1 +Homepage: https://xcb.freedesktop.org/ +Description: C interface to the X Window System protocol, which replaces the traditional Xlib interface. +Build-Depends: xcb-proto, xorg-macros +Default-Features: + +Feature: no-feature +Description: just a dummy +Build-Depends: diff --git a/ports/xcb/portfile.cmake b/ports/xcb/portfile.cmake new file mode 100644 index 00000000000000..d2ce6227c79c4b --- /dev/null +++ b/ports/xcb/portfile.cmake @@ -0,0 +1,108 @@ +# Common Ambient Variables: +# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} +# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} +# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} +# CURRENT_INSTALLED_DIR = ${VCPKG_ROOT_DIR}\installed\${TRIPLET} +# DOWNLOADS = ${VCPKG_ROOT_DIR}\downloads +# PORT = current port name (zlib, etc) +# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) +# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) +# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) +# VCPKG_ROOT_DIR = +# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) +# VCPKG_TOOLCHAIN = ON OFF +# TRIPLET_SYSTEM_ARCH = arm x86 x64 +# BUILD_ARCH = "Win32" "x64" "ARM" +# MSBUILD_PLATFORM = "Win32"/"x64"/${TRIPLET_SYSTEM_ARCH} +# DEBUG_CONFIG = "Debug Static" "Debug Dll" +# RELEASE_CONFIG = "Release Static"" "Release DLL" +# VCPKG_TARGET_IS_WINDOWS +# VCPKG_TARGET_IS_UWP +# VCPKG_TARGET_IS_LINUX +# VCPKG_TARGET_IS_OSX +# VCPKG_TARGET_IS_FREEBSD +# VCPKG_TARGET_IS_ANDROID +# VCPKG_TARGET_IS_MINGW +# VCPKG_TARGET_EXECUTABLE_SUFFIX +# VCPKG_TARGET_STATIC_LIBRARY_SUFFIX +# VCPKG_TARGET_SHARED_LIBRARY_SUFFIX +# +# See additional helpful variables in /docs/maintainers/vcpkg_common_definitions.md + +# # Specifies if the port install should fail immediately given a condition +# vcpkg_fail_port_install(MESSAGE "Xlib currently only supports Linux and Mac platforms" ON_TARGET "Windows") +vcpkg_fail_port_install(MESSAGE "Xlib currently only supports Linux and Mac platforms" ON_TARGET "Windows") + +## requires AUTOCONF, LIBTOOL and PKCONF +message(WARNING "${PORT} requires autoconf, libtool and pkconf from the system package manager!") + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH_MACROS + REPO freedesktop/xorg-macros + REF 4b6b1dfea16214b5104b5373341dc8bc7016d0b5 # xorg-macros v1.19.1 + SHA512 af103ee80ab998701de63b2b0c3ce38b0d10417d1516bec15abe573876fcaa04eda8906f74697f5557de9b25f3c2309b677b35a5e99de8e52e8292e7b7d4ffca + HEAD_REF master +) +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH_MACROS} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL ${SHELL_PATH} + OPTIONS + # --enable-loadable-i18n # TODO + #OPTIONS_DEBUG + #OPTIONS_RELEASE +) + +vcpkg_install_make() + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxcb + REF 8287ebd7b752c33b0cabc4982606fe4831106f7e #v1.13.1 + SHA512 625939b67d129f681503a2f784daa75897b31b09daba0b9ea72457c9dffdab34a644c0b73068282de01ddfdcd5fc29242e4db5367d39b795984374846c1319c8 + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) + +file(COPY "${CURRENT_PACKAGES_DIR}/share/aclocal/xorg-macros.m4" DESTINATION "${SOURCE_PATH}/m4") + +#Alternatively, you may set the environment variables XCBPROTO_CFLAGS +#and XCBPROTO_LIBS to avoid the need to call pkg-config. +#See the pkg-config man page for more details. +#Package xcb-proto was not found in the pkg-config search path. +#Perhaps you should add the directory containing `xcb-proto.pc' +#to the PKG_CONFIG_PATH environment variable +#Package 'xcb-proto', required by 'world', not found + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL ${SHELL_PATH} + #OPTIONS + #OPTIONS_DEBUG + #OPTIONS_RELEASE +) + +vcpkg_install_make() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Moves all .cmake files from /debug/share/Xlib/ to /share/Xlib/ +# # See /docs/maintainers/vcpkg_fixup_cmake_targets.md for more details +# vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/Xlib) + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +# # Post-build test for cmake libraries +# vcpkg_test_cmake(PACKAGE_NAME Xlib) diff --git a/ports/xlib/CONTROL b/ports/xlib/CONTROL index f00fcad2c40a4d..c3b8c85f81729c 100644 --- a/ports/xlib/CONTROL +++ b/ports/xlib/CONTROL @@ -2,7 +2,7 @@ Source: xlib Version: 11-1.6.9 Homepage: https://www.x.org/wiki/ Description: The X Window System is a network-transparent window system that was designed at MIT. -Build-Depends: bzip2, icu +Build-Depends: bzip2, xorg-macros Default-Features: Feature: no-feature diff --git a/ports/xorg-macros/CONTROL b/ports/xorg-macros/CONTROL new file mode 100644 index 00000000000000..6ccdb8dde5cffd --- /dev/null +++ b/ports/xorg-macros/CONTROL @@ -0,0 +1,4 @@ +Source: xorg-macros +Version: 1.19.1 +Homepage: https://xcb.freedesktop.org/ +Description: X.org macros utilities. diff --git a/ports/xorg-macros/portfile.cmake b/ports/xorg-macros/portfile.cmake new file mode 100644 index 00000000000000..b03c191e72d48e --- /dev/null +++ b/ports/xorg-macros/portfile.cmake @@ -0,0 +1,67 @@ +# Common Ambient Variables: +# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} +# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} +# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} +# CURRENT_INSTALLED_DIR = ${VCPKG_ROOT_DIR}\installed\${TRIPLET} +# DOWNLOADS = ${VCPKG_ROOT_DIR}\downloads +# PORT = current port name (zlib, etc) +# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) +# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) +# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) +# VCPKG_ROOT_DIR = +# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) +# VCPKG_TOOLCHAIN = ON OFF +# TRIPLET_SYSTEM_ARCH = arm x86 x64 +# BUILD_ARCH = "Win32" "x64" "ARM" +# MSBUILD_PLATFORM = "Win32"/"x64"/${TRIPLET_SYSTEM_ARCH} +# DEBUG_CONFIG = "Debug Static" "Debug Dll" +# RELEASE_CONFIG = "Release Static"" "Release DLL" +# VCPKG_TARGET_IS_WINDOWS +# VCPKG_TARGET_IS_UWP +# VCPKG_TARGET_IS_LINUX +# VCPKG_TARGET_IS_OSX +# VCPKG_TARGET_IS_FREEBSD +# VCPKG_TARGET_IS_ANDROID +# VCPKG_TARGET_IS_MINGW +# VCPKG_TARGET_EXECUTABLE_SUFFIX +# VCPKG_TARGET_STATIC_LIBRARY_SUFFIX +# VCPKG_TARGET_SHARED_LIBRARY_SUFFIX +# +# See additional helpful variables in /docs/maintainers/vcpkg_common_definitions.md + +# # Specifies if the port install should fail immediately given a condition +# vcpkg_fail_port_install(MESSAGE "Xlib currently only supports Linux and Mac platforms" ON_TARGET "Windows") +vcpkg_fail_port_install(MESSAGE "Xlib currently only supports Linux and Mac platforms" ON_TARGET "Windows") + +## requires AUTOCONF, LIBTOOL and PKCONF +message(WARNING "${PORT} requires autoconf, libtool and pkconf from the system package manager!") + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH_MACROS + REPO freedesktop/xorg-macros + REF 4b6b1dfea16214b5104b5373341dc8bc7016d0b5 # xorg-macros v1.19.1 + SHA512 af103ee80ab998701de63b2b0c3ce38b0d10417d1516bec15abe573876fcaa04eda8906f74697f5557de9b25f3c2309b677b35a5e99de8e52e8292e7b7d4ffca + HEAD_REF master +) +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH_MACROS} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL ${SHELL_PATH} + OPTIONS + # --enable-loadable-i18n # TODO + #OPTIONS_DEBUG + #OPTIONS_RELEASE +) + +vcpkg_install_make() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +# # Post-build test for cmake libraries +# vcpkg_test_cmake(PACKAGE_NAME Xlib) From 604ad81a2712954ca9cabe3fcfa53473cf00936d Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 29 Jan 2020 21:40:33 +0100 Subject: [PATCH 229/419] finish xorg macros --- ports/xorg-macros/CONTROL | 2 +- ports/xorg-macros/portfile.cmake | 48 ++++++++++++++++++++++---------- 2 files changed, 35 insertions(+), 15 deletions(-) diff --git a/ports/xorg-macros/CONTROL b/ports/xorg-macros/CONTROL index 6ccdb8dde5cffd..7bc4917d98bcfa 100644 --- a/ports/xorg-macros/CONTROL +++ b/ports/xorg-macros/CONTROL @@ -1,4 +1,4 @@ Source: xorg-macros -Version: 1.19.1 +Version: 1.19.2 Homepage: https://xcb.freedesktop.org/ Description: X.org macros utilities. diff --git a/ports/xorg-macros/portfile.cmake b/ports/xorg-macros/portfile.cmake index b03c191e72d48e..dce02722ad2c6a 100644 --- a/ports/xorg-macros/portfile.cmake +++ b/ports/xorg-macros/portfile.cmake @@ -29,37 +29,57 @@ # # See additional helpful variables in /docs/maintainers/vcpkg_common_definitions.md +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) # # Specifies if the port install should fail immediately given a condition -# vcpkg_fail_port_install(MESSAGE "Xlib currently only supports Linux and Mac platforms" ON_TARGET "Windows") -vcpkg_fail_port_install(MESSAGE "Xlib currently only supports Linux and Mac platforms" ON_TARGET "Windows") +vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Linux and Mac platforms" ON_TARGET "Windows") ## requires AUTOCONF, LIBTOOL and PKCONF -message(WARNING "${PORT} requires autoconf, libtool and pkconf from the system package manager!") +message(STATUS "----- ${PORT} requires autoconf, libtool and pkconf from the system package manager! -----") + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO util/macros + REF 771b773b50717884b37f6b2473166b4be4670076 #v1.19.2 + SHA512 7a4048fb609b4c83127758f0aa53163114da4a4a9f1414f3bda5d44cebcf49dfe41b1daa82f232420a25e6b3a7a163848f3ce30fd3c77bdb289d4ee00bec31a6 + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH_MACROS - REPO freedesktop/xorg-macros - REF 4b6b1dfea16214b5104b5373341dc8bc7016d0b5 # xorg-macros v1.19.1 - SHA512 af103ee80ab998701de63b2b0c3ce38b0d10417d1516bec15abe573876fcaa04eda8906f74697f5557de9b25f3c2309b677b35a5e99de8e52e8292e7b7d4ffca - HEAD_REF master -) vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH_MACROS} + SOURCE_PATH ${SOURCE_PATH} AUTOCONFIG #SKIP_CONFIGURE #NO_DEBUG #AUTO_HOST #AUTO_DST #PRERUN_SHELL ${SHELL_PATH} - OPTIONS - # --enable-loadable-i18n # TODO + #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE ) vcpkg_install_make() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/aclocal/") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/aclocal/" "${CURRENT_PACKAGES_DIR}/share/${PORT}/aclocal/") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/util-macros/" "${CURRENT_PACKAGES_DIR}/share/${PORT}/util-macros") + +file(READ "${CURRENT_PACKAGES_DIR}/share/pkgconfig/xorg-macros.pc" _contents) +string(REPLACE "${CURRENT_PACKAGES_DIR}" "${CURRENT_INSTALLED_DIR}" _contents "${_contents}") +string(REPLACE "datarootdir=\${prefix}/share}" "datarootdir=\${prefix}/share/${PORT}}" _contents "${_contents}") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/pkgconfig/xorg-macros.pc" "${_contents}") +#file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/pkgconfig/") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/pkgconfig/" "${CURRENT_PACKAGES_DIR}/share/${PORT}/pkgconfig") + +file(READ "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig/xorg-macros.pc" _contents) +string(REPLACE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_INSTALLED_DIR}/debug" _contents "${_contents}") +string(REPLACE "datarootdir=\${prefix}/share}" "datarootdir=\${prefix}/share/${PORT}/debug}" _contents "${_contents}") +file(WRITE "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig/xorg-macros.pc" "${_contents}") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/debug/") +file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/" "${CURRENT_PACKAGES_DIR}/share/${PORT}/debug/") + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) # # Handle copyright file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) From d98e66a7b23b16a4bec13a4a040bc82319c16214 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 29 Jan 2020 22:27:11 +0100 Subject: [PATCH 230/419] add lint feature to libxml2 which builds the lint tool --- ports/libxml2/CMakeLists.txt | 15 +++++++++++++++ ports/libxml2/CONTROL | 3 +++ ports/libxml2/portfile.cmake | 6 ++++++ 3 files changed, 24 insertions(+) diff --git a/ports/libxml2/CMakeLists.txt b/ports/libxml2/CMakeLists.txt index 69fc246f9ae412..a9f1780f568dbb 100644 --- a/ports/libxml2/CMakeLists.txt +++ b/ports/libxml2/CMakeLists.txt @@ -125,6 +125,8 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows" OR CMAKE_SYSTEM_NAME STREQUAL "WindowsSt ) target_sources(libxml2 PRIVATE win32/libxml2.rc) set_source_files_properties(win32/libxml2.rc PROPERTIES COMPILE_FLAGS "-DLIBXML_MAJOR_VERSION=${LIBXML_MAJOR_VERSION} -DLIBXML_MINOR_VERSION=${LIBXML_MINOR_VERSION} -DLIBXML_MICRO_VERSION=${LIBXML_MICRO_VERSION} -DLIBXML_DOTTED_VERSION=\\\"${VERSION}\\\"") +elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux") + target_link_libraries(libxml2 INTERFACE m) endif() target_compile_definitions(libxml2 PRIVATE @@ -150,3 +152,16 @@ install(TARGETS libxml2 ARCHIVE DESTINATION lib ${TARGET_INSTALL_OPTIONS} ) + +option(BUILD_XMLLINT "Build XML lint tool" OFF) +if(BUILD_XMLLINT) + add_executable(xmllint xmllint.c) + target_link_libraries(xmllint PRIVATE libxml2) + target_include_directories(xmllint PRIVATE "include" "${CMAKE_CURRENT_BINARY_DIR}/include" "${CMAKE_CURRENT_BINARY_DIR}") + install(TARGETS xmllint + RUNTIME DESTINATION tools/libxml2 + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + ${TARGET_INSTALL_OPTIONS} + ) +endif() diff --git a/ports/libxml2/CONTROL b/ports/libxml2/CONTROL index ccf2a9c60feae2..f68eddf41afe41 100644 --- a/ports/libxml2/CONTROL +++ b/ports/libxml2/CONTROL @@ -3,3 +3,6 @@ Version: 2.9.9-5 Homepage: https://xmlsoft.org/ Description: Libxml2 is the XML C parser and toolkit developed for the Gnome project (but usable outside of the Gnome platform) Build-Depends: zlib, libiconv, liblzma + +Feature: lint +Description: Builds xmllint diff --git a/ports/libxml2/portfile.cmake b/ports/libxml2/portfile.cmake index f7b0cd81a3ef2d..55e6078bf43b99 100644 --- a/ports/libxml2/portfile.cmake +++ b/ports/libxml2/portfile.cmake @@ -12,10 +12,16 @@ vcpkg_from_github( file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + lint BUILD_XMLLINT +) + + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS -DPORT_DIR=${CMAKE_CURRENT_LIST_DIR} + ${FEATURE_OPTIONS} OPTIONS_DEBUG -DINSTALL_HEADERS=OFF ) From 916e34917d05be97dde7cadb5056b4f9216cf550 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 29 Jan 2020 22:41:39 +0100 Subject: [PATCH 231/419] fix pkgconfig of xorg --- ports/xorg-macros/portfile.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ports/xorg-macros/portfile.cmake b/ports/xorg-macros/portfile.cmake index dce02722ad2c6a..b2eef8994b70a3 100644 --- a/ports/xorg-macros/portfile.cmake +++ b/ports/xorg-macros/portfile.cmake @@ -67,7 +67,8 @@ file(RENAME "${CURRENT_PACKAGES_DIR}/share/util-macros/" "${CURRENT_PACKAGES_DIR file(READ "${CURRENT_PACKAGES_DIR}/share/pkgconfig/xorg-macros.pc" _contents) string(REPLACE "${CURRENT_PACKAGES_DIR}" "${CURRENT_INSTALLED_DIR}" _contents "${_contents}") -string(REPLACE "datarootdir=\${prefix}/share}" "datarootdir=\${prefix}/share/${PORT}}" _contents "${_contents}") +string(REPLACE "datarootdir=\${prefix}/share" "datarootdir=\${prefix}/share/${PORT}" _contents "${_contents}") +string(REPLACE "includedir=${CURRENT_INSTALLED_DIR}/include" "includedir=\${prefix}/include" _contents "${_contents}") file(WRITE "${CURRENT_PACKAGES_DIR}/share/pkgconfig/xorg-macros.pc" "${_contents}") #file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/pkgconfig/") file(RENAME "${CURRENT_PACKAGES_DIR}/share/pkgconfig/" "${CURRENT_PACKAGES_DIR}/share/${PORT}/pkgconfig") @@ -75,6 +76,7 @@ file(RENAME "${CURRENT_PACKAGES_DIR}/share/pkgconfig/" "${CURRENT_PACKAGES_DIR}/ file(READ "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig/xorg-macros.pc" _contents) string(REPLACE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_INSTALLED_DIR}/debug" _contents "${_contents}") string(REPLACE "datarootdir=\${prefix}/share}" "datarootdir=\${prefix}/share/${PORT}/debug}" _contents "${_contents}") +string(REPLACE "includedir=${CURRENT_INSTALLED_DIR}/debug/include" "includedir=\${prefix}/../include" _contents "${_contents}") file(WRITE "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig/xorg-macros.pc" "${_contents}") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/debug/") file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/" "${CURRENT_PACKAGES_DIR}/share/${PORT}/debug/") From 938e7563e6477f361d651cd5f718fa0ef0faefc7 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 29 Jan 2020 22:47:18 +0100 Subject: [PATCH 232/419] fix xcb-proto --- ports/xcb-proto/CONTROL | 2 +- ports/xcb-proto/portfile.cmake | 46 ++++++++++++++++------------------ 2 files changed, 22 insertions(+), 26 deletions(-) diff --git a/ports/xcb-proto/CONTROL b/ports/xcb-proto/CONTROL index a485a413f30e89..3773887ccd0ebe 100644 --- a/ports/xcb-proto/CONTROL +++ b/ports/xcb-proto/CONTROL @@ -2,7 +2,7 @@ Source: xcb-proto Version: 1.13 Homepage: https://xcb.freedesktop.org/ Description: XML-XCB protocol descriptions used by libxcb for the X11 protocol & extensions -Build-Depends: bzip2, xorg-macros +Build-Depends: bzip2, xorg-macros, libxml2[lint] Default-Features: Feature: no-feature diff --git a/ports/xcb-proto/portfile.cmake b/ports/xcb-proto/portfile.cmake index eb82f5dd23a325..498885b8963551 100644 --- a/ports/xcb-proto/portfile.cmake +++ b/ports/xcb-proto/portfile.cmake @@ -34,30 +34,19 @@ vcpkg_fail_port_install(MESSAGE "Xlib currently only supports Linux and Mac platforms" ON_TARGET "Windows") ## requires AUTOCONF, LIBTOOL and PKCONF -message(WARNING "${PORT} requires autoconf, libtool and pkconf from the system package manager!") +message(STATUS "----- ${PORT} requires autoconf, libtool, pkconf and xmllint from the system package manager! -----") -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH_MACROS - REPO freedesktop/xorg-macros - REF 4b6b1dfea16214b5104b5373341dc8bc7016d0b5 # xorg-macros v1.19.1 - SHA512 af103ee80ab998701de63b2b0c3ce38b0d10417d1516bec15abe573876fcaa04eda8906f74697f5557de9b25f3c2309b677b35a5e99de8e52e8292e7b7d4ffca - HEAD_REF master -) -vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH_MACROS} - AUTOCONFIG - #SKIP_CONFIGURE - #NO_DEBUG - #AUTO_HOST - #AUTO_DST - #PRERUN_SHELL ${SHELL_PATH} - OPTIONS - # --enable-loadable-i18n # TODO - #OPTIONS_DEBUG - #OPTIONS_RELEASE -) +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) -vcpkg_install_make() +find_program(XMLLINT_PATH NAMES xmllint PATHS "${CURRENT_INSTALLED_DIR}/tools/libxml2") +if(NOT XMLLINT_PATH) + message(FATAL_ERROR "${PORT} requires xmllint which was not found!") +endif() + +string(REGEX REPLACE "/[^/]+$" "" XMLLINT_DIR "${XMLLINT_PATH}") +file(TO_NATIVE_PATH "${XMLLINT_DIR}" XMLLINT_DIR_NATIVE) +vcpkg_add_to_path("${XMLLINT_DIR_NATIVE}") +#(also requires python2?) vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org/xorg @@ -69,7 +58,7 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) -file(COPY "${CURRENT_INSTALLED_DIR}/share/aclocal/xorg-macros.m4" DESTINATION "${SOURCE_PATH}/m4") +file(COPY "${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/xorg-macros.m4" DESTINATION "${SOURCE_PATH}/m4") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} @@ -86,8 +75,15 @@ vcpkg_configure_make( vcpkg_install_make() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(READ "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/xcb-proto.pc" _contents) +string(REPLACE "$libdir=${CURRENT_PACKAGES_DIR}/lib" "$libdir=\${prefix}/lib" _contents "${_contents}") +file(WRITE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/xcb-proto.pc" "${_contents}") + +file(READ "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/xcb-proto.pc" _contents) +string(REPLACE "$libdir=${CURRENT_PACKAGES_DIR}/debug/lib" "$libdir=\${prefix}/lib" _contents "${_contents}") +file(WRITE "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/xcb-proto.pc" "${_contents}") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # # Moves all .cmake files from /debug/share/Xlib/ to /share/Xlib/ # # See /docs/maintainers/vcpkg_fixup_cmake_targets.md for more details From 419046cf55bcbd3ed0ba3ac466514aba03c172f8 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 29 Jan 2020 22:48:42 +0100 Subject: [PATCH 233/419] remove unnecessary code from libxml2 portfile --- ports/libxml2/portfile.cmake | 2 -- 1 file changed, 2 deletions(-) diff --git a/ports/libxml2/portfile.cmake b/ports/libxml2/portfile.cmake index 55e6078bf43b99..cb546a414163e7 100644 --- a/ports/libxml2/portfile.cmake +++ b/ports/libxml2/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO GNOME/libxml2 From e9cbd4ad09425a31139468402ca640c1ada31f93 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 29 Jan 2020 22:51:51 +0100 Subject: [PATCH 234/419] fix pkgconfig xcb-proto --- ports/xcb-proto/portfile.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ports/xcb-proto/portfile.cmake b/ports/xcb-proto/portfile.cmake index 498885b8963551..12b3ce55cbc135 100644 --- a/ports/xcb-proto/portfile.cmake +++ b/ports/xcb-proto/portfile.cmake @@ -76,11 +76,12 @@ vcpkg_configure_make( vcpkg_install_make() file(READ "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/xcb-proto.pc" _contents) -string(REPLACE "$libdir=${CURRENT_PACKAGES_DIR}/lib" "$libdir=\${prefix}/lib" _contents "${_contents}") +string(REPLACE "libdir=${CURRENT_PACKAGES_DIR}/lib" "libdir=\${prefix}/lib" _contents "${_contents}") file(WRITE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/xcb-proto.pc" "${_contents}") file(READ "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/xcb-proto.pc" _contents) -string(REPLACE "$libdir=${CURRENT_PACKAGES_DIR}/debug/lib" "$libdir=\${prefix}/lib" _contents "${_contents}") +string(REPLACE "libdir=${CURRENT_PACKAGES_DIR}/debug/lib" "libdir=\${prefix}/lib" _contents "${_contents}") +string(REPLACE "datarootdir=\${prefix}/share" "datarootdir=\${prefix}/../share" _contents "${_contents}") file(WRITE "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/xcb-proto.pc" "${_contents}") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") From 86723c5e4631b279af624fb5140df3b84e9b5b48 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 29 Jan 2020 23:02:57 +0100 Subject: [PATCH 235/419] make xcb build... vcpkg_fixup_pkgconfig is needed --- ports/xcb/CONTROL | 2 +- ports/xcb/portfile.cmake | 29 +++-------------------------- 2 files changed, 4 insertions(+), 27 deletions(-) diff --git a/ports/xcb/CONTROL b/ports/xcb/CONTROL index a40d34776164b8..0779c9a10c0afc 100644 --- a/ports/xcb/CONTROL +++ b/ports/xcb/CONTROL @@ -2,7 +2,7 @@ Source: xcb Version: 1.13.1 Homepage: https://xcb.freedesktop.org/ Description: C interface to the X Window System protocol, which replaces the traditional Xlib interface. -Build-Depends: xcb-proto, xorg-macros +Build-Depends: xcb-proto Default-Features: Feature: no-feature diff --git a/ports/xcb/portfile.cmake b/ports/xcb/portfile.cmake index d2ce6227c79c4b..52aa456adf49a9 100644 --- a/ports/xcb/portfile.cmake +++ b/ports/xcb/portfile.cmake @@ -34,31 +34,6 @@ vcpkg_fail_port_install(MESSAGE "Xlib currently only supports Linux and Mac platforms" ON_TARGET "Windows") ## requires AUTOCONF, LIBTOOL and PKCONF -message(WARNING "${PORT} requires autoconf, libtool and pkconf from the system package manager!") - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH_MACROS - REPO freedesktop/xorg-macros - REF 4b6b1dfea16214b5104b5373341dc8bc7016d0b5 # xorg-macros v1.19.1 - SHA512 af103ee80ab998701de63b2b0c3ce38b0d10417d1516bec15abe573876fcaa04eda8906f74697f5557de9b25f3c2309b677b35a5e99de8e52e8292e7b7d4ffca - HEAD_REF master -) -vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH_MACROS} - AUTOCONFIG - #SKIP_CONFIGURE - #NO_DEBUG - #AUTO_HOST - #AUTO_DST - #PRERUN_SHELL ${SHELL_PATH} - OPTIONS - # --enable-loadable-i18n # TODO - #OPTIONS_DEBUG - #OPTIONS_RELEASE -) - -vcpkg_install_make() - vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org/xorg OUT_SOURCE_PATH SOURCE_PATH @@ -69,8 +44,10 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) -file(COPY "${CURRENT_PACKAGES_DIR}/share/aclocal/xorg-macros.m4" DESTINATION "${SOURCE_PATH}/m4") +file(COPY "${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/xorg-macros.m4" DESTINATION "${SOURCE_PATH}/m4") +set(PKG_PATHS "$ENV{PKG_CONFIG_PATH}") +set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${CURRENT_INSTALLED_DIR}/share/xorg-macros/pkgconfig/:${CURRENT_INSTALLED_DIR}/lib/pkgconfig/") #Alternatively, you may set the environment variables XCBPROTO_CFLAGS #and XCBPROTO_LIBS to avoid the need to call pkg-config. #See the pkg-config man page for more details. From 0b6c3aedf692de0035b0e991c8f725f5ec5bd317 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 29 Jan 2020 23:27:16 +0100 Subject: [PATCH 236/419] allow adding package config dirs to configure make --- scripts/cmake/vcpkg_configure_make.cmake | 40 ++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 3 deletions(-) diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index 1a691a9458c280..a789821ce12e28 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -16,7 +16,10 @@ ## [PRERUN_SHELL <${SHELL_PATH}>] ## [OPTIONS <-DUSE_THIS_IN_ALL_BUILDS=1>...] ## [OPTIONS_RELEASE <-DOPTIMIZE=1>...] -## [OPTIONS_DEBUG <-DDEBUGGABLE=1>...] +## [OPTIONS_DEBUG <-DDEBUGGABLE=1>...]+ +## [PKG_CONFIG_PATHS <$CONFIG_PATH>] +## [PKG_CONFIG_PATHS_DEBUG <$CONFIG_PATH>] +## [PKG_CONFIG_PATHS_RELEASE <$CONFIG_PATH>] ## ) ## ``` ## @@ -64,6 +67,9 @@ ## ### OPTIONS_DEBUG ## Additional options passed to configure during the Debug configuration. These are in addition to `OPTIONS`. ## +## ### PKG_CONFIG_PATHS(_RELEASE|_DEBUG) +## Appends the listed PATHS to the enviorment variable PKG_CONFIG_PATH +## ## ## Notes ## This command supplies many common arguments to configure. To see the full list, examine the source. ## @@ -77,7 +83,7 @@ function(vcpkg_configure_make) cmake_parse_arguments(_csc "AUTOCONFIG;DISABLE_AUTO_HOST;DISABLE_AUTO_DST;NO_DEBUG;SKIP_CONFIGURE" "SOURCE_PATH;PROJECT_SUBPATH;GENERATOR;PRERUN_SHELL" - "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE" + "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE;PKG_CONFIG_PATHS;PKG_CONFIG_PATHS_DEBUG;PKG_CONFIG_PATHS_RELEASE" ${ARGN} ) @@ -106,7 +112,13 @@ function(vcpkg_configure_make) else() message(FATAL_ERROR "${_csc_GENERATOR} not supported.") endif() - + if(_csc_PKG_CONFIG_PATHS) + set(BACKUP_ENV_PKG_CONFIG_PATH $ENV{PKG_CONFIG_PATH}) + foreach(_path IN LISTS _csc_PKG_CONFIG_PATHS) + file(TO_NATIVE_PATH "${_path}" _path) + set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}${VCPKG_HOST_PATH_SEPARATOR}${_path}") + endforeach() + endif() set(WIN_TARGET_ARCH ) set(WIN_TARGET_COMPILER ) # Detect compiler @@ -218,6 +230,15 @@ function(vcpkg_configure_make) # Configure debug if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug" AND NOT _csc_NO_DEBUG) + + if(_csc_PKG_CONFIG_PATHS_DEBUG) + set(BACKUP_ENV_PKG_CONFIG_PATH_DEBUG $ENV{PKG_CONFIG_PATH}) + foreach(_path IN LISTS _csc_PKG_CONFIG_PATHS_DEBUG) + file(TO_NATIVE_PATH "${_path}" _path) + set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}${VCPKG_HOST_PATH_SEPARATOR}${_path}") + endforeach() + endif() + if (CMAKE_HOST_WIN32) unset(ENV{CFLAGS}) unset(ENV{CXXFLAGS}) @@ -281,10 +302,19 @@ function(vcpkg_configure_make) LOGNAME config-${TARGET_TRIPLET}-dbg ) endif() + set(ENV{PKG_CONFIG_PATH} "${BACKUP_ENV_PKG_CONFIG_PATH_DEBUG}") endif() # Configure release if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + if(_csc_PKG_CONFIG_PATHS_RELEASE) + set(BACKUP_ENV_PKG_CONFIG_PATH_RELEASE $ENV{PKG_CONFIG_PATH}) + foreach(_path IN LISTS _csc_PKG_CONFIG_PATHS_RELEASE) + file(TO_NATIVE_PATH "${_path}" _path) + set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}${VCPKG_HOST_PATH_SEPARATOR}${_path}") + endforeach() + endif() + if (CMAKE_HOST_WIN32) unset(ENV{CFLAGS}) unset(ENV{CXXFLAGS}) @@ -356,6 +386,8 @@ function(vcpkg_configure_make) LOGNAME config-${TAR_TRIPLET_DIR} ) endif() + + set(ENV{PKG_CONFIG_PATH} "${BACKUP_ENV_PKG_CONFIG_PATH_RELEASE}") endif() # Restore envs @@ -364,6 +396,8 @@ function(vcpkg_configure_make) set(ENV{CXXFLAGS} "${CXX_FLAGS_GLOBAL}") set(ENV{LDFLAGS} "${LD_FLAGS_GLOBAL}") endif() + set(ENV{PKG_CONFIG_PATH} "${BACKUP_ENV_PKG_CONFIG_PATH}") + set(_VCPKG_MAKE_GENERATOR "${GENERATOR}" PARENT_SCOPE) set(_VCPKG_NO_DEBUG ${_csc_NO_DEBUG} PARENT_SCOPE) From 48923d48318b4a60671352764ada08d88ab45757 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 29 Jan 2020 23:56:19 +0100 Subject: [PATCH 237/419] add vcpkg_fixup_pkgconfig --- scripts/cmake/vcpkg_common_functions.cmake | 1 + scripts/cmake/vcpkg_fixup_pkgconfig.cmake | 43 ++++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 scripts/cmake/vcpkg_fixup_pkgconfig.cmake diff --git a/scripts/cmake/vcpkg_common_functions.cmake b/scripts/cmake/vcpkg_common_functions.cmake index 564ac9421b1d73..c601f833c60919 100644 --- a/scripts/cmake/vcpkg_common_functions.cmake +++ b/scripts/cmake/vcpkg_common_functions.cmake @@ -13,6 +13,7 @@ include(vcpkg_execute_build_process) include(vcpkg_fail_port_install) include(vcpkg_find_acquire_program) include(vcpkg_fixup_cmake_targets) +include(vcpkg_fixup_pkgconfig) include(vcpkg_from_github) include(vcpkg_from_gitlab) include(vcpkg_from_bitbucket) diff --git a/scripts/cmake/vcpkg_fixup_pkgconfig.cmake b/scripts/cmake/vcpkg_fixup_pkgconfig.cmake new file mode 100644 index 00000000000000..ebd1ea7e18ce2f --- /dev/null +++ b/scripts/cmake/vcpkg_fixup_pkgconfig.cmake @@ -0,0 +1,43 @@ +#.rst: +# .. command:: vcpkg_fixup_pkgconfig +# +# Tries to fix the paths found in *.pc files + +function(vcpkg_fixup_pkgconfig) + cmake_parse_arguments(_vfpkg "" "" "RELEASE_FILES;DEBUG_FILES" ${ARGN}) + + if(_vfpkg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "vcpkg_fixup_pkgconfig was passed extra arguments: ${_vfct_UNPARSED_ARGUMENTS}") + endif() + + if(NOT _vfpkg_RELEASE_FILES) + file(GLOB_RECURSE _vfpkg_RELEASE_FILES **/*.pc) + list(FILTER _vfpkg_RELEASE_FILES EXCLUDE REGEX "${CURRENT_PACKAGES_DIR}/debug/") + endif() + + if(NOT _vfct_DEBUG_FILES) + file(GLOB_RECURSE _vfct_DEBUG_FILES **/*.pc) + list(FILTER _vfct_DEBUG_FILES INCLUDE REGEX "${CURRENT_PACKAGES_DIR}/debug/") + endif() + + foreach(_file ${_vfpkg_RELEASE_FILES}) + file(READ "${_file}" _contents) + string(REPLACE "${CURRENT_PACKAGES_DIR}" "\${prefix}" _contents "${_contents}") + string(REPLACE "${CURRENT_INSTALLED_DIR}" "\${prefix}" _contents "${_contents}") + + string(REPLACE "prefix=\${prefix}" "${CURRENT_INSTALLED_DIR}" _contents "${_contents}") + file(WRITE "${_file}" "${_contents}") + endforeach() + + foreach(_file ${_vfct_DEBUG_FILES}) + file(READ "${_file}" _contents) + string(REPLACE "${CURRENT_PACKAGES_DIR}" "\${prefix}" _contents "${_contents}") + string(REPLACE "${CURRENT_INSTALLED_DIR}" "\${prefix}" _contents "${_contents}") + string(REPLACE "debug/include" "../include" _contents "${_contents}") + string(REPLACE "debug/share" "../share" _contents "${_contents}") + string(REPLACE "prefix=\${prefix}" "${CURRENT_INSTALLED_DIR}" _contents "${_contents}") + file(WRITE "${_file}" "${_contents}") + endforeach() +endfunction() + + From 50e8c220d161fc4f61b0dbf0ffd76757bd118f88 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 30 Jan 2020 00:34:49 +0100 Subject: [PATCH 238/419] fix replacement of prefix --- scripts/cmake/vcpkg_fixup_pkgconfig.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/cmake/vcpkg_fixup_pkgconfig.cmake b/scripts/cmake/vcpkg_fixup_pkgconfig.cmake index ebd1ea7e18ce2f..95a3f43a6b88f9 100644 --- a/scripts/cmake/vcpkg_fixup_pkgconfig.cmake +++ b/scripts/cmake/vcpkg_fixup_pkgconfig.cmake @@ -25,7 +25,7 @@ function(vcpkg_fixup_pkgconfig) string(REPLACE "${CURRENT_PACKAGES_DIR}" "\${prefix}" _contents "${_contents}") string(REPLACE "${CURRENT_INSTALLED_DIR}" "\${prefix}" _contents "${_contents}") - string(REPLACE "prefix=\${prefix}" "${CURRENT_INSTALLED_DIR}" _contents "${_contents}") + string(REPLACE "^prefix=\${prefix}" "${CURRENT_INSTALLED_DIR}" _contents "${_contents}") file(WRITE "${_file}" "${_contents}") endforeach() From ae333b682ec30b09f8d01fa3927ca86cd916fd83 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 30 Jan 2020 00:35:08 +0100 Subject: [PATCH 239/419] fix a few other replacements --- scripts/cmake/vcpkg_fixup_pkgconfig.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/cmake/vcpkg_fixup_pkgconfig.cmake b/scripts/cmake/vcpkg_fixup_pkgconfig.cmake index 95a3f43a6b88f9..a4a6127d0a5754 100644 --- a/scripts/cmake/vcpkg_fixup_pkgconfig.cmake +++ b/scripts/cmake/vcpkg_fixup_pkgconfig.cmake @@ -25,7 +25,7 @@ function(vcpkg_fixup_pkgconfig) string(REPLACE "${CURRENT_PACKAGES_DIR}" "\${prefix}" _contents "${_contents}") string(REPLACE "${CURRENT_INSTALLED_DIR}" "\${prefix}" _contents "${_contents}") - string(REPLACE "^prefix=\${prefix}" "${CURRENT_INSTALLED_DIR}" _contents "${_contents}") + string(REGEX REPLACE "^prefix=\\\${prefix}" "prefix=${CURRENT_INSTALLED_DIR}" _contents "${_contents}") file(WRITE "${_file}" "${_contents}") endforeach() @@ -35,7 +35,8 @@ function(vcpkg_fixup_pkgconfig) string(REPLACE "${CURRENT_INSTALLED_DIR}" "\${prefix}" _contents "${_contents}") string(REPLACE "debug/include" "../include" _contents "${_contents}") string(REPLACE "debug/share" "../share" _contents "${_contents}") - string(REPLACE "prefix=\${prefix}" "${CURRENT_INSTALLED_DIR}" _contents "${_contents}") + string(REPLACE "debug/lib" "lib" _contents "${_contents}") # the prefix will contain the debug keyword + string(REGEX REPLACE "^prefix=\\\${prefix}" "prefix=${CURRENT_INSTALLED_DIR}" _contents "${_contents}") file(WRITE "${_file}" "${_contents}") endforeach() endfunction() From 33b6c4ad7c7a2895430ff5531303712e01b378c1 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 30 Jan 2020 00:35:22 +0100 Subject: [PATCH 240/419] update portfiles --- ports/xcb/portfile.cmake | 8 ++++++-- ports/xlib/portfile.cmake | 29 +++++------------------------ 2 files changed, 11 insertions(+), 26 deletions(-) diff --git a/ports/xcb/portfile.cmake b/ports/xcb/portfile.cmake index 52aa456adf49a9..72ccf0374e3c12 100644 --- a/ports/xcb/portfile.cmake +++ b/ports/xcb/portfile.cmake @@ -46,8 +46,8 @@ vcpkg_from_gitlab( file(COPY "${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/xorg-macros.m4" DESTINATION "${SOURCE_PATH}/m4") -set(PKG_PATHS "$ENV{PKG_CONFIG_PATH}") -set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${CURRENT_INSTALLED_DIR}/share/xorg-macros/pkgconfig/:${CURRENT_INSTALLED_DIR}/lib/pkgconfig/") +#set(PKG_PATHS "$ENV{PKG_CONFIG_PATH}") +#set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${CURRENT_INSTALLED_DIR}/share/xorg-macros/pkgconfig/:${CURRENT_INSTALLED_DIR}/lib/pkgconfig/") #Alternatively, you may set the environment variables XCBPROTO_CFLAGS #and XCBPROTO_LIBS to avoid the need to call pkg-config. #See the pkg-config man page for more details. @@ -67,9 +67,13 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE + PKG_CONFIG_PATHS "${CURRENT_INSTALLED_DIR}/share/xorg-macros/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" ) vcpkg_install_make() +vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) diff --git a/ports/xlib/portfile.cmake b/ports/xlib/portfile.cmake index a5224f2f98275e..63d3144f86a767 100644 --- a/ports/xlib/portfile.cmake +++ b/ports/xlib/portfile.cmake @@ -36,29 +36,6 @@ vcpkg_fail_port_install(MESSAGE "Xlib currently only supports Linux and Mac plat ## requires AUTOCONF, LIBTOOL and PKCONF message(WARNING "${PORT} requires autoconf, libtool and pkconf from the system package manager!") -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH_MACROS - REPO freedesktop/xorg-macros - REF 4b6b1dfea16214b5104b5373341dc8bc7016d0b5 # xorg-macros v1.19.1 - SHA512 af103ee80ab998701de63b2b0c3ce38b0d10417d1516bec15abe573876fcaa04eda8906f74697f5557de9b25f3c2309b677b35a5e99de8e52e8292e7b7d4ffca - HEAD_REF master -) -vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH_MACROS} - AUTOCONFIG - #SKIP_CONFIGURE - #NO_DEBUG - #AUTO_HOST - #AUTO_DST - #PRERUN_SHELL ${SHELL_PATH} - OPTIONS - # --enable-loadable-i18n # TODO - #OPTIONS_DEBUG - #OPTIONS_RELEASE -) - -vcpkg_install_make() - vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org/xorg OUT_SOURCE_PATH SOURCE_PATH @@ -69,7 +46,7 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) -file(COPY "${CURRENT_PACKAGES_DIR}/share/aclocal/xorg-macros.m4" DESTINATION "${SOURCE_PATH}/m4") +file(COPY "${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/xorg-macros.m4" DESTINATION "${SOURCE_PATH}/m4") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} @@ -82,9 +59,13 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE + PKG_CONFIG_PATHS "${CURRENT_INSTALLED_DIR}/share/xorg-macros/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" ) vcpkg_install_make() +vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) From 643b60d23fa52ca3d6d1c5741fb6e4006cddf1e3 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 30 Jan 2020 00:46:03 +0100 Subject: [PATCH 241/419] working commit 2/N --- ports/xlib/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/xlib/portfile.cmake b/ports/xlib/portfile.cmake index 63d3144f86a767..7bdadf5bca6fbc 100644 --- a/ports/xlib/portfile.cmake +++ b/ports/xlib/portfile.cmake @@ -47,7 +47,7 @@ vcpkg_from_gitlab( ) file(COPY "${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/xorg-macros.m4" DESTINATION "${SOURCE_PATH}/m4") - +#requires XTRANS vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} AUTOCONFIG From f1007da2ae5eb66be432dde2ddc2264df8f687be Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 30 Jan 2020 17:06:24 +0100 Subject: [PATCH 242/419] finish xtrans --- ports/xtrans/CONTROL | 10 ++++ ports/xtrans/portfile.cmake | 110 ++++++++++++++++++++++++++++++++++++ 2 files changed, 120 insertions(+) create mode 100644 ports/xtrans/CONTROL create mode 100644 ports/xtrans/portfile.cmake diff --git a/ports/xtrans/CONTROL b/ports/xtrans/CONTROL new file mode 100644 index 00000000000000..043c5133027cc8 --- /dev/null +++ b/ports/xtrans/CONTROL @@ -0,0 +1,10 @@ +Source: xtrans +Version: 1.4.0 +Homepage: https://gitlab.freedesktop.org/xorg/lib/libxtrans +Description: xtrans - X Network Transport layer shared code +Build-Depends: xorg-macros +Default-Features: + +Feature: no-feature +Description: just a dummy +Build-Depends: diff --git a/ports/xtrans/portfile.cmake b/ports/xtrans/portfile.cmake new file mode 100644 index 00000000000000..c3d6a1bda7da6d --- /dev/null +++ b/ports/xtrans/portfile.cmake @@ -0,0 +1,110 @@ +# Common Ambient Variables: +# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} +# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} +# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} +# CURRENT_INSTALLED_DIR = ${VCPKG_ROOT_DIR}\installed\${TRIPLET} +# DOWNLOADS = ${VCPKG_ROOT_DIR}\downloads +# PORT = current port name (zlib, etc) +# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) +# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) +# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) +# VCPKG_ROOT_DIR = +# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) +# VCPKG_TOOLCHAIN = ON OFF +# TRIPLET_SYSTEM_ARCH = arm x86 x64 +# BUILD_ARCH = "Win32" "x64" "ARM" +# MSBUILD_PLATFORM = "Win32"/"x64"/${TRIPLET_SYSTEM_ARCH} +# DEBUG_CONFIG = "Debug Static" "Debug Dll" +# RELEASE_CONFIG = "Release Static"" "Release DLL" +# VCPKG_TARGET_IS_WINDOWS +# VCPKG_TARGET_IS_UWP +# VCPKG_TARGET_IS_LINUX +# VCPKG_TARGET_IS_OSX +# VCPKG_TARGET_IS_FREEBSD +# VCPKG_TARGET_IS_ANDROID +# VCPKG_TARGET_IS_MINGW +# VCPKG_TARGET_EXECUTABLE_SUFFIX +# VCPKG_TARGET_STATIC_LIBRARY_SUFFIX +# VCPKG_TARGET_SHARED_LIBRARY_SUFFIX +# +# See additional helpful variables in /docs/maintainers/vcpkg_common_definitions.md +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) +# # Specifies if the port install should fail immediately given a condition +# vcpkg_fail_port_install(MESSAGE "Xlib currently only supports Linux and Mac platforms" ON_TARGET "Windows") +vcpkg_fail_port_install(MESSAGE "Xlib currently only supports Linux and Mac platforms" ON_TARGET "Windows") + +## requires AUTOCONF, LIBTOOL and PKCONF +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxtrans + REF c4262efc9688e495261d8b23a12f956ab38e006f #v1.4 + SHA512 137f0ffcae97f2375e5babbf21d336b67e7bf35f6a74377b14f035cdba66992d21f8d90f3c1dc243f8fd3d27d32af36c59af45443db59908969d0d65598865a2 + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) +#export ACLOCAL="aclocal -I $PREFIX/share/aclocal" +#file(COPY "${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/xorg-macros.m4" DESTINATION "${SOURCE_PATH}") + +#set(PKG_PATHS "$ENV{PKG_CONFIG_PATH}") +#set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${CURRENT_INSTALLED_DIR}/share/xorg-macros/pkgconfig/:${CURRENT_INSTALLED_DIR}/lib/pkgconfig/") +#Alternatively, you may set the environment variables XCBPROTO_CFLAGS +#and XCBPROTO_LIBS to avoid the need to call pkg-config. +#See the pkg-config man page for more details. +#Package xcb-proto was not found in the pkg-config search path. +#Perhaps you should add the directory containing `xcb-proto.pc' +#to the PKG_CONFIG_PATH environment variable +#Package 'xcb-proto', required by 'world', not found +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL ${SHELL_PATH} + #PRERUN_SHELL "export ACLOCAL=\"aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/\"" + #OPTIONS + #OPTIONS_DEBUG + #OPTIONS_RELEASE + PKG_CONFIG_PATHS "${CURRENT_INSTALLED_DIR}/share/xorg/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) + +vcpkg_install_make() + +vcpkg_fixup_pkgconfig() + +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/xorg/") +#file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/xorg/aclocal/") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/include") +file(RENAME "${CURRENT_PACKAGES_DIR}/include/" "${CURRENT_PACKAGES_DIR}/share/${PORT}/include") +# the include folder is moved since it contains source files. It is not meant as a traditional include folder but as a shared files folder for different x libraries. +file(RENAME "${CURRENT_PACKAGES_DIR}/share/pkgconfig/" "${CURRENT_PACKAGES_DIR}/share/xorg/pkgconfig") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/aclocal/" "${CURRENT_PACKAGES_DIR}/share/xorg/aclocal") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/doc/" "${CURRENT_PACKAGES_DIR}/share/xorg/doc") +file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/" "${CURRENT_PACKAGES_DIR}/share/xorg/debug") + +set(_file "${CURRENT_PACKAGES_DIR}/share/xorg/pkgconfig/xtrans.pc" ) +file(READ "${_file}" _contents) +string(REPLACE "includedir=\${prefix}/include" "includedir=\${prefix}/share/xtrans/include" _contents "${_contents}") +file(WRITE "${_file}" "${_contents}") + +set(_file "${CURRENT_PACKAGES_DIR}/share/xorg/debug/pkgconfig/xtrans.pc" ) +file(READ "${_file}" _contents) +string(REPLACE "includedir=\${prefix}/../include" "includedir=\${prefix}/../share/xtrans/include" _contents "${_contents}") +file(WRITE "${_file}" "${_contents}") + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) + +# # Moves all .cmake files from /debug/share/Xlib/ to /share/Xlib/ +# # See /docs/maintainers/vcpkg_fixup_cmake_targets.md for more details +# vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/Xlib) + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +# # Post-build test for cmake libraries +# vcpkg_test_cmake(PACKAGE_NAME Xlib) From 9f255b62bb1ebd93f861f534d143683cc82d2062 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 30 Jan 2020 17:06:41 +0100 Subject: [PATCH 243/419] improve other x ports --- ports/xlib/CONTROL | 2 +- ports/xlib/portfile.cmake | 24 +++++++++++++++++------- ports/xorg-macros/portfile.cmake | 17 +++++++++-------- 3 files changed, 27 insertions(+), 16 deletions(-) diff --git a/ports/xlib/CONTROL b/ports/xlib/CONTROL index c3b8c85f81729c..c57ee494775dc2 100644 --- a/ports/xlib/CONTROL +++ b/ports/xlib/CONTROL @@ -2,7 +2,7 @@ Source: xlib Version: 11-1.6.9 Homepage: https://www.x.org/wiki/ Description: The X Window System is a network-transparent window system that was designed at MIT. -Build-Depends: bzip2, xorg-macros +Build-Depends: bzip2, xtrans Default-Features: Feature: no-feature diff --git a/ports/xlib/portfile.cmake b/ports/xlib/portfile.cmake index 7bdadf5bca6fbc..d4c44ef955422c 100644 --- a/ports/xlib/portfile.cmake +++ b/ports/xlib/portfile.cmake @@ -31,10 +31,20 @@ # # Specifies if the port install should fail immediately given a condition # vcpkg_fail_port_install(MESSAGE "Xlib currently only supports Linux and Mac platforms" ON_TARGET "Windows") -vcpkg_fail_port_install(MESSAGE "Xlib currently only supports Linux and Mac platforms" ON_TARGET "Windows") +vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Linux and Mac platforms" ON_TARGET "Windows") ## requires AUTOCONF, LIBTOOL and PKCONF -message(WARNING "${PORT} requires autoconf, libtool and pkconf from the system package manager!") +message(STATUS "${PORT} requires autoconf, libtool and pkconf from the system package manager!") + +#vcpkg_from_gitlab( +# GITLAB_URL https://gitlab.freedesktop.org/xorg +# OUT_SOURCE_PATH SOURCE_XTRANS +# REPO lib/libxtrans +# REF c4262efc9688e495261d8b23a12f956ab38e006f #v1.4 +# SHA512 137f0ffcae97f2375e5babbf21d336b67e7bf35f6a74377b14f035cdba66992d21f8d90f3c1dc243f8fd3d27d32af36c59af45443db59908969d0d65598865a2 +# HEAD_REF master # branch name +# #PATCHES example.patch #patch name +#) vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org/xorg @@ -45,8 +55,8 @@ vcpkg_from_gitlab( HEAD_REF master # branch name #PATCHES example.patch #patch name ) - -file(COPY "${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/xorg-macros.m4" DESTINATION "${SOURCE_PATH}/m4") +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +#file(COPY "${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/xorg-macros.m4" DESTINATION "${SOURCE_PATH}/aclocal") #requires XTRANS vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} @@ -55,11 +65,11 @@ vcpkg_configure_make( #NO_DEBUG #AUTO_HOST #AUTO_DST - #PRERUN_SHELL ${SHELL_PATH} + #PRERUN_SHELL "export ACLOCAL=\"aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/\"" #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS "${CURRENT_INSTALLED_DIR}/share/xorg-macros/pkgconfig/" + PKG_CONFIG_PATHS "${CURRENT_INSTALLED_DIR}/share/xorg/pkgconfig/" PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" ) @@ -75,7 +85,7 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) # vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/Xlib) # # Handle copyright -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/xlib" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) # # Post-build test for cmake libraries # vcpkg_test_cmake(PACKAGE_NAME Xlib) diff --git a/ports/xorg-macros/portfile.cmake b/ports/xorg-macros/portfile.cmake index b2eef8994b70a3..ccef60cce1b747 100644 --- a/ports/xorg-macros/portfile.cmake +++ b/ports/xorg-macros/portfile.cmake @@ -61,25 +61,26 @@ vcpkg_configure_make( vcpkg_install_make() -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/aclocal/") -file(RENAME "${CURRENT_PACKAGES_DIR}/share/aclocal/" "${CURRENT_PACKAGES_DIR}/share/${PORT}/aclocal/") -file(RENAME "${CURRENT_PACKAGES_DIR}/share/util-macros/" "${CURRENT_PACKAGES_DIR}/share/${PORT}/util-macros") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/xorg/") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/xorg/aclocal/") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/aclocal/" "${CURRENT_PACKAGES_DIR}/share/xorg/aclocal/") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/util-macros/" "${CURRENT_PACKAGES_DIR}/share/xorg/util-macros") file(READ "${CURRENT_PACKAGES_DIR}/share/pkgconfig/xorg-macros.pc" _contents) string(REPLACE "${CURRENT_PACKAGES_DIR}" "${CURRENT_INSTALLED_DIR}" _contents "${_contents}") -string(REPLACE "datarootdir=\${prefix}/share" "datarootdir=\${prefix}/share/${PORT}" _contents "${_contents}") +string(REPLACE "datarootdir=\${prefix}/share" "datarootdir=\${prefix}/share/xorg" _contents "${_contents}") string(REPLACE "includedir=${CURRENT_INSTALLED_DIR}/include" "includedir=\${prefix}/include" _contents "${_contents}") file(WRITE "${CURRENT_PACKAGES_DIR}/share/pkgconfig/xorg-macros.pc" "${_contents}") #file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/pkgconfig/") -file(RENAME "${CURRENT_PACKAGES_DIR}/share/pkgconfig/" "${CURRENT_PACKAGES_DIR}/share/${PORT}/pkgconfig") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/pkgconfig/" "${CURRENT_PACKAGES_DIR}/share/xorg/pkgconfig") file(READ "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig/xorg-macros.pc" _contents) string(REPLACE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_INSTALLED_DIR}/debug" _contents "${_contents}") -string(REPLACE "datarootdir=\${prefix}/share}" "datarootdir=\${prefix}/share/${PORT}/debug}" _contents "${_contents}") +string(REPLACE "datarootdir=\${prefix}/share}" "datarootdir=\${prefix}/share/xorg/debug}" _contents "${_contents}") string(REPLACE "includedir=${CURRENT_INSTALLED_DIR}/debug/include" "includedir=\${prefix}/../include" _contents "${_contents}") file(WRITE "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig/xorg-macros.pc" "${_contents}") -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/debug/") -file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/" "${CURRENT_PACKAGES_DIR}/share/${PORT}/debug/") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/xorg/debug/") +file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/" "${CURRENT_PACKAGES_DIR}/share/xorg/debug/") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) From 4c1b5481f7e64577c13e6ac874035e96b4c7a629 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 30 Jan 2020 17:06:57 +0100 Subject: [PATCH 244/419] a bit of status messages fixup pkgconfig --- scripts/cmake/vcpkg_fixup_pkgconfig.cmake | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/scripts/cmake/vcpkg_fixup_pkgconfig.cmake b/scripts/cmake/vcpkg_fixup_pkgconfig.cmake index a4a6127d0a5754..733516bb4ab4a2 100644 --- a/scripts/cmake/vcpkg_fixup_pkgconfig.cmake +++ b/scripts/cmake/vcpkg_fixup_pkgconfig.cmake @@ -5,21 +5,24 @@ function(vcpkg_fixup_pkgconfig) cmake_parse_arguments(_vfpkg "" "" "RELEASE_FILES;DEBUG_FILES" ${ARGN}) - + + message(STATUS "Fixing pkgconfig") if(_vfpkg_UNPARSED_ARGUMENTS) message(FATAL_ERROR "vcpkg_fixup_pkgconfig was passed extra arguments: ${_vfct_UNPARSED_ARGUMENTS}") endif() if(NOT _vfpkg_RELEASE_FILES) - file(GLOB_RECURSE _vfpkg_RELEASE_FILES **/*.pc) + file(GLOB_RECURSE _vfpkg_RELEASE_FILES "${CURRENT_PACKAGES_DIR}/**/*.pc") list(FILTER _vfpkg_RELEASE_FILES EXCLUDE REGEX "${CURRENT_PACKAGES_DIR}/debug/") endif() if(NOT _vfct_DEBUG_FILES) - file(GLOB_RECURSE _vfct_DEBUG_FILES **/*.pc) + file(GLOB_RECURSE _vfct_DEBUG_FILES "${CURRENT_PACKAGES_DIR}/debug/**/*.pc") list(FILTER _vfct_DEBUG_FILES INCLUDE REGEX "${CURRENT_PACKAGES_DIR}/debug/") endif() - + + message(STATUS "Fixing pkgconfig - release") + message(STATUS "Files: ${_vfpkg_RELEASE_FILES}") foreach(_file ${_vfpkg_RELEASE_FILES}) file(READ "${_file}" _contents) string(REPLACE "${CURRENT_PACKAGES_DIR}" "\${prefix}" _contents "${_contents}") @@ -29,7 +32,9 @@ function(vcpkg_fixup_pkgconfig) file(WRITE "${_file}" "${_contents}") endforeach() - foreach(_file ${_vfct_DEBUG_FILES}) + message(STATUS "Fixing pkgconfig - debug") + message(STATUS "Files: ${_vfct_DEBUG_FILES}") + foreach(_file ${_vfct_DEBUG_FILES}) file(READ "${_file}" _contents) string(REPLACE "${CURRENT_PACKAGES_DIR}" "\${prefix}" _contents "${_contents}") string(REPLACE "${CURRENT_INSTALLED_DIR}" "\${prefix}" _contents "${_contents}") @@ -39,6 +44,7 @@ function(vcpkg_fixup_pkgconfig) string(REGEX REPLACE "^prefix=\\\${prefix}" "prefix=${CURRENT_INSTALLED_DIR}" _contents "${_contents}") file(WRITE "${_file}" "${_contents}") endforeach() + message(STATUS "Fixing pkgconfig --- finished") endfunction() From 7c5da72a2c7f6f81d9bba5ad6a1c18be7bfaa649 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 30 Jan 2020 22:02:17 +0100 Subject: [PATCH 245/419] add x11 --- ports/x11/CONTROL | 5 +++++ ports/x11/portfile.cmake | 1 + 2 files changed, 6 insertions(+) create mode 100644 ports/x11/CONTROL create mode 100644 ports/x11/portfile.cmake diff --git a/ports/x11/CONTROL b/ports/x11/CONTROL new file mode 100644 index 00000000000000..999a952ac79b1c --- /dev/null +++ b/ports/x11/CONTROL @@ -0,0 +1,5 @@ +Source: x11 +Version: 1.6.9 +Homepage: https://www.x.org/wiki/ +Description: The X Window System is a network-transparent window system that was designed at MIT. +Build-Depends: xlib diff --git a/ports/x11/portfile.cmake b/ports/x11/portfile.cmake new file mode 100644 index 00000000000000..9aefc82414d125 --- /dev/null +++ b/ports/x11/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) From fc4d8ed8ce898371300d2d6be59569f7545e19ff Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 30 Jan 2020 22:02:40 +0100 Subject: [PATCH 246/419] add xrender --- ports/xrender/CONTROL | 10 ++++ ports/xrender/portfile.cmake | 91 ++++++++++++++++++++++++++++++++++++ 2 files changed, 101 insertions(+) create mode 100644 ports/xrender/CONTROL create mode 100644 ports/xrender/portfile.cmake diff --git a/ports/xrender/CONTROL b/ports/xrender/CONTROL new file mode 100644 index 00000000000000..39bc481cbe74fb --- /dev/null +++ b/ports/xrender/CONTROL @@ -0,0 +1,10 @@ +Source: xrender +Version: 0.9.10 +Homepage: https://gitlab.freedesktop.org/xorg/lib/libxrender +Description: library for the Render Extension to the X11 protocol +Build-Depends: xorg-macros, x11 +Default-Features: + +Feature: no-feature +Description: just a dummy +Build-Depends: diff --git a/ports/xrender/portfile.cmake b/ports/xrender/portfile.cmake new file mode 100644 index 00000000000000..acf9fa63274dc4 --- /dev/null +++ b/ports/xrender/portfile.cmake @@ -0,0 +1,91 @@ +# Common Ambient Variables: +# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} +# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} +# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} +# CURRENT_INSTALLED_DIR = ${VCPKG_ROOT_DIR}\installed\${TRIPLET} +# DOWNLOADS = ${VCPKG_ROOT_DIR}\downloads +# PORT = current port name (zlib, etc) +# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) +# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) +# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) +# VCPKG_ROOT_DIR = +# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) +# VCPKG_TOOLCHAIN = ON OFF +# TRIPLET_SYSTEM_ARCH = arm x86 x64 +# BUILD_ARCH = "Win32" "x64" "ARM" +# MSBUILD_PLATFORM = "Win32"/"x64"/${TRIPLET_SYSTEM_ARCH} +# DEBUG_CONFIG = "Debug Static" "Debug Dll" +# RELEASE_CONFIG = "Release Static"" "Release DLL" +# VCPKG_TARGET_IS_WINDOWS +# VCPKG_TARGET_IS_UWP +# VCPKG_TARGET_IS_LINUX +# VCPKG_TARGET_IS_OSX +# VCPKG_TARGET_IS_FREEBSD +# VCPKG_TARGET_IS_ANDROID +# VCPKG_TARGET_IS_MINGW +# VCPKG_TARGET_EXECUTABLE_SUFFIX +# VCPKG_TARGET_STATIC_LIBRARY_SUFFIX +# VCPKG_TARGET_SHARED_LIBRARY_SUFFIX +# +# See additional helpful variables in /docs/maintainers/vcpkg_common_definitions.md + +# # Specifies if the port install should fail immediately given a condition +# vcpkg_fail_port_install(MESSAGE "Xlib currently only supports Linux and Mac platforms" ON_TARGET "Windows") +vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Linux and Mac platforms" ON_TARGET "Windows") + +## requires AUTOCONF, LIBTOOL and PKCONF +message(STATUS "${PORT} requires autoconf, libtool and pkconf from the system package manager!") + +#vcpkg_from_gitlab( +# GITLAB_URL https://gitlab.freedesktop.org/xorg +# OUT_SOURCE_PATH SOURCE_XTRANS +# REPO lib/libxtrans +# REF c4262efc9688e495261d8b23a12f956ab38e006f #v1.4 +# SHA512 137f0ffcae97f2375e5babbf21d336b67e7bf35f6a74377b14f035cdba66992d21f8d90f3c1dc243f8fd3d27d32af36c59af45443db59908969d0d65598865a2 +# HEAD_REF master # branch name +# #PATCHES example.patch #patch name +#) + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxrender + REF 845716f8f14963d338e5a8d5d2424baafc90fb30 # 0.9.10 + SHA512 a7e8d383a8400d63eb726b741cd25a1e9e671c7eadef04beddc4e31fec59b384ae4fa3f305e62a2aecbaedffc76c7b0626f525ec8634c9940a29de058e4a653c + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) + +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL "export ACLOCAL=\"aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/\"" + #OPTIONS + #OPTIONS_DEBUG + #OPTIONS_RELEASE + PKG_CONFIG_PATHS "${CURRENT_INSTALLED_DIR}/share/xorg/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Moves all .cmake files from /debug/share/Xlib/ to /share/Xlib/ +# # See /docs/maintainers/vcpkg_fixup_cmake_targets.md for more details +# vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/Xlib) + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +# # Post-build test for cmake libraries +# vcpkg_test_cmake(PACKAGE_NAME Xlib) From 00b0cd4d8eb82354d7324af50f20e2038edc6704 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 30 Jan 2020 22:02:50 +0100 Subject: [PATCH 247/419] add xcb-util-m4 --- ports/xcb-util-m4/CONTROL | 4 ++++ ports/xcb-util-m4/portfile.cmake | 16 ++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 ports/xcb-util-m4/CONTROL create mode 100644 ports/xcb-util-m4/portfile.cmake diff --git a/ports/xcb-util-m4/CONTROL b/ports/xcb-util-m4/CONTROL new file mode 100644 index 00000000000000..d19bc808d35a06 --- /dev/null +++ b/ports/xcb-util-m4/CONTROL @@ -0,0 +1,4 @@ +Source: xcb-util-m4 +Version: 1 +Homepage: https://gitlab.freedesktop.org/xorg/util/xcb-util-m4 +Description: GNU autoconf macros shared across XCB projects diff --git a/ports/xcb-util-m4/portfile.cmake b/ports/xcb-util-m4/portfile.cmake new file mode 100644 index 00000000000000..d7c5ec1dba288d --- /dev/null +++ b/ports/xcb-util-m4/portfile.cmake @@ -0,0 +1,16 @@ +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO util/xcb-util-m4 + REF f662e3a93ebdec3d1c9374382dcc070093a42fed #v1.19.2 + SHA512 29840da449a434f169437fd2cef78273e0cba00a7f76d48790c838dc8f40fe55cb0932d96b649e1bd066c6c5e257dd2d9d71c663ce100aa5ca25a2ccec1b7e77 + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) + +file(GLOB_RECURSE M4_FILES "${SOURCE_PATH}/*.m4") +file(INSTALL ${M4_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/share/xorg/aclocal") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(TOUCH "${CURRENT_PACKAGES_DIR}/share/xcb-util-m4/copyright") \ No newline at end of file From 70c39b9c2bfb51976f5ac446c17b5eb298f39286 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 30 Jan 2020 22:03:05 +0100 Subject: [PATCH 248/419] add xext --- ports/xext/CONTROL | 4 ++ ports/xext/portfile.cmake | 91 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+) create mode 100644 ports/xext/CONTROL create mode 100644 ports/xext/portfile.cmake diff --git a/ports/xext/CONTROL b/ports/xext/CONTROL new file mode 100644 index 00000000000000..5451918474ccdc --- /dev/null +++ b/ports/xext/CONTROL @@ -0,0 +1,4 @@ +Source: xext +Version: 1.3.4 +Homepage: https://gitlab.freedesktop.org/xorg/lib/libxext +Description: Xlib-based library for common extensions to the X11 protocol diff --git a/ports/xext/portfile.cmake b/ports/xext/portfile.cmake new file mode 100644 index 00000000000000..fa9d799294bfed --- /dev/null +++ b/ports/xext/portfile.cmake @@ -0,0 +1,91 @@ +# Common Ambient Variables: +# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} +# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} +# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} +# CURRENT_INSTALLED_DIR = ${VCPKG_ROOT_DIR}\installed\${TRIPLET} +# DOWNLOADS = ${VCPKG_ROOT_DIR}\downloads +# PORT = current port name (zlib, etc) +# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) +# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) +# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) +# VCPKG_ROOT_DIR = +# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) +# VCPKG_TOOLCHAIN = ON OFF +# TRIPLET_SYSTEM_ARCH = arm x86 x64 +# BUILD_ARCH = "Win32" "x64" "ARM" +# MSBUILD_PLATFORM = "Win32"/"x64"/${TRIPLET_SYSTEM_ARCH} +# DEBUG_CONFIG = "Debug Static" "Debug Dll" +# RELEASE_CONFIG = "Release Static"" "Release DLL" +# VCPKG_TARGET_IS_WINDOWS +# VCPKG_TARGET_IS_UWP +# VCPKG_TARGET_IS_LINUX +# VCPKG_TARGET_IS_OSX +# VCPKG_TARGET_IS_FREEBSD +# VCPKG_TARGET_IS_ANDROID +# VCPKG_TARGET_IS_MINGW +# VCPKG_TARGET_EXECUTABLE_SUFFIX +# VCPKG_TARGET_STATIC_LIBRARY_SUFFIX +# VCPKG_TARGET_SHARED_LIBRARY_SUFFIX +# +# See additional helpful variables in /docs/maintainers/vcpkg_common_definitions.md + +# # Specifies if the port install should fail immediately given a condition +# vcpkg_fail_port_install(MESSAGE "Xlib currently only supports Linux and Mac platforms" ON_TARGET "Windows") +vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Linux and Mac platforms" ON_TARGET "Windows") + +## requires AUTOCONF, LIBTOOL and PKCONF +message(STATUS "${PORT} requires autoconf, libtool and pkconf from the system package manager!") + +#vcpkg_from_gitlab( +# GITLAB_URL https://gitlab.freedesktop.org/xorg +# OUT_SOURCE_PATH SOURCE_XTRANS +# REPO lib/libxtrans +# REF c4262efc9688e495261d8b23a12f956ab38e006f #v1.4 +# SHA512 137f0ffcae97f2375e5babbf21d336b67e7bf35f6a74377b14f035cdba66992d21f8d90f3c1dc243f8fd3d27d32af36c59af45443db59908969d0d65598865a2 +# HEAD_REF master # branch name +# #PATCHES example.patch #patch name +#) + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxext + REF ebb167f34a3514783966775fb12573c4ed209625 # 1.3.4 + SHA512 509cb67ad9dba37adbcc49dca6e9803b318f62e8e2b981ccf73ce328a8104e94615312c5914b480ba04e28d208cd93d8a71b3e6e2ef1a4e5615aa2a3f9ba19e7 + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) + +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL "export ACLOCAL=\"aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/\"" + #OPTIONS + #OPTIONS_DEBUG + #OPTIONS_RELEASE + PKG_CONFIG_PATHS "${CURRENT_INSTALLED_DIR}/share/xorg/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Moves all .cmake files from /debug/share/Xlib/ to /share/Xlib/ +# # See /docs/maintainers/vcpkg_fixup_cmake_targets.md for more details +# vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/Xlib) + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +# # Post-build test for cmake libraries +# vcpkg_test_cmake(PACKAGE_NAME Xlib) From 15a5cf3f30fbe461ab5b75ae91917db8620d0456 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 30 Jan 2020 22:03:12 +0100 Subject: [PATCH 249/419] add xfixes --- ports/xfixes/CONTROL | 5 ++ ports/xfixes/portfile.cmake | 91 +++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+) create mode 100644 ports/xfixes/CONTROL create mode 100644 ports/xfixes/portfile.cmake diff --git a/ports/xfixes/CONTROL b/ports/xfixes/CONTROL new file mode 100644 index 00000000000000..01d96cec9c2f47 --- /dev/null +++ b/ports/xfixes/CONTROL @@ -0,0 +1,5 @@ +Source: xfixes +Version: 5.0.3 +Homepage: https://gitlab.freedesktop.org/xorg/lib/libxfixes +Description: Xlib-based library for the XFIXES Extension +Build-Depends: diff --git a/ports/xfixes/portfile.cmake b/ports/xfixes/portfile.cmake new file mode 100644 index 00000000000000..f5953ed20ce06c --- /dev/null +++ b/ports/xfixes/portfile.cmake @@ -0,0 +1,91 @@ +# Common Ambient Variables: +# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} +# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} +# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} +# CURRENT_INSTALLED_DIR = ${VCPKG_ROOT_DIR}\installed\${TRIPLET} +# DOWNLOADS = ${VCPKG_ROOT_DIR}\downloads +# PORT = current port name (zlib, etc) +# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) +# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) +# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) +# VCPKG_ROOT_DIR = +# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) +# VCPKG_TOOLCHAIN = ON OFF +# TRIPLET_SYSTEM_ARCH = arm x86 x64 +# BUILD_ARCH = "Win32" "x64" "ARM" +# MSBUILD_PLATFORM = "Win32"/"x64"/${TRIPLET_SYSTEM_ARCH} +# DEBUG_CONFIG = "Debug Static" "Debug Dll" +# RELEASE_CONFIG = "Release Static"" "Release DLL" +# VCPKG_TARGET_IS_WINDOWS +# VCPKG_TARGET_IS_UWP +# VCPKG_TARGET_IS_LINUX +# VCPKG_TARGET_IS_OSX +# VCPKG_TARGET_IS_FREEBSD +# VCPKG_TARGET_IS_ANDROID +# VCPKG_TARGET_IS_MINGW +# VCPKG_TARGET_EXECUTABLE_SUFFIX +# VCPKG_TARGET_STATIC_LIBRARY_SUFFIX +# VCPKG_TARGET_SHARED_LIBRARY_SUFFIX +# +# See additional helpful variables in /docs/maintainers/vcpkg_common_definitions.md + +# # Specifies if the port install should fail immediately given a condition +# vcpkg_fail_port_install(MESSAGE "Xlib currently only supports Linux and Mac platforms" ON_TARGET "Windows") +vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Linux and Mac platforms" ON_TARGET "Windows") + +## requires AUTOCONF, LIBTOOL and PKCONF +message(STATUS "${PORT} requires autoconf, libtool and pkconf from the system package manager!") + +#vcpkg_from_gitlab( +# GITLAB_URL https://gitlab.freedesktop.org/xorg +# OUT_SOURCE_PATH SOURCE_XTRANS +# REPO lib/libxtrans +# REF c4262efc9688e495261d8b23a12f956ab38e006f #v1.4 +# SHA512 137f0ffcae97f2375e5babbf21d336b67e7bf35f6a74377b14f035cdba66992d21f8d90f3c1dc243f8fd3d27d32af36c59af45443db59908969d0d65598865a2 +# HEAD_REF master # branch name +# #PATCHES example.patch #patch name +#) + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxfixes + REF 84df9cb81cc31bbed27ba241a23ae04f61da57db # 5.0.3 + SHA512 d1eeafb125b3ae97f55de233c2a754e6b855bf8879f25c308dbca94b94f4f26547ead5b2b82b6b228b3f981dd8951b81a47c11d3764da0550bfe934b09b830ab + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) + +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL "export ACLOCAL=\"aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/\"" + #OPTIONS + #OPTIONS_DEBUG + #OPTIONS_RELEASE + PKG_CONFIG_PATHS "${CURRENT_INSTALLED_DIR}/share/xorg/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Moves all .cmake files from /debug/share/Xlib/ to /share/Xlib/ +# # See /docs/maintainers/vcpkg_fixup_cmake_targets.md for more details +# vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/Xlib) + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +# # Post-build test for cmake libraries +# vcpkg_test_cmake(PACKAGE_NAME Xlib) From 9288843cd6c0286862e9d2781e5e09e379f635a6 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 30 Jan 2020 22:03:20 +0100 Subject: [PATCH 250/419] add xi --- ports/xi/CONTROL | 5 +++ ports/xi/portfile.cmake | 91 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+) create mode 100644 ports/xi/CONTROL create mode 100644 ports/xi/portfile.cmake diff --git a/ports/xi/CONTROL b/ports/xi/CONTROL new file mode 100644 index 00000000000000..e207e3c2c53586 --- /dev/null +++ b/ports/xi/CONTROL @@ -0,0 +1,5 @@ +Source: xi +Version: 1.7.10 +Homepage: https://gitlab.freedesktop.org/xorg/lib/libxi +Description: Xlib library for the X Input Extension +Build-Depends: xext, xfixes diff --git a/ports/xi/portfile.cmake b/ports/xi/portfile.cmake new file mode 100644 index 00000000000000..def2c141e4147e --- /dev/null +++ b/ports/xi/portfile.cmake @@ -0,0 +1,91 @@ +# Common Ambient Variables: +# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} +# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} +# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} +# CURRENT_INSTALLED_DIR = ${VCPKG_ROOT_DIR}\installed\${TRIPLET} +# DOWNLOADS = ${VCPKG_ROOT_DIR}\downloads +# PORT = current port name (zlib, etc) +# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) +# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) +# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) +# VCPKG_ROOT_DIR = +# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) +# VCPKG_TOOLCHAIN = ON OFF +# TRIPLET_SYSTEM_ARCH = arm x86 x64 +# BUILD_ARCH = "Win32" "x64" "ARM" +# MSBUILD_PLATFORM = "Win32"/"x64"/${TRIPLET_SYSTEM_ARCH} +# DEBUG_CONFIG = "Debug Static" "Debug Dll" +# RELEASE_CONFIG = "Release Static"" "Release DLL" +# VCPKG_TARGET_IS_WINDOWS +# VCPKG_TARGET_IS_UWP +# VCPKG_TARGET_IS_LINUX +# VCPKG_TARGET_IS_OSX +# VCPKG_TARGET_IS_FREEBSD +# VCPKG_TARGET_IS_ANDROID +# VCPKG_TARGET_IS_MINGW +# VCPKG_TARGET_EXECUTABLE_SUFFIX +# VCPKG_TARGET_STATIC_LIBRARY_SUFFIX +# VCPKG_TARGET_SHARED_LIBRARY_SUFFIX +# +# See additional helpful variables in /docs/maintainers/vcpkg_common_definitions.md + +# # Specifies if the port install should fail immediately given a condition +# vcpkg_fail_port_install(MESSAGE "Xlib currently only supports Linux and Mac platforms" ON_TARGET "Windows") +vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Linux and Mac platforms" ON_TARGET "Windows") + +## requires AUTOCONF, LIBTOOL and PKCONF +message(STATUS "${PORT} requires autoconf, libtool and pkconf from the system package manager!") + +#vcpkg_from_gitlab( +# GITLAB_URL https://gitlab.freedesktop.org/xorg +# OUT_SOURCE_PATH SOURCE_XTRANS +# REPO lib/libxtrans +# REF c4262efc9688e495261d8b23a12f956ab38e006f #v1.4 +# SHA512 137f0ffcae97f2375e5babbf21d336b67e7bf35f6a74377b14f035cdba66992d21f8d90f3c1dc243f8fd3d27d32af36c59af45443db59908969d0d65598865a2 +# HEAD_REF master # branch name +# #PATCHES example.patch #patch name +#) + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxi + REF e05da79a98775edb91ffe3de3b413f156bc4d6e7 # 1.7.10 + SHA512 85a8d5a833110665ca0b60a3bfaed8eef503982d59cf61b2f8598c1cb8f3c3c879abc7c927c4a9732084089bbfc4c5f33838e767de8e867d0839695ea1f3427f + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) + +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL "export ACLOCAL=\"aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/\"" + #OPTIONS + #OPTIONS_DEBUG + #OPTIONS_RELEASE + PKG_CONFIG_PATHS "${CURRENT_INSTALLED_DIR}/share/xorg/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Moves all .cmake files from /debug/share/Xlib/ to /share/Xlib/ +# # See /docs/maintainers/vcpkg_fixup_cmake_targets.md for more details +# vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/Xlib) + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +# # Post-build test for cmake libraries +# vcpkg_test_cmake(PACKAGE_NAME Xlib) From c1f1995f6e4f23a47c72cdefaf74089029c95292 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 30 Jan 2020 22:03:32 +0100 Subject: [PATCH 251/419] cleanup xlib --- ports/xlib/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/xlib/portfile.cmake b/ports/xlib/portfile.cmake index d4c44ef955422c..6d23f449420033 100644 --- a/ports/xlib/portfile.cmake +++ b/ports/xlib/portfile.cmake @@ -55,9 +55,9 @@ vcpkg_from_gitlab( HEAD_REF master # branch name #PATCHES example.patch #patch name ) + set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") -#file(COPY "${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/xorg-macros.m4" DESTINATION "${SOURCE_PATH}/aclocal") -#requires XTRANS + vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} AUTOCONFIG From f77c79e706b37865cd069668463b9ad60641476c Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 30 Jan 2020 22:12:17 +0100 Subject: [PATCH 252/419] add xproto --- ports/xproto/CONTROL | 4 ++ ports/xproto/portfile.cmake | 94 +++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+) create mode 100644 ports/xproto/CONTROL create mode 100644 ports/xproto/portfile.cmake diff --git a/ports/xproto/CONTROL b/ports/xproto/CONTROL new file mode 100644 index 00000000000000..0fd712e49a540b --- /dev/null +++ b/ports/xproto/CONTROL @@ -0,0 +1,4 @@ +Source: xproto +Version: 2019.2 +Homepage: https://gitlab.freedesktop.org/xorg/proto/xorgproto +Description: X Window System unified protocol definitions diff --git a/ports/xproto/portfile.cmake b/ports/xproto/portfile.cmake new file mode 100644 index 00000000000000..473f1f2c2cc098 --- /dev/null +++ b/ports/xproto/portfile.cmake @@ -0,0 +1,94 @@ +# Common Ambient Variables: +# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} +# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} +# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} +# CURRENT_INSTALLED_DIR = ${VCPKG_ROOT_DIR}\installed\${TRIPLET} +# DOWNLOADS = ${VCPKG_ROOT_DIR}\downloads +# PORT = current port name (zlib, etc) +# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) +# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) +# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) +# VCPKG_ROOT_DIR = +# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) +# VCPKG_TOOLCHAIN = ON OFF +# TRIPLET_SYSTEM_ARCH = arm x86 x64 +# BUILD_ARCH = "Win32" "x64" "ARM" +# MSBUILD_PLATFORM = "Win32"/"x64"/${TRIPLET_SYSTEM_ARCH} +# DEBUG_CONFIG = "Debug Static" "Debug Dll" +# RELEASE_CONFIG = "Release Static"" "Release DLL" +# VCPKG_TARGET_IS_WINDOWS +# VCPKG_TARGET_IS_UWP +# VCPKG_TARGET_IS_LINUX +# VCPKG_TARGET_IS_OSX +# VCPKG_TARGET_IS_FREEBSD +# VCPKG_TARGET_IS_ANDROID +# VCPKG_TARGET_IS_MINGW +# VCPKG_TARGET_EXECUTABLE_SUFFIX +# VCPKG_TARGET_STATIC_LIBRARY_SUFFIX +# VCPKG_TARGET_SHARED_LIBRARY_SUFFIX +# +# See additional helpful variables in /docs/maintainers/vcpkg_common_definitions.md + +# # Specifies if the port install should fail immediately given a condition +# vcpkg_fail_port_install(MESSAGE "Xlib currently only supports Linux and Mac platforms" ON_TARGET "Windows") +vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Linux and Mac platforms" ON_TARGET "Windows") + +## requires AUTOCONF, LIBTOOL and PKCONF +message(STATUS "${PORT} requires autoconf, libtool and pkconf from the system package manager!") + +#vcpkg_from_gitlab( +# GITLAB_URL https://gitlab.freedesktop.org/xorg +# OUT_SOURCE_PATH SOURCE_XTRANS +# REPO lib/libxtrans +# REF c4262efc9688e495261d8b23a12f956ab38e006f #v1.4 +# SHA512 137f0ffcae97f2375e5babbf21d336b67e7bf35f6a74377b14f035cdba66992d21f8d90f3c1dc243f8fd3d27d32af36c59af45443db59908969d0d65598865a2 +# HEAD_REF master # branch name +# #PATCHES example.patch #patch name +#) + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO proto/xorgproto + REF f61f9a3ee1aa77ebcc67730cda9bfde88e4e9c5f # 2019.2 + SHA512 52540660d22e80a40c16c0f36fe66d76ce738a32a31c294126f0ec4519cc696f553ab46abf889487295b3e2e32feff94be4ce2a1e74dd66d964a1ff903a58e1e + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) + +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL "export ACLOCAL=\"aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/\"" + #OPTIONS + #OPTIONS_DEBUG + #OPTIONS_RELEASE + PKG_CONFIG_PATHS "${CURRENT_INSTALLED_DIR}/share/xorg/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/xorg/") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/pkgconfig/" "${CURRENT_PACKAGES_DIR}/share/xorg/pkgconfig") + +# # Moves all .cmake files from /debug/share/Xlib/ to /share/Xlib/ +# # See /docs/maintainers/vcpkg_fixup_cmake_targets.md for more details +# vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/Xlib) + +# # Handle copyright +file(GLOB_RECURSE _files "${SOURCE_PATH}/COPYING*") +file(INSTALL ${_files} DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(TOUCH "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") + +# # Post-build test for cmake libraries +# vcpkg_test_cmake(PACKAGE_NAME Xlib) From a1794fae06e783048ff6c215b1efadb8d87d2657 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 30 Jan 2020 22:20:36 +0100 Subject: [PATCH 253/419] add xcb-keysyms --- ports/xcb-keysyms/CONTROL | 10 +++++ ports/xcb-keysyms/portfile.cmake | 74 ++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+) create mode 100644 ports/xcb-keysyms/CONTROL create mode 100644 ports/xcb-keysyms/portfile.cmake diff --git a/ports/xcb-keysyms/CONTROL b/ports/xcb-keysyms/CONTROL new file mode 100644 index 00000000000000..7c352ae563d53c --- /dev/null +++ b/ports/xcb-keysyms/CONTROL @@ -0,0 +1,10 @@ +Source: xcb-keysyms +Version: 0.4.0 +Homepage: https://xcb.freedesktop.org/ +Description: Standard X key constants and conversion to/from keycodes +Build-Depends: xorg-macros, bzip2, xproto +Default-Features: + +Feature: no-feature +Description: just a dummy +Build-Depends: diff --git a/ports/xcb-keysyms/portfile.cmake b/ports/xcb-keysyms/portfile.cmake new file mode 100644 index 00000000000000..904fc322a549ba --- /dev/null +++ b/ports/xcb-keysyms/portfile.cmake @@ -0,0 +1,74 @@ +# Common Ambient Variables: +# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} +# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} +# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} +# CURRENT_INSTALLED_DIR = ${VCPKG_ROOT_DIR}\installed\${TRIPLET} +# DOWNLOADS = ${VCPKG_ROOT_DIR}\downloads +# PORT = current port name (zlib, etc) +# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) +# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) +# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) +# VCPKG_ROOT_DIR = +# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) +# VCPKG_TOOLCHAIN = ON OFF +# TRIPLET_SYSTEM_ARCH = arm x86 x64 +# BUILD_ARCH = "Win32" "x64" "ARM" +# MSBUILD_PLATFORM = "Win32"/"x64"/${TRIPLET_SYSTEM_ARCH} +# DEBUG_CONFIG = "Debug Static" "Debug Dll" +# RELEASE_CONFIG = "Release Static"" "Release DLL" +# VCPKG_TARGET_IS_WINDOWS +# VCPKG_TARGET_IS_UWP +# VCPKG_TARGET_IS_LINUX +# VCPKG_TARGET_IS_OSX +# VCPKG_TARGET_IS_FREEBSD +# VCPKG_TARGET_IS_ANDROID +# VCPKG_TARGET_IS_MINGW +# VCPKG_TARGET_EXECUTABLE_SUFFIX +# VCPKG_TARGET_STATIC_LIBRARY_SUFFIX +# VCPKG_TARGET_SHARED_LIBRARY_SUFFIX +# +# See additional helpful variables in /docs/maintainers/vcpkg_common_definitions.md + +# # Specifies if the port install should fail immediately given a condition +# vcpkg_fail_port_install(MESSAGE "Xlib currently only supports Linux and Mac platforms" ON_TARGET "Windows") +vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Linux and Mac platforms" ON_TARGET "Windows") +## requires AUTOCONF, LIBTOOL and PKCONF +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxcb-keysyms + REF 0e51ee5570a6a80bdf98770b975dfe8a57f4eeb1 #v 0.4.0 + SHA512 5fe01c8902ed09582c6c5d98a24dc2a19e16f507200e7ee4a75889d0fec4e2faea910a1994b0c85e3139a28b563b1edf5db86284e5d19e14760f39eb893f623c + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) +file(TOUCH ${SOURCE_PATH}/m4/dummy) +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL ${SHELL_PATH} + #OPTIONS + #OPTIONS_DEBUG + #OPTIONS_RELEASE + PKG_CONFIG_PATHS "${CURRENT_INSTALLED_DIR}/share/xorg-macros/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Handle copyright +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/") +file(TOUCH "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") #already installed by xproto + + From f35fec044770b75139bcdb4b75edc3f6bd3f2d45 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 30 Jan 2020 22:23:46 +0100 Subject: [PATCH 254/419] add xcb-image --- ports/xcb-image/CONTROL | 5 +++ ports/xcb-image/portfile.cmake | 74 ++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+) create mode 100644 ports/xcb-image/CONTROL create mode 100644 ports/xcb-image/portfile.cmake diff --git a/ports/xcb-image/CONTROL b/ports/xcb-image/CONTROL new file mode 100644 index 00000000000000..f76cac8174d53a --- /dev/null +++ b/ports/xcb-image/CONTROL @@ -0,0 +1,5 @@ +Source: xcb-image +Version: 0.4.0 +Homepage: https://xcb.freedesktop.org/ +Description: XCB port of Xlib's XImage and XShmImage functions. +Build-Depends: xorg-macros, bzip2, xproto diff --git a/ports/xcb-image/portfile.cmake b/ports/xcb-image/portfile.cmake new file mode 100644 index 00000000000000..a77c73995c7274 --- /dev/null +++ b/ports/xcb-image/portfile.cmake @@ -0,0 +1,74 @@ +# Common Ambient Variables: +# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} +# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} +# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} +# CURRENT_INSTALLED_DIR = ${VCPKG_ROOT_DIR}\installed\${TRIPLET} +# DOWNLOADS = ${VCPKG_ROOT_DIR}\downloads +# PORT = current port name (zlib, etc) +# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) +# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) +# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) +# VCPKG_ROOT_DIR = +# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) +# VCPKG_TOOLCHAIN = ON OFF +# TRIPLET_SYSTEM_ARCH = arm x86 x64 +# BUILD_ARCH = "Win32" "x64" "ARM" +# MSBUILD_PLATFORM = "Win32"/"x64"/${TRIPLET_SYSTEM_ARCH} +# DEBUG_CONFIG = "Debug Static" "Debug Dll" +# RELEASE_CONFIG = "Release Static"" "Release DLL" +# VCPKG_TARGET_IS_WINDOWS +# VCPKG_TARGET_IS_UWP +# VCPKG_TARGET_IS_LINUX +# VCPKG_TARGET_IS_OSX +# VCPKG_TARGET_IS_FREEBSD +# VCPKG_TARGET_IS_ANDROID +# VCPKG_TARGET_IS_MINGW +# VCPKG_TARGET_EXECUTABLE_SUFFIX +# VCPKG_TARGET_STATIC_LIBRARY_SUFFIX +# VCPKG_TARGET_SHARED_LIBRARY_SUFFIX +# +# See additional helpful variables in /docs/maintainers/vcpkg_common_definitions.md + +# # Specifies if the port install should fail immediately given a condition +# vcpkg_fail_port_install(MESSAGE "Xlib currently only supports Linux and Mac platforms" ON_TARGET "Windows") +vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Linux and Mac platforms" ON_TARGET "Windows") +## requires AUTOCONF, LIBTOOL and PKCONF +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxcb-image + REF d882052fb2ce439c6483fce944ba8f16f7294639 #v 0.4.0 + SHA512 60d933d60351071fa47540a7943a34fd57bd46ebcd7441020c8f3f0ef4abc44fbb8e86e72e328d64992254ce20d5b718bede9f4994dbd0674fbf5ce88050c307 + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) +file(TOUCH ${SOURCE_PATH}/m4/dummy) +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL ${SHELL_PATH} + #OPTIONS + #OPTIONS_DEBUG + #OPTIONS_RELEASE + PKG_CONFIG_PATHS "${CURRENT_INSTALLED_DIR}/share/xorg-macros/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Handle copyright +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/") +file(TOUCH "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") #already installed by xproto + + From e5b7098927a114686a6d55882df738034451ea36 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 30 Jan 2020 22:36:52 +0100 Subject: [PATCH 255/419] add xcb-render-util --- ports/xcb-render-util/CONTROL | 5 ++ ports/xcb-render-util/portfile.cmake | 76 ++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+) create mode 100644 ports/xcb-render-util/CONTROL create mode 100644 ports/xcb-render-util/portfile.cmake diff --git a/ports/xcb-render-util/CONTROL b/ports/xcb-render-util/CONTROL new file mode 100644 index 00000000000000..660febd5a81f6d --- /dev/null +++ b/ports/xcb-render-util/CONTROL @@ -0,0 +1,5 @@ +Source: xcb-render-util +Version: 0.3.9 +Homepage: https://xcb.freedesktop.org/ +Description: XCB convenience functions for the Render extension. +Build-Depends: xorg-macros, bzip2, xproto diff --git a/ports/xcb-render-util/portfile.cmake b/ports/xcb-render-util/portfile.cmake new file mode 100644 index 00000000000000..d84bc19bafaba2 --- /dev/null +++ b/ports/xcb-render-util/portfile.cmake @@ -0,0 +1,76 @@ +# Common Ambient Variables: +# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} +# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} +# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} +# CURRENT_INSTALLED_DIR = ${VCPKG_ROOT_DIR}\installed\${TRIPLET} +# DOWNLOADS = ${VCPKG_ROOT_DIR}\downloads +# PORT = current port name (zlib, etc) +# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) +# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) +# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) +# VCPKG_ROOT_DIR = +# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) +# VCPKG_TOOLCHAIN = ON OFF +# TRIPLET_SYSTEM_ARCH = arm x86 x64 +# BUILD_ARCH = "Win32" "x64" "ARM" +# MSBUILD_PLATFORM = "Win32"/"x64"/${TRIPLET_SYSTEM_ARCH} +# DEBUG_CONFIG = "Debug Static" "Debug Dll" +# RELEASE_CONFIG = "Release Static"" "Release DLL" +# VCPKG_TARGET_IS_WINDOWS +# VCPKG_TARGET_IS_UWP +# VCPKG_TARGET_IS_LINUX +# VCPKG_TARGET_IS_OSX +# VCPKG_TARGET_IS_FREEBSD +# VCPKG_TARGET_IS_ANDROID +# VCPKG_TARGET_IS_MINGW +# VCPKG_TARGET_EXECUTABLE_SUFFIX +# VCPKG_TARGET_STATIC_LIBRARY_SUFFIX +# VCPKG_TARGET_SHARED_LIBRARY_SUFFIX +# +# See additional helpful variables in /docs/maintainers/vcpkg_common_definitions.md + +# # Specifies if the port install should fail immediately given a condition +# vcpkg_fail_port_install(MESSAGE "Xlib currently only supports Linux and Mac platforms" ON_TARGET "Windows") +vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Linux and Mac platforms" ON_TARGET "Windows") +## requires AUTOCONF, LIBTOOL and PKCONF +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxcb-render-util + REF 0317caf63de532fd7a0493ed6afa871a67253747 #v 0.3.9 + SHA512 9a16c3eb3575586fce85a548cb5fd8b23aa8e42363b2c6d4e074e45f5c04089301ef2ff3012cf9cc94490359d4e28ff062feaecb97a880c9240bf7dbe5d03612 + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) +file(TOUCH ${SOURCE_PATH}/m4/dummy) +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL ${SHELL_PATH} + #OPTIONS + #OPTIONS_DEBUG + #OPTIONS_RELEASE + PKG_CONFIG_PATHS "${CURRENT_INSTALLED_DIR}/share/xorg/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Handle copyright +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +#file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/") +#file(TOUCH "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") #already installed by xproto + + From eaaef67b8883deccca7ddf5f25258445e902a169 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 30 Jan 2020 22:37:42 +0100 Subject: [PATCH 256/419] fix config paths --- ports/xcb-image/portfile.cmake | 2 +- ports/xcb-keysyms/portfile.cmake | 2 +- ports/xcb-proto/portfile.cmake | 5 ++++- ports/xcb/portfile.cmake | 8 ++++---- ports/xtrans/portfile.cmake | 2 +- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ports/xcb-image/portfile.cmake b/ports/xcb-image/portfile.cmake index a77c73995c7274..e5d3cec85c3184 100644 --- a/ports/xcb-image/portfile.cmake +++ b/ports/xcb-image/portfile.cmake @@ -56,7 +56,7 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS "${CURRENT_INSTALLED_DIR}/share/xorg-macros/pkgconfig/" + PKG_CONFIG_PATHS "${CURRENT_INSTALLED_DIR}/share/xorg/pkgconfig/" PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" ) diff --git a/ports/xcb-keysyms/portfile.cmake b/ports/xcb-keysyms/portfile.cmake index 904fc322a549ba..d9e24a9589e054 100644 --- a/ports/xcb-keysyms/portfile.cmake +++ b/ports/xcb-keysyms/portfile.cmake @@ -56,7 +56,7 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS "${CURRENT_INSTALLED_DIR}/share/xorg-macros/pkgconfig/" + PKG_CONFIG_PATHS "${CURRENT_INSTALLED_DIR}/share/xorg/pkgconfig/" PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" ) diff --git a/ports/xcb-proto/portfile.cmake b/ports/xcb-proto/portfile.cmake index 12b3ce55cbc135..53ec82bda42a69 100644 --- a/ports/xcb-proto/portfile.cmake +++ b/ports/xcb-proto/portfile.cmake @@ -58,7 +58,7 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) -file(COPY "${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/xorg-macros.m4" DESTINATION "${SOURCE_PATH}/m4") +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} @@ -71,6 +71,9 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE + PKG_CONFIG_PATHS "${CURRENT_INSTALLED_DIR}/share/xorg/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" ) vcpkg_install_make() diff --git a/ports/xcb/portfile.cmake b/ports/xcb/portfile.cmake index 72ccf0374e3c12..92e704814256a5 100644 --- a/ports/xcb/portfile.cmake +++ b/ports/xcb/portfile.cmake @@ -31,7 +31,7 @@ # # Specifies if the port install should fail immediately given a condition # vcpkg_fail_port_install(MESSAGE "Xlib currently only supports Linux and Mac platforms" ON_TARGET "Windows") -vcpkg_fail_port_install(MESSAGE "Xlib currently only supports Linux and Mac platforms" ON_TARGET "Windows") +vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Linux and Mac platforms" ON_TARGET "Windows") ## requires AUTOCONF, LIBTOOL and PKCONF vcpkg_from_gitlab( @@ -44,10 +44,10 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) -file(COPY "${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/xorg-macros.m4" DESTINATION "${SOURCE_PATH}/m4") +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") #set(PKG_PATHS "$ENV{PKG_CONFIG_PATH}") -#set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${CURRENT_INSTALLED_DIR}/share/xorg-macros/pkgconfig/:${CURRENT_INSTALLED_DIR}/lib/pkgconfig/") +#set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${CURRENT_INSTALLED_DIR}/share/xorg/pkgconfig/:${CURRENT_INSTALLED_DIR}/lib/pkgconfig/") #Alternatively, you may set the environment variables XCBPROTO_CFLAGS #and XCBPROTO_LIBS to avoid the need to call pkg-config. #See the pkg-config man page for more details. @@ -67,7 +67,7 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS "${CURRENT_INSTALLED_DIR}/share/xorg-macros/pkgconfig/" + PKG_CONFIG_PATHS "${CURRENT_INSTALLED_DIR}/share/xorg/pkgconfig/" PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" ) diff --git a/ports/xtrans/portfile.cmake b/ports/xtrans/portfile.cmake index c3d6a1bda7da6d..f4f893bfe7f675 100644 --- a/ports/xtrans/portfile.cmake +++ b/ports/xtrans/portfile.cmake @@ -47,7 +47,7 @@ vcpkg_from_gitlab( #file(COPY "${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/xorg-macros.m4" DESTINATION "${SOURCE_PATH}") #set(PKG_PATHS "$ENV{PKG_CONFIG_PATH}") -#set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${CURRENT_INSTALLED_DIR}/share/xorg-macros/pkgconfig/:${CURRENT_INSTALLED_DIR}/lib/pkgconfig/") +#set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${CURRENT_INSTALLED_DIR}/share/xorg/pkgconfig/:${CURRENT_INSTALLED_DIR}/lib/pkgconfig/") #Alternatively, you may set the environment variables XCBPROTO_CFLAGS #and XCBPROTO_LIBS to avoid the need to call pkg-config. #See the pkg-config man page for more details. From 6baa1b3b0343fb9abd3de6f756a0cf862fe13c0d Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 30 Jan 2020 22:40:54 +0100 Subject: [PATCH 257/419] add xcb-util --- ports/xcb-util/CONTROL | 10 +++++ ports/xcb-util/portfile.cmake | 73 +++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+) create mode 100644 ports/xcb-util/CONTROL create mode 100644 ports/xcb-util/portfile.cmake diff --git a/ports/xcb-util/CONTROL b/ports/xcb-util/CONTROL new file mode 100644 index 00000000000000..2a164fd31eea15 --- /dev/null +++ b/ports/xcb-util/CONTROL @@ -0,0 +1,10 @@ +Source: xcb-util +Version: 0.4.0 +Homepage: https://xcb.freedesktop.org/ +Description: C interface to the X Window System protocol, which replaces the traditional Xlib interface. +Build-Depends: xorg-macros, xcb-util-m4 +Default-Features: + +Feature: no-feature +Description: just a dummy +Build-Depends: diff --git a/ports/xcb-util/portfile.cmake b/ports/xcb-util/portfile.cmake new file mode 100644 index 00000000000000..4d5b93b9761625 --- /dev/null +++ b/ports/xcb-util/portfile.cmake @@ -0,0 +1,73 @@ +# Common Ambient Variables: +# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} +# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} +# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} +# CURRENT_INSTALLED_DIR = ${VCPKG_ROOT_DIR}\installed\${TRIPLET} +# DOWNLOADS = ${VCPKG_ROOT_DIR}\downloads +# PORT = current port name (zlib, etc) +# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) +# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) +# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) +# VCPKG_ROOT_DIR = +# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) +# VCPKG_TOOLCHAIN = ON OFF +# TRIPLET_SYSTEM_ARCH = arm x86 x64 +# BUILD_ARCH = "Win32" "x64" "ARM" +# MSBUILD_PLATFORM = "Win32"/"x64"/${TRIPLET_SYSTEM_ARCH} +# DEBUG_CONFIG = "Debug Static" "Debug Dll" +# RELEASE_CONFIG = "Release Static"" "Release DLL" +# VCPKG_TARGET_IS_WINDOWS +# VCPKG_TARGET_IS_UWP +# VCPKG_TARGET_IS_LINUX +# VCPKG_TARGET_IS_OSX +# VCPKG_TARGET_IS_FREEBSD +# VCPKG_TARGET_IS_ANDROID +# VCPKG_TARGET_IS_MINGW +# VCPKG_TARGET_EXECUTABLE_SUFFIX +# VCPKG_TARGET_STATIC_LIBRARY_SUFFIX +# VCPKG_TARGET_SHARED_LIBRARY_SUFFIX +# +# See additional helpful variables in /docs/maintainers/vcpkg_common_definitions.md + +# # Specifies if the port install should fail immediately given a condition +# vcpkg_fail_port_install(MESSAGE "Xlib currently only supports Linux and Mac platforms" ON_TARGET "Windows") +vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Linux and Mac platforms" ON_TARGET "Windows") +## requires AUTOCONF, LIBTOOL and PKCONF +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxcb-util + REF acf790d7752f36e450d476ad79807d4012ec863b #v0.4.0 + SHA512 d1ef49c1e16b7643a7afeca1495a96ab9ab9c537ea7669a13b3adda400a204626714afc8ed7fcc3d7532ebe1f89a3aa31e3ca0ee9617330d4df5b65b0c8e6dbc + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) + +file(TOUCH "${SOURCE_PATH}/m4/dummy") +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL ${SHELL_PATH} + #OPTIONS + #OPTIONS_DEBUG + #OPTIONS_RELEASE + PKG_CONFIG_PATHS "${CURRENT_INSTALLED_DIR}/share/xorg/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + From 60fe2689fbee73433f619ce3695019ec84e73fdd Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 30 Jan 2020 23:00:17 +0100 Subject: [PATCH 258/419] add x11 feature to qt5-base --- ports/qt5-base/CONTROL | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL index 090d35799153b8..3301c95990881f 100644 --- a/ports/qt5-base/CONTROL +++ b/ports/qt5-base/CONTROL @@ -2,7 +2,11 @@ Source: qt5-base Version: 5.12.5-10 Homepage: https://www.qt.io/ Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components. -Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl, angle (!windows), egl-registry, icu (!uwp), fontconfig (!windows) +Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl, angle (!windows), egl-registry, icu (!uwp), fontconfig (!windows), qt5-base[x11] (linux) Feature: latest Description: Build latest qt version (5.13.1) instead of LTS + +Feature: x11 +Description: Build so that qt5-x11extras can be build +Build-Depends: xlib, xrender, xcb-image, xfixes, xext, xi \ No newline at end of file From d656486b331a0c552190bef474a9ad4160035629 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 30 Jan 2020 23:36:24 +0100 Subject: [PATCH 259/419] change build-depends for new feature --- ports/qt5-base/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL index 3301c95990881f..c0b336e3e22ee5 100644 --- a/ports/qt5-base/CONTROL +++ b/ports/qt5-base/CONTROL @@ -9,4 +9,4 @@ Description: Build latest qt version (5.13.1) instead of LTS Feature: x11 Description: Build so that qt5-x11extras can be build -Build-Depends: xlib, xrender, xcb-image, xfixes, xext, xi \ No newline at end of file +Build-Depends: xlib, xrender, xcb-image, xfixes, xext, xi, xcb, xcb-wm \ No newline at end of file From 34d4c9388e39d85f8fb86457f846c5ec489d995d Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 30 Jan 2020 23:36:33 +0100 Subject: [PATCH 260/419] add xcb-wm --- ports/xcb-wm/CONTROL | 5 +++ ports/xcb-wm/portfile.cmake | 74 +++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+) create mode 100644 ports/xcb-wm/CONTROL create mode 100644 ports/xcb-wm/portfile.cmake diff --git a/ports/xcb-wm/CONTROL b/ports/xcb-wm/CONTROL new file mode 100644 index 00000000000000..30cb284cb8e335 --- /dev/null +++ b/ports/xcb-wm/CONTROL @@ -0,0 +1,5 @@ +Source: xcb-wm +Version: 0.4.1 +Homepage: https://gitlab.freedesktop.org/xorg/lib/libxcb-wm/ +Description: XCB client and window-manager helpers for ICCCM & EWMH. +Build-Depends: xorg-macros, bzip2, xproto diff --git a/ports/xcb-wm/portfile.cmake b/ports/xcb-wm/portfile.cmake new file mode 100644 index 00000000000000..8b631d51c4d28c --- /dev/null +++ b/ports/xcb-wm/portfile.cmake @@ -0,0 +1,74 @@ +# Common Ambient Variables: +# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} +# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} +# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} +# CURRENT_INSTALLED_DIR = ${VCPKG_ROOT_DIR}\installed\${TRIPLET} +# DOWNLOADS = ${VCPKG_ROOT_DIR}\downloads +# PORT = current port name (zlib, etc) +# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) +# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) +# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) +# VCPKG_ROOT_DIR = +# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) +# VCPKG_TOOLCHAIN = ON OFF +# TRIPLET_SYSTEM_ARCH = arm x86 x64 +# BUILD_ARCH = "Win32" "x64" "ARM" +# MSBUILD_PLATFORM = "Win32"/"x64"/${TRIPLET_SYSTEM_ARCH} +# DEBUG_CONFIG = "Debug Static" "Debug Dll" +# RELEASE_CONFIG = "Release Static"" "Release DLL" +# VCPKG_TARGET_IS_WINDOWS +# VCPKG_TARGET_IS_UWP +# VCPKG_TARGET_IS_LINUX +# VCPKG_TARGET_IS_OSX +# VCPKG_TARGET_IS_FREEBSD +# VCPKG_TARGET_IS_ANDROID +# VCPKG_TARGET_IS_MINGW +# VCPKG_TARGET_EXECUTABLE_SUFFIX +# VCPKG_TARGET_STATIC_LIBRARY_SUFFIX +# VCPKG_TARGET_SHARED_LIBRARY_SUFFIX +# +# See additional helpful variables in /docs/maintainers/vcpkg_common_definitions.md + +# # Specifies if the port install should fail immediately given a condition +# vcpkg_fail_port_install(MESSAGE "Xlib currently only supports Linux and Mac platforms" ON_TARGET "Windows") +vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Linux and Mac platforms" ON_TARGET "Windows") +## requires AUTOCONF, LIBTOOL and PKCONF +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxcb-wm + REF 24eb17df2e1245885e72c9d4bbb0a0f69f0700f2 #v 0.4.1 + SHA512 6af514465eaa98d5417de352bd3e4f3880180f886dc1202c64496cb5a07c82c377afeb9396acf57e20caa73e858fe7e6309f3ed7a74e88eb58e1da1f31ac0bd8 + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) +file(TOUCH ${SOURCE_PATH}/m4/dummy) +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL ${SHELL_PATH} + #OPTIONS + #OPTIONS_DEBUG + #OPTIONS_RELEASE + PKG_CONFIG_PATHS "${CURRENT_INSTALLED_DIR}/share/xorg/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Handle copyright +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/") +file(TOUCH "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") #already installed by xproto + + From 3f3415b94d78bd652c9b2d9f470b8fa9f1672344 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 30 Jan 2020 23:37:49 +0100 Subject: [PATCH 261/419] add glib dependency on linux to avoid linking system library. --- ports/qt5-base/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL index c0b336e3e22ee5..0b71915531c09e 100644 --- a/ports/qt5-base/CONTROL +++ b/ports/qt5-base/CONTROL @@ -2,7 +2,7 @@ Source: qt5-base Version: 5.12.5-10 Homepage: https://www.qt.io/ Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components. -Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl, angle (!windows), egl-registry, icu (!uwp), fontconfig (!windows), qt5-base[x11] (linux) +Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl, angle (!windows), egl-registry, icu (!uwp), fontconfig (!windows), qt5-base[x11] (linux), glib (linux) Feature: latest Description: Build latest qt version (5.13.1) instead of LTS From bc5be94940fbcabfa68eb04c8269f55eb4571b1d Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 30 Jan 2020 23:59:48 +0100 Subject: [PATCH 262/419] add port ice --- ports/ice/CONTROL | 5 +++++ ports/ice/portfile.cmake | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 ports/ice/CONTROL create mode 100644 ports/ice/portfile.cmake diff --git a/ports/ice/CONTROL b/ports/ice/CONTROL new file mode 100644 index 00000000000000..f1642becff5d66 --- /dev/null +++ b/ports/ice/CONTROL @@ -0,0 +1,5 @@ +Source: ice +Version: 1.0.10 +Homepage: https://gitlab.freedesktop.org/xorg/lib/libice +Description: Inter-Client Exchange Library +Build-Depends: xorg-macros, bzip2 \ No newline at end of file diff --git a/ports/ice/portfile.cmake b/ports/ice/portfile.cmake new file mode 100644 index 00000000000000..affcbe6319a29b --- /dev/null +++ b/ports/ice/portfile.cmake @@ -0,0 +1,39 @@ +message(STATUS "----- ${PORT} requires autoconf, libtool and pkconf from the system package manager! -----") + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libice + REF 8e6a14c63d6b73cde87cb331439f2a4d19cba5b9 # 1.0.10 + SHA512 ad79cfbc3b1d51fb1f019bc088999ac8a64062a71667dbb4ffb62fe6d1b7dba7665944f64be6dcd27de08cc77e91512de97231db1e4ac018088727e90113d040 + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) + +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL "export ACLOCAL=\"aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/\"" + #OPTIONS + #OPTIONS_DEBUG + #OPTIONS_RELEASE + PKG_CONFIG_PATHS "${CURRENT_INSTALLED_DIR}/share/xorg/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + From 060634057cae5e244cec9d1cca0ad3d4e593dfa3 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 31 Jan 2020 00:00:06 +0100 Subject: [PATCH 263/419] add port sm --- ports/sm/CONTROL | 5 +++++ ports/sm/portfile.cmake | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 ports/sm/CONTROL create mode 100644 ports/sm/portfile.cmake diff --git a/ports/sm/CONTROL b/ports/sm/CONTROL new file mode 100644 index 00000000000000..84ec75f495b245 --- /dev/null +++ b/ports/sm/CONTROL @@ -0,0 +1,5 @@ +Source: sm +Version: 1.2.3 +Homepage: https://gitlab.freedesktop.org/xorg/lib/libsm +Description: X Session Management Library +Build-Depends: xorg-macros, bzip2, ice \ No newline at end of file diff --git a/ports/sm/portfile.cmake b/ports/sm/portfile.cmake new file mode 100644 index 00000000000000..c1b23c5d16d7c9 --- /dev/null +++ b/ports/sm/portfile.cmake @@ -0,0 +1,39 @@ +message(STATUS "----- ${PORT} requires autoconf, libtool and pkconf from the system package manager! -----") + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libsm + REF a52c79544fcd6b5e2242b9122dfaa34be07aebb2 # 1.2.3 + SHA512 379e450d90e61d80d4fea8449a582b3eee3968bef137022053cb3bd51fa2815d8fccc43ff11e3b593c4a67ad64e93209c25111a20ac88e38c1f663cd274f5d56 + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) + +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL "export ACLOCAL=\"aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/\"" + #OPTIONS + #OPTIONS_DEBUG + #OPTIONS_RELEASE + PKG_CONFIG_PATHS "${CURRENT_INSTALLED_DIR}/share/xorg/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + From dbf0b48576329c314f31fe37a0e7b933cbfef073 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 31 Jan 2020 00:00:25 +0100 Subject: [PATCH 264/419] add port xau --- ports/xau/CONTROL | 5 +++++ ports/xau/portfile.cmake | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 ports/xau/CONTROL create mode 100644 ports/xau/portfile.cmake diff --git a/ports/xau/CONTROL b/ports/xau/CONTROL new file mode 100644 index 00000000000000..9f5ead482f4976 --- /dev/null +++ b/ports/xau/CONTROL @@ -0,0 +1,5 @@ +Source: xau +Version: 1.0.9 +Homepage: https://gitlab.freedesktop.org/xorg/lib/libxau +Description: Functions for handling Xauthority files and entries. +Build-Depends: xorg-macros, bzip2 diff --git a/ports/xau/portfile.cmake b/ports/xau/portfile.cmake new file mode 100644 index 00000000000000..c38c6b4533dba2 --- /dev/null +++ b/ports/xau/portfile.cmake @@ -0,0 +1,39 @@ +message(STATUS "----- ${PORT} requires autoconf, libtool and pkconf from the system package manager! -----") + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxau + REF d9443b2c57b512cfb250b35707378654d86c7dea # 1.0.9 + SHA512 d46d2be838b8ea7116ee0e312adafa80f6551762b5f7b5e503bd40e74fc0b43b45255e8135d03f831d5c483b98aac992fcd91a7e22119261e76778571a72ef07 + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) + +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL "export ACLOCAL=\"aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/\"" + #OPTIONS + #OPTIONS_DEBUG + #OPTIONS_RELEASE + PKG_CONFIG_PATHS "${CURRENT_INSTALLED_DIR}/share/xorg/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + From 770e8467b5ee1bb6a03e9e6e49f535799b40c408 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 31 Jan 2020 00:06:25 +0100 Subject: [PATCH 265/419] add xt --- ports/xt/CONTROL | 5 +++++ ports/xt/portfile.cmake | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 ports/xt/CONTROL create mode 100644 ports/xt/portfile.cmake diff --git a/ports/xt/CONTROL b/ports/xt/CONTROL new file mode 100644 index 00000000000000..cd76e8a24b3403 --- /dev/null +++ b/ports/xt/CONTROL @@ -0,0 +1,5 @@ +Source: xt +Version: 1.2 +Homepage: https://gitlab.freedesktop.org/xorg/lib/libxt +Description: X Toolkit Intrinsics library +Build-Depends: xorg-macros, bzip2, sm, ice, x11, xproto \ No newline at end of file diff --git a/ports/xt/portfile.cmake b/ports/xt/portfile.cmake new file mode 100644 index 00000000000000..9ca44257aae27d --- /dev/null +++ b/ports/xt/portfile.cmake @@ -0,0 +1,39 @@ +message(STATUS "----- ${PORT} requires autoconf, libtool and pkconf from the system package manager! -----") + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxt + REF 93ffd50ccf04d02fc94565d8ee831c7b63d6d71a # 1.2 + SHA512 f96f611d0c1e53aef0c6e15407dbec1a79cb4820831f95ee1dba61a7ded54e46715925d3f4fdc910b5d23a05753e72b9d8067934cd68d990e84b6cdab2fbe40c + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) + +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL "export ACLOCAL=\"aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/\"" + #OPTIONS + #OPTIONS_DEBUG + #OPTIONS_RELEASE + PKG_CONFIG_PATHS "${CURRENT_INSTALLED_DIR}/share/xorg/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + From 0e9eba30f9a18fb7696d6783428b2cb1e6a6cc6a Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 31 Jan 2020 00:06:31 +0100 Subject: [PATCH 266/419] add xmu --- ports/xmu/CONTROL | 5 +++++ ports/xmu/portfile.cmake | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 ports/xmu/CONTROL create mode 100644 ports/xmu/portfile.cmake diff --git a/ports/xmu/CONTROL b/ports/xmu/CONTROL new file mode 100644 index 00000000000000..878385977f30f1 --- /dev/null +++ b/ports/xmu/CONTROL @@ -0,0 +1,5 @@ +Source: xmu +Version: 1.1.3 +Homepage: https://gitlab.freedesktop.org/xorg/lib/libxau +Description: X miscellaneous utility routines library +Build-Depends: xorg-macros, bzip2, xt \ No newline at end of file diff --git a/ports/xmu/portfile.cmake b/ports/xmu/portfile.cmake new file mode 100644 index 00000000000000..23199ca8d25fec --- /dev/null +++ b/ports/xmu/portfile.cmake @@ -0,0 +1,39 @@ +message(STATUS "----- ${PORT} requires autoconf, libtool and pkconf from the system package manager! -----") + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxmu + REF e9efe2d027b4c46cf6834cc532222f8ad1d1d3c3 # 1.1.3 + SHA512 9d3ab7534afbb3d220ce846ecfc209536def28e707e68f393673bda6f92054e7a14212ae2400092afdc06bbb61d8315d460feaf5b551dc447390d6d952a5aa1f + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) + +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL "export ACLOCAL=\"aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/\"" + #OPTIONS + #OPTIONS_DEBUG + #OPTIONS_RELEASE + PKG_CONFIG_PATHS "${CURRENT_INSTALLED_DIR}/share/xorg/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + From 6e46951497cf5e9492af75466cf765fd013c0828 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 31 Jan 2020 00:06:45 +0100 Subject: [PATCH 267/419] add xdmcp --- ports/xdmcp/CONTROL | 5 +++++ ports/xdmcp/portfile.cmake | 39 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 ports/xdmcp/CONTROL create mode 100644 ports/xdmcp/portfile.cmake diff --git a/ports/xdmcp/CONTROL b/ports/xdmcp/CONTROL new file mode 100644 index 00000000000000..890ad1a37502f5 --- /dev/null +++ b/ports/xdmcp/CONTROL @@ -0,0 +1,5 @@ +Source: xdmcp +Version: 1.1.3 +Homepage: https://gitlab.freedesktop.org/xorg/lib/libxdmcp +Description: X Display Manager Control Protocol library +Build-Depends: xorg-macros, bzip2 \ No newline at end of file diff --git a/ports/xdmcp/portfile.cmake b/ports/xdmcp/portfile.cmake new file mode 100644 index 00000000000000..22b3bd3a6899ca --- /dev/null +++ b/ports/xdmcp/portfile.cmake @@ -0,0 +1,39 @@ +message(STATUS "----- ${PORT} requires autoconf, libtool and pkconf from the system package manager! -----") + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxdmcp + REF 618b3ba5f826d930df2ca6a6a0ce212fa75cef42 # 1.1.3 + SHA512 f8b035fa95f6948cc6bac69bfcc33498cd65db73c62aadee714bce371d61c50f283c45d1a3f43397a96b3c956b41dfe94355e94e33764760b29bf98ba8dfebe2 + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) + +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL "export ACLOCAL=\"aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/\"" + #OPTIONS + #OPTIONS_DEBUG + #OPTIONS_RELEASE + PKG_CONFIG_PATHS "${CURRENT_INSTALLED_DIR}/share/xorg/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + From 66fae954d31fe460408268cd289fee572f2ea4f7 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 31 Jan 2020 00:38:39 +0100 Subject: [PATCH 268/419] add glib to xt --- ports/xt/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/xt/CONTROL b/ports/xt/CONTROL index cd76e8a24b3403..a5f84137b5a7b0 100644 --- a/ports/xt/CONTROL +++ b/ports/xt/CONTROL @@ -2,4 +2,4 @@ Source: xt Version: 1.2 Homepage: https://gitlab.freedesktop.org/xorg/lib/libxt Description: X Toolkit Intrinsics library -Build-Depends: xorg-macros, bzip2, sm, ice, x11, xproto \ No newline at end of file +Build-Depends: xorg-macros, bzip2, sm, ice, x11, xproto, glib \ No newline at end of file From aed6db0c92f2de2e67be06362bc3414e90f9a2af Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 31 Jan 2020 00:39:27 +0100 Subject: [PATCH 269/419] make vcpkg_configure_meason usable on linux --- scripts/cmake/vcpkg_configure_meson.cmake | 55 +++++++++++++---------- 1 file changed, 31 insertions(+), 24 deletions(-) diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index 6dfb266cfb0523..7fdf34651437a2 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -5,28 +5,39 @@ function(vcpkg_configure_meson) file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) # use the same compiler options as in vcpkg_configure_cmake - set(MESON_COMMON_CFLAGS "${MESON_COMMON_CFLAGS} /DWIN32 /D_WINDOWS /W3 /utf-8") - set(MESON_COMMON_CXXFLAGS "${MESON_COMMON_CXXFLAGS} /DWIN32 /D_WINDOWS /W3 /utf-8 /GR /EHsc") - - if(DEFINED VCPKG_CRT_LINKAGE AND VCPKG_CRT_LINKAGE STREQUAL dynamic) - set(MESON_DEBUG_CFLAGS "${MESON_DEBUG_CFLAGS} /D_DEBUG /MDd /Z7 /Ob0 /Od /RTC1") - set(MESON_DEBUG_CXXFLAGS "${MESON_DEBUG_CXXFLAGS} /D_DEBUG /MDd /Z7 /Ob0 /Od /RTC1") - - set(MESON_RELEASE_CFLAGS "${MESON_RELEASE_CFLAGS} /MD /O2 /Gy /DNDEBUG /Z7") - set(MESON_RELEASE_CXXFLAGS "${MESON_RELEASE_CXXFLAGS} /MD /O2 /Gy /DNDEBUG /Z7") - elseif(DEFINED VCPKG_CRT_LINKAGE AND VCPKG_CRT_LINKAGE STREQUAL static) - set(MESON_DEBUG_CFLAGS "${MESON_DEBUG_CFLAGS} /D_DEBUG /MTd /Z7 /Ob0 /Od /RTC1") - set(MESON_DEBUG_CXXFLAGS "${MESON_DEBUG_CXXFLAGS} /D_DEBUG /MTd /Z7 /Ob0 /Od /RTC1") - - set(MESON_RELEASE_CFLAGS "${MESON_RELEASE_CFLAGS} /MT /O2 /Gy /DNDEBUG /Z7") - set(MESON_RELEASE_CXXFLAGS "${MESON_RELEASE_CXXFLAGS} /MT /O2 /Gy /DNDEBUG /Z7") + if(NOT VCPKG_CHAINLOAD_TOOLCHAIN_FILE) + if(NOT DEFINED VCPKG_CMAKE_SYSTEM_NAME OR _TARGETTING_UWP) + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/windows.cmake") + elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/linux.cmake") + elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Android") + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/android.cmake") + elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/osx.cmake") + elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/freebsd.cmake") + elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "MinGW") + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/mingw.cmake") + endif() endif() + include("${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}") + + set(MESON_COMMON_CFLAGS "${MESON_COMMON_CFLAGS} ${CMAKE_C_FLAGS}") + set(MESON_COMMON_CXXFLAGS "${MESON_COMMON_CXXFLAGS} ${CMAKE_CXX_FLAGS}") + + set(MESON_DEBUG_CFLAGS "${MESON_DEBUG_CFLAGS} ${CMAKE_C_FLAGS_DEBUG}") + set(MESON_DEBUG_CXXFLAGS "${MESON_DEBUG_CXXFLAGS} ${CMAKE_CXX_FLAGS_DEBUG}") + + set(MESON_RELEASE_CFLAGS "${MESON_RELEASE_CFLAGS} ${CMAKE_C_FLAGS_RELEASE}") + set(MESON_RELEASE_CXXFLAGS "${MESON_RELEASE_CXXFLAGS} ${CMAKE_CXX_FLAGS_RELEASE}") - set(MESON_COMMON_LDFLAGS "${MESON_COMMON_LDFLAGS} /DEBUG") - set(MESON_RELEASE_LDFLAGS "${MESON_RELEASE_LDFLAGS} /INCREMENTAL:NO /OPT:REF /OPT:ICF") + if(VCPKG_TARGET_IS_WINDOWS) + set(MESON_COMMON_LDFLAGS "${MESON_COMMON_LDFLAGS} /DEBUG") + set(MESON_RELEASE_LDFLAGS "${MESON_RELEASE_LDFLAGS} /INCREMENTAL:NO /OPT:REF /OPT:ICF") + endif() # select meson cmd-line options - list(APPEND _vcm_OPTIONS -Dcmake_prefix_path=${CURRENT_INSTALLED_DIR}) + #list(APPEND _vcm_OPTIONS -Dcmake_prefix_path=${CURRENT_INSTALLED_DIR}) list(APPEND _vcm_OPTIONS --buildtype plain --backend ninja --wrap-mode nodownload) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) list(APPEND _vcm_OPTIONS --default-library shared) @@ -40,13 +51,9 @@ function(vcpkg_configure_meson) vcpkg_find_acquire_program(MESON) vcpkg_find_acquire_program(NINJA) get_filename_component(NINJA_PATH ${NINJA} DIRECTORY) - if(CMAKE_HOST_WIN32) - set(_PATHSEP ";") - else() - set(_PATHSEP ":") - endif() - set(ENV{PATH} "$ENV{PATH}${_PATHSEP}${NINJA_PATH}") + vcpkg_add_to_path("${NINJA_PATH}") + # configure release if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") message(STATUS "Configuring ${TARGET_TRIPLET}-rel") From a15aa709eb435c3a23381cc5554428105c5b74fe Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 31 Jan 2020 00:39:36 +0100 Subject: [PATCH 270/419] add xkbcommon --- ports/xkbcommon/CONTROL | 5 +++++ ports/xkbcommon/portfile.cmake | 25 +++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 ports/xkbcommon/CONTROL create mode 100644 ports/xkbcommon/portfile.cmake diff --git a/ports/xkbcommon/CONTROL b/ports/xkbcommon/CONTROL new file mode 100644 index 00000000000000..b5e89046e3ddf8 --- /dev/null +++ b/ports/xkbcommon/CONTROL @@ -0,0 +1,5 @@ +Source: xkbcommon +Version: 0.10.0 +Homepage: https://xkbcommon.org/ +Description: keymap handling library for toolkits and window systems +Build-Depends: xcb \ No newline at end of file diff --git a/ports/xkbcommon/portfile.cmake b/ports/xkbcommon/portfile.cmake new file mode 100644 index 00000000000000..55ee15f568b20c --- /dev/null +++ b/ports/xkbcommon/portfile.cmake @@ -0,0 +1,25 @@ +# Get source code: +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO xkbcommon/libxkbcommon + REF e3c3420a7146f4ea6225d6fb417baa05a79c8202 # v 0.10.0 + SHA512 58f6cce838084757e052d2c2bbf989409c950ab30d373eaf5fa782ab0ead85cf2b85e006aaa194306800d004d0bc96564667dc332c9762d203e1657bdc663336 + HEAD_REF master +) + +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -Denable-wayland=false + -Denable-docs=false +) +vcpkg_install_meson() +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + From 9111610ab4ad4e4aa6599d5e5fbcc9e76e1c9172 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 31 Jan 2020 00:40:03 +0100 Subject: [PATCH 271/419] ws change to trigger ci --- ports/libepoxy/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/libepoxy/portfile.cmake b/ports/libepoxy/portfile.cmake index 50f3fa55fdc484..222247dd37ab0d 100644 --- a/ports/libepoxy/portfile.cmake +++ b/ports/libepoxy/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_from_github( SHA512 e831f4f918f08fd5f799501efc0e23b8d404478651634f5e7b35f8ebcc29d91abc447ab20da062dde5be75e18cb39ffea708688e6534f7ab257b949f9c53ddc8 HEAD_REF master) - + if (VCPKG_TARGET_IS_WINDOWS) vcpkg_configure_meson(SOURCE_PATH ${SOURCE_PATH} OPTIONS From b4a95ad28114e03cc990d17cf356da039224a1cb Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 31 Jan 2020 00:40:19 +0100 Subject: [PATCH 272/419] ws change to trigger ci --- ports/fribidi/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/fribidi/portfile.cmake b/ports/fribidi/portfile.cmake index 843964500fe19a..5c36c10780bdfa 100644 --- a/ports/fribidi/portfile.cmake +++ b/ports/fribidi/portfile.cmake @@ -14,8 +14,8 @@ vcpkg_configure_meson( OPTIONS -Ddocs=false --backend=ninja -) - +) + vcpkg_install_meson() vcpkg_copy_pdbs() From d89a3baf2fb81d70eb853b5fb485fef66771b214 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 31 Jan 2020 00:43:49 +0100 Subject: [PATCH 273/419] update qt5 control --- ports/qt5-base/CONTROL | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL index 0b71915531c09e..21cb85629fe613 100644 --- a/ports/qt5-base/CONTROL +++ b/ports/qt5-base/CONTROL @@ -2,11 +2,11 @@ Source: qt5-base Version: 5.12.5-10 Homepage: https://www.qt.io/ Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components. -Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl, angle (!windows), egl-registry, icu (!uwp), fontconfig (!windows), qt5-base[x11] (linux), glib (linux) +Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl, angle (!windows), egl-registry, icu (!uwp), fontconfig (!windows), qt5-base[x11] (linux), glib (linux), pthread (!windows) Feature: latest Description: Build latest qt version (5.13.1) instead of LTS Feature: x11 Description: Build so that qt5-x11extras can be build -Build-Depends: xlib, xrender, xcb-image, xfixes, xext, xi, xcb, xcb-wm \ No newline at end of file +Build-Depends: xlib, xrender, xcb-image, xfixes, xext, xi, xcb, xcb-wm, xkbcommon, sm, ice \ No newline at end of file From aaddd29e44454e58e9314cf2a1673ea58996eca2 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 31 Jan 2020 00:57:39 +0100 Subject: [PATCH 274/419] remove glu requirement and add pthread as private library for glib --- ports/qt5-base/portfile.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 39cbad8d86a340..5347e040d29ede 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -191,10 +191,10 @@ if(VCPKG_TARGET_IS_WINDOWS) "OPENSSL_LIBS=${SSL_DEBUG} ${EAY_DEBUG} ws2_32.lib secur32.lib advapi32.lib shell32.lib crypt32.lib user32.lib gdi32.lib" ) elseif(VCPKG_TARGET_IS_LINUX) - list(APPEND CORE_OPTIONS -fontconfig) - if (NOT EXISTS "/usr/include/GL/glu.h") - message(FATAL_ERROR "qt5 requires libgl1-mesa-dev and libglu1-mesa-dev, please use your distribution's package manager to install them.\nExample: \"apt-get install libgl1-mesa-dev libglu1-mesa-dev\"") - endif() + list(APPEND CORE_OPTIONS -fontconfig -glib "QMAKE_LIBS_PRIVATE+=-lpthread") + #if (NOT EXISTS "/usr/include/GL/glu.h") + # message(FATAL_ERROR "qt5 requires libgl1-mesa-dev and libglu1-mesa-dev, please use your distribution's package manager to install them.\nExample: \"apt-get install libgl1-mesa-dev libglu1-mesa-dev\"") + #endif() list(APPEND RELEASE_OPTIONS "PSQL_LIBS=${PSQL_RELEASE} ${SSL_RELEASE} ${EAY_RELEASE} -ldl -lpthread" "SQLITE_LIBS=${SQLITE_RELEASE} -ldl -lpthread" From dde4fb7642c03283e25ac53aca20c479b49b42c3 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 31 Jan 2020 09:21:17 +0100 Subject: [PATCH 275/419] update dependencies --- ports/xcb-image/CONTROL | 3 ++- ports/xcb-render-util/CONTROL | 2 +- ports/xcb/CONTROL | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ports/xcb-image/CONTROL b/ports/xcb-image/CONTROL index f76cac8174d53a..836b749f5e94da 100644 --- a/ports/xcb-image/CONTROL +++ b/ports/xcb-image/CONTROL @@ -2,4 +2,5 @@ Source: xcb-image Version: 0.4.0 Homepage: https://xcb.freedesktop.org/ Description: XCB port of Xlib's XImage and XShmImage functions. -Build-Depends: xorg-macros, bzip2, xproto +Build-Depends: xorg-macros, bzip2, xproto, xcb-util-m4 + diff --git a/ports/xcb-render-util/CONTROL b/ports/xcb-render-util/CONTROL index 660febd5a81f6d..beb25b69a36aeb 100644 --- a/ports/xcb-render-util/CONTROL +++ b/ports/xcb-render-util/CONTROL @@ -2,4 +2,4 @@ Source: xcb-render-util Version: 0.3.9 Homepage: https://xcb.freedesktop.org/ Description: XCB convenience functions for the Render extension. -Build-Depends: xorg-macros, bzip2, xproto +Build-Depends: xorg-macros, bzip2, xproto, xcb-util-m4 diff --git a/ports/xcb/CONTROL b/ports/xcb/CONTROL index 0779c9a10c0afc..c549f27c7cf3fb 100644 --- a/ports/xcb/CONTROL +++ b/ports/xcb/CONTROL @@ -2,7 +2,7 @@ Source: xcb Version: 1.13.1 Homepage: https://xcb.freedesktop.org/ Description: C interface to the X Window System protocol, which replaces the traditional Xlib interface. -Build-Depends: xcb-proto +Build-Depends: xcb-proto, xcb-util-m4 Default-Features: Feature: no-feature From 9585a132ab557c864a3d43fd7fe29685530dda5c Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 31 Jan 2020 09:42:02 +0100 Subject: [PATCH 276/419] fix build deps --- ports/xcb/CONTROL | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/ports/xcb/CONTROL b/ports/xcb/CONTROL index c549f27c7cf3fb..e2b57b8fee5437 100644 --- a/ports/xcb/CONTROL +++ b/ports/xcb/CONTROL @@ -2,9 +2,4 @@ Source: xcb Version: 1.13.1 Homepage: https://xcb.freedesktop.org/ Description: C interface to the X Window System protocol, which replaces the traditional Xlib interface. -Build-Depends: xcb-proto, xcb-util-m4 -Default-Features: - -Feature: no-feature -Description: just a dummy -Build-Depends: +Build-Depends: xcb-proto, xcb-util-m4, xorg-macros, xproto, xlib, bzip2 From d82e1c63c81dbf97a2abca99b813f45d630059b2 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 31 Jan 2020 10:08:50 +0100 Subject: [PATCH 277/419] add pthread-stubs --- ports/pthread-stubs/CONTROL | 5 ++++ ports/pthread-stubs/portfile.cmake | 40 ++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 ports/pthread-stubs/CONTROL create mode 100644 ports/pthread-stubs/portfile.cmake diff --git a/ports/pthread-stubs/CONTROL b/ports/pthread-stubs/CONTROL new file mode 100644 index 00000000000000..10c2622e12d4c8 --- /dev/null +++ b/ports/pthread-stubs/CONTROL @@ -0,0 +1,5 @@ +Source: pthread-stubs +Version: 0.4 +Homepage: https://gitlab.freedesktop.org/xorg/lib/pthread-stubs +Description: Stub replacements for POSIX Threads functions. +Build-Depends: diff --git a/ports/pthread-stubs/portfile.cmake b/ports/pthread-stubs/portfile.cmake new file mode 100644 index 00000000000000..d3e40c110b3661 --- /dev/null +++ b/ports/pthread-stubs/portfile.cmake @@ -0,0 +1,40 @@ +message(STATUS "----- ${PORT} requires autoconf, libtool and pkconf from the system package manager! -----") + +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/pthread-stubs + REF 50f0755a7f894acae168f19c66e52a3f139ca4ec # 0.4.0 + SHA512 15fcb2144a8abb7b9b1b8f6d9732759351268fb440c7a59380b0ca6ddf48b74a37ce5afbf777ce58fc1993df0c8d6ffb82e452800ce2fcaf16edcbcc1750e338 + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) + +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL "export ACLOCAL=\"aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/\"" + #OPTIONS + #OPTIONS_DEBUG + #OPTIONS_RELEASE + PKG_CONFIG_PATHS "${CURRENT_INSTALLED_DIR}/share/xorg/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + From 7a48527a61c64106c3c2a8817b54106b5a965cac Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 31 Jan 2020 10:09:02 +0100 Subject: [PATCH 278/419] fix dependencies --- ports/xcb/CONTROL | 2 +- ports/xlib/CONTROL | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/xcb/CONTROL b/ports/xcb/CONTROL index e2b57b8fee5437..521f9f6541a09b 100644 --- a/ports/xcb/CONTROL +++ b/ports/xcb/CONTROL @@ -2,4 +2,4 @@ Source: xcb Version: 1.13.1 Homepage: https://xcb.freedesktop.org/ Description: C interface to the X Window System protocol, which replaces the traditional Xlib interface. -Build-Depends: xcb-proto, xcb-util-m4, xorg-macros, xproto, xlib, bzip2 +Build-Depends: xcb-proto, xcb-util-m4, xorg-macros, xproto, bzip2, xau, pthread-stubs diff --git a/ports/xlib/CONTROL b/ports/xlib/CONTROL index c57ee494775dc2..ac06d041426f6e 100644 --- a/ports/xlib/CONTROL +++ b/ports/xlib/CONTROL @@ -2,7 +2,7 @@ Source: xlib Version: 11-1.6.9 Homepage: https://www.x.org/wiki/ Description: The X Window System is a network-transparent window system that was designed at MIT. -Build-Depends: bzip2, xtrans +Build-Depends: bzip2, xtrans, xcb, xproto Default-Features: Feature: no-feature From 59e22a9276a7afa44e9121332500167a9925fc19 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 31 Jan 2020 10:09:23 +0100 Subject: [PATCH 279/419] fix libxml2 lint error --- ports/libxml2/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/libxml2/CMakeLists.txt b/ports/libxml2/CMakeLists.txt index a9f1780f568dbb..6a1cd9b18953dd 100644 --- a/ports/libxml2/CMakeLists.txt +++ b/ports/libxml2/CMakeLists.txt @@ -156,7 +156,7 @@ install(TARGETS libxml2 option(BUILD_XMLLINT "Build XML lint tool" OFF) if(BUILD_XMLLINT) add_executable(xmllint xmllint.c) - target_link_libraries(xmllint PRIVATE libxml2) + target_link_libraries(xmllint PRIVATE libxml2 unofficial::iconv::libcharset unofficial::iconv::libiconv) target_include_directories(xmllint PRIVATE "include" "${CMAKE_CURRENT_BINARY_DIR}/include" "${CMAKE_CURRENT_BINARY_DIR}") install(TARGETS xmllint RUNTIME DESTINATION tools/libxml2 From 2c7fec4d485188387c91846116d3a01c97c0f413 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 31 Jan 2020 10:24:59 +0100 Subject: [PATCH 280/419] fix deps. --- ports/xcb-image/CONTROL | 2 +- ports/xproto/CONTROL | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/xcb-image/CONTROL b/ports/xcb-image/CONTROL index 836b749f5e94da..8fd5c0420a09d2 100644 --- a/ports/xcb-image/CONTROL +++ b/ports/xcb-image/CONTROL @@ -2,5 +2,5 @@ Source: xcb-image Version: 0.4.0 Homepage: https://xcb.freedesktop.org/ Description: XCB port of Xlib's XImage and XShmImage functions. -Build-Depends: xorg-macros, bzip2, xproto, xcb-util-m4 +Build-Depends: xcb diff --git a/ports/xproto/CONTROL b/ports/xproto/CONTROL index 0fd712e49a540b..2bf022e856d88f 100644 --- a/ports/xproto/CONTROL +++ b/ports/xproto/CONTROL @@ -2,3 +2,4 @@ Source: xproto Version: 2019.2 Homepage: https://gitlab.freedesktop.org/xorg/proto/xorgproto Description: X Window System unified protocol definitions +Build-Depends: xorg-macros From a5d316c93778c87ddf8d62c2c71764626e14a8dd Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 31 Jan 2020 10:41:28 +0100 Subject: [PATCH 281/419] fix deps --- ports/xcb-image/CONTROL | 2 +- ports/xcb/CONTROL | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/xcb-image/CONTROL b/ports/xcb-image/CONTROL index 8fd5c0420a09d2..bc167762eb201f 100644 --- a/ports/xcb-image/CONTROL +++ b/ports/xcb-image/CONTROL @@ -2,5 +2,5 @@ Source: xcb-image Version: 0.4.0 Homepage: https://xcb.freedesktop.org/ Description: XCB port of Xlib's XImage and XShmImage functions. -Build-Depends: xcb +Build-Depends: xcb, xcb-util diff --git a/ports/xcb/CONTROL b/ports/xcb/CONTROL index 521f9f6541a09b..02e17a8304f75c 100644 --- a/ports/xcb/CONTROL +++ b/ports/xcb/CONTROL @@ -2,4 +2,4 @@ Source: xcb Version: 1.13.1 Homepage: https://xcb.freedesktop.org/ Description: C interface to the X Window System protocol, which replaces the traditional Xlib interface. -Build-Depends: xcb-proto, xcb-util-m4, xorg-macros, xproto, bzip2, xau, pthread-stubs +Build-Depends: xcb-proto, xcb-util-m4, xorg-macros, xproto, bzip2, xau, pthread-stubs, xdmcp From 90b7ccd14321e4bf53f9c0ae23464507289b7c2e Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 31 Jan 2020 10:51:29 +0100 Subject: [PATCH 282/419] build only static or shared libs on linux --- scripts/cmake/vcpkg_configure_make.cmake | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index a789821ce12e28..1566ec3ba6ec8a 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -220,6 +220,11 @@ function(vcpkg_configure_make) ) else() set(base_cmd ./) + if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(_csc_OPTIONS ${_csc_OPTIONS} --enable-shared --disable-static) + else() + set(_csc_OPTIONS ${_csc_OPTIONS} --enable-static --disable-shared) + endif() set(rel_command ${base_cmd}configure "${_csc_OPTIONS}" "${_csc_OPTIONS_RELEASE}" ) @@ -283,13 +288,13 @@ function(vcpkg_configure_make) vcpkg_execute_required_process( COMMAND ${base_cmd} autoreconf -vfi WORKING_DIRECTORY ${_csc_SOURCE_PATH}/${_csc_PROJECT_SUBPATH} - LOGNAME prerun-${TAR_TRIPLET_DIR} + LOGNAME prerun-2-${TARGET_TRIPLET}-dbg ) else() vcpkg_execute_required_process( COMMAND autoreconf -vfi WORKING_DIRECTORY ${PRJ_DIR} - LOGNAME prerun-${TAR_TRIPLET_DIR} + LOGNAME prerun-2-${TARGET_TRIPLET}-dbg ) endif() endif() From 2494702bb89eb5cd42128a08b449a1b843801db7 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 31 Jan 2020 10:51:35 +0100 Subject: [PATCH 283/419] fix deps --- ports/xau/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/xau/CONTROL b/ports/xau/CONTROL index 9f5ead482f4976..4ca86e52208d93 100644 --- a/ports/xau/CONTROL +++ b/ports/xau/CONTROL @@ -2,4 +2,4 @@ Source: xau Version: 1.0.9 Homepage: https://gitlab.freedesktop.org/xorg/lib/libxau Description: Functions for handling Xauthority files and entries. -Build-Depends: xorg-macros, bzip2 +Build-Depends: xorg-macros, bzip2, xproto From c915a30c367475c44ed4f18000b3d995ada13936 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 31 Jan 2020 10:59:37 +0100 Subject: [PATCH 284/419] fix deps --- ports/ice/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/ice/CONTROL b/ports/ice/CONTROL index f1642becff5d66..c74503a646d5d6 100644 --- a/ports/ice/CONTROL +++ b/ports/ice/CONTROL @@ -2,4 +2,4 @@ Source: ice Version: 1.0.10 Homepage: https://gitlab.freedesktop.org/xorg/lib/libice Description: Inter-Client Exchange Library -Build-Depends: xorg-macros, bzip2 \ No newline at end of file +Build-Depends: xorg-macros, bzip2, xtrans \ No newline at end of file From cd971d779cf9a2146e4d4fafb54a6eedca7e1049 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 31 Jan 2020 11:13:12 +0100 Subject: [PATCH 285/419] fix deps --- ports/xkbcommon/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/xkbcommon/CONTROL b/ports/xkbcommon/CONTROL index b5e89046e3ddf8..f03bea46fb9de8 100644 --- a/ports/xkbcommon/CONTROL +++ b/ports/xkbcommon/CONTROL @@ -2,4 +2,4 @@ Source: xkbcommon Version: 0.10.0 Homepage: https://xkbcommon.org/ Description: keymap handling library for toolkits and window systems -Build-Depends: xcb \ No newline at end of file +Build-Depends: xcb, xlib, xcb-render-util \ No newline at end of file From ea18b39af4cc1619437ca610d14260a030e691f8 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 31 Jan 2020 11:47:19 +0100 Subject: [PATCH 286/419] improve PKG_CONFIG_PATHS --- scripts/cmake/vcpkg_configure_make.cmake | 13 +++++-- scripts/cmake/vcpkg_configure_meson.cmake | 42 ++++++++++++++++++++--- 2 files changed, 47 insertions(+), 8 deletions(-) diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index 1566ec3ba6ec8a..90e05d167bf458 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -307,7 +307,9 @@ function(vcpkg_configure_make) LOGNAME config-${TARGET_TRIPLET}-dbg ) endif() - set(ENV{PKG_CONFIG_PATH} "${BACKUP_ENV_PKG_CONFIG_PATH_DEBUG}") + if(_csc_PKG_CONFIG_PATHS_DEBUG) + set(ENV{PKG_CONFIG_PATH} "${BACKUP_ENV_PKG_CONFIG_PATH_DEBUG}") + endif() endif() # Configure release @@ -392,7 +394,9 @@ function(vcpkg_configure_make) ) endif() - set(ENV{PKG_CONFIG_PATH} "${BACKUP_ENV_PKG_CONFIG_PATH_RELEASE}") + if(_csc_PKG_CONFIG_PATHS_RELEASE) + set(ENV{PKG_CONFIG_PATH} "${BACKUP_ENV_PKG_CONFIG_PATH_RELEASE}") + endif() endif() # Restore envs @@ -401,7 +405,10 @@ function(vcpkg_configure_make) set(ENV{CXXFLAGS} "${CXX_FLAGS_GLOBAL}") set(ENV{LDFLAGS} "${LD_FLAGS_GLOBAL}") endif() - set(ENV{PKG_CONFIG_PATH} "${BACKUP_ENV_PKG_CONFIG_PATH}") + + if(_csc_PKG_CONFIG_PATHS) + set(ENV{PKG_CONFIG_PATH} "${BACKUP_ENV_PKG_CONFIG_PATH}") + endif() set(_VCPKG_MAKE_GENERATOR "${GENERATOR}" PARENT_SCOPE) diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index 7fdf34651437a2..cd453c4d697c98 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -1,5 +1,5 @@ function(vcpkg_configure_meson) - cmake_parse_arguments(_vcm "" "SOURCE_PATH" "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE" ${ARGN}) + cmake_parse_arguments(_vcm "" "SOURCE_PATH" "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE;PKG_CONFIG_PATHS;PKG_CONFIG_PATHS_DEBUG;PKG_CONFIG_PATHS_RELEASE" ${ARGN}) file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel) file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) @@ -22,6 +22,14 @@ function(vcpkg_configure_meson) endif() include("${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}") + if(_vcm_PKG_CONFIG_PATHS) + set(BACKUP_ENV_PKG_CONFIG_PATH $ENV{PKG_CONFIG_PATH}) + foreach(_path IN LISTS _vcm_PKG_CONFIG_PATHS) + file(TO_NATIVE_PATH "${_path}" _path) + set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}${VCPKG_HOST_PATH_SEPARATOR}${_path}") + endforeach() + endif() + set(MESON_COMMON_CFLAGS "${MESON_COMMON_CFLAGS} ${CMAKE_C_FLAGS}") set(MESON_COMMON_CXXFLAGS "${MESON_COMMON_CXXFLAGS} ${CMAKE_CXX_FLAGS}") @@ -38,15 +46,15 @@ function(vcpkg_configure_meson) # select meson cmd-line options #list(APPEND _vcm_OPTIONS -Dcmake_prefix_path=${CURRENT_INSTALLED_DIR}) - list(APPEND _vcm_OPTIONS --buildtype plain --backend ninja --wrap-mode nodownload) + list(APPEND _vcm_OPTIONS --buildtype plain --backend ninja --wrap-mode nodownload --errorlogs) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) list(APPEND _vcm_OPTIONS --default-library shared) else() list(APPEND _vcm_OPTIONS --default-library static) endif() - list(APPEND _vcm_OPTIONS_DEBUG --prefix ${CURRENT_PACKAGES_DIR}/debug --includedir ../include) - list(APPEND _vcm_OPTIONS_RELEASE --prefix ${CURRENT_PACKAGES_DIR}) + list(APPEND _vcm_OPTIONS_DEBUG --prefix ${CURRENT_PACKAGES_DIR}/debug --includedir ../include --libdir lib) + list(APPEND _vcm_OPTIONS_RELEASE --prefix ${CURRENT_PACKAGES_DIR} --libdir lib) vcpkg_find_acquire_program(MESON) vcpkg_find_acquire_program(NINJA) @@ -57,6 +65,14 @@ function(vcpkg_configure_meson) # configure release if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") message(STATUS "Configuring ${TARGET_TRIPLET}-rel") + if(_vcm_PKG_CONFIG_PATHS_RELEASE) + set(BACKUP_ENV_PKG_CONFIG_PATH_RELEASE $ENV{PKG_CONFIG_PATH}) + foreach(_path IN LISTS _vcm_PKG_CONFIG_PATHS_RELEASE) + file(TO_NATIVE_PATH "${_path}" _path) + set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}${VCPKG_HOST_PATH_SEPARATOR}${_path}") + endforeach() + endif() + file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel) set(ENV{CFLAGS} "${MESON_COMMON_CFLAGS} ${MESON_RELEASE_CFLAGS}") set(ENV{CXXFLAGS} "${MESON_COMMON_CXXFLAGS} ${MESON_RELEASE_CXXFLAGS}") @@ -68,11 +84,22 @@ function(vcpkg_configure_meson) LOGNAME config-${TARGET_TRIPLET}-rel ) message(STATUS "Configuring ${TARGET_TRIPLET}-rel done") + if(_vcm_PKG_CONFIG_PATHS_RELEASE) + set(ENV{PKG_CONFIG_PATH} "${BACKUP_ENV_PKG_CONFIG_PATH_RELEASE}") + endif() endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") # configure debug message(STATUS "Configuring ${TARGET_TRIPLET}-dbg") + if(_vcm_PKG_CONFIG_PATHS_DEBUG) + set(BACKUP_ENV_PKG_CONFIG_PATH_DEBUG $ENV{PKG_CONFIG_PATH}) + foreach(_path IN LISTS _vcm_PKG_CONFIG_PATHS_DEBUG) + file(TO_NATIVE_PATH "${_path}" _path) + set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}${VCPKG_HOST_PATH_SEPARATOR}${_path}") + endforeach() + endif() + file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) set(ENV{CFLAGS} "${MESON_COMMON_CFLAGS} ${MESON_DEBUG_CFLAGS}") set(ENV{CXXFLAGS} "${MESON_COMMON_CXXFLAGS} ${MESON_DEBUG_CXXFLAGS}") @@ -84,6 +111,11 @@ function(vcpkg_configure_meson) LOGNAME config-${TARGET_TRIPLET}-dbg ) message(STATUS "Configuring ${TARGET_TRIPLET}-dbg done") + if(_vcm_PKG_CONFIG_PATHS_RELEASE) + set(ENV{PKG_CONFIG_PATH} "${BACKUP_ENV_PKG_CONFIG_PATH_RELEASE}") + endif() + endif() + if(_vcm_PKG_CONFIG_PATHS) + set(ENV{PKG_CONFIG_PATH} "${BACKUP_ENV_PKG_CONFIG_PATH}") endif() - endfunction() From a49801f70e7d375d1240a724d2e53d8d2ac879b2 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 31 Jan 2020 11:47:33 +0100 Subject: [PATCH 287/419] add those to xkbcommon --- ports/xkbcommon/portfile.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ports/xkbcommon/portfile.cmake b/ports/xkbcommon/portfile.cmake index 55ee15f568b20c..9f11f08266784d 100644 --- a/ports/xkbcommon/portfile.cmake +++ b/ports/xkbcommon/portfile.cmake @@ -12,6 +12,9 @@ vcpkg_configure_meson( OPTIONS -Denable-wayland=false -Denable-docs=false + PKG_CONFIG_PATHS "${CURRENT_INSTALLED_DIR}/share/xorg/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" ) vcpkg_install_meson() vcpkg_fixup_pkgconfig() From 77c848637bb7ced40a4faa96f3faa7d306b0699d Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 31 Jan 2020 12:30:54 +0100 Subject: [PATCH 288/419] fix wrong variable prefix --- scripts/cmake/vcpkg_fixup_pkgconfig.cmake | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/scripts/cmake/vcpkg_fixup_pkgconfig.cmake b/scripts/cmake/vcpkg_fixup_pkgconfig.cmake index 733516bb4ab4a2..52780db9412f7c 100644 --- a/scripts/cmake/vcpkg_fixup_pkgconfig.cmake +++ b/scripts/cmake/vcpkg_fixup_pkgconfig.cmake @@ -16,9 +16,9 @@ function(vcpkg_fixup_pkgconfig) list(FILTER _vfpkg_RELEASE_FILES EXCLUDE REGEX "${CURRENT_PACKAGES_DIR}/debug/") endif() - if(NOT _vfct_DEBUG_FILES) - file(GLOB_RECURSE _vfct_DEBUG_FILES "${CURRENT_PACKAGES_DIR}/debug/**/*.pc") - list(FILTER _vfct_DEBUG_FILES INCLUDE REGEX "${CURRENT_PACKAGES_DIR}/debug/") + if(NOT _vfpkg_DEBUG_FILES) + file(GLOB_RECURSE __vfpkg_DEBUG_FILES "${CURRENT_PACKAGES_DIR}/debug/**/*.pc") + list(FILTER _vfpkg_DEBUG_FILES INCLUDE REGEX "${CURRENT_PACKAGES_DIR}/debug/") endif() message(STATUS "Fixing pkgconfig - release") @@ -27,13 +27,12 @@ function(vcpkg_fixup_pkgconfig) file(READ "${_file}" _contents) string(REPLACE "${CURRENT_PACKAGES_DIR}" "\${prefix}" _contents "${_contents}") string(REPLACE "${CURRENT_INSTALLED_DIR}" "\${prefix}" _contents "${_contents}") - string(REGEX REPLACE "^prefix=\\\${prefix}" "prefix=${CURRENT_INSTALLED_DIR}" _contents "${_contents}") file(WRITE "${_file}" "${_contents}") endforeach() message(STATUS "Fixing pkgconfig - debug") - message(STATUS "Files: ${_vfct_DEBUG_FILES}") + message(STATUS "Files: ${_vfpkg_DEBUG_FILES}") foreach(_file ${_vfct_DEBUG_FILES}) file(READ "${_file}" _contents) string(REPLACE "${CURRENT_PACKAGES_DIR}" "\${prefix}" _contents "${_contents}") From 91cea04bf63f5d92688b6f2a65a2c63c152bacae Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 31 Jan 2020 13:20:40 +0100 Subject: [PATCH 289/419] fix xkbcommon build --- ports/xkbcommon/meson.build.patch | 15 +++++++++++++++ ports/xkbcommon/portfile.cmake | 7 +++++++ 2 files changed, 22 insertions(+) create mode 100644 ports/xkbcommon/meson.build.patch diff --git a/ports/xkbcommon/meson.build.patch b/ports/xkbcommon/meson.build.patch new file mode 100644 index 00000000000000..e14f19c5b9b550 --- /dev/null +++ b/ports/xkbcommon/meson.build.patch @@ -0,0 +1,15 @@ +diff --git a/meson.build b/meson.build +index ac706633e..9b1214bda 100644 +--- a/meson.build ++++ b/meson.build +@@ -230,8 +230,8 @@ pkgconfig.generate( + + # libxkbcommon-x11. + if get_option('enable-x11') +- xcb_dep = dependency('xcb', version: '>=1.10', required: false) +- xcb_xkb_dep = dependency('xcb-xkb', version: '>=1.10', required: false) ++ xcb_dep = dependency('xcb', version: '>=1.10', required: false, static: true) ++ xcb_xkb_dep = dependency('xcb-xkb', version: '>=1.10', required: false, static: true) + if not xcb_dep.found() or not xcb_xkb_dep.found() + error('''X11 support requires xcb-xkb >= 1.10 which was not found. + You can disable X11 support with -Denable-x11=false.''') diff --git a/ports/xkbcommon/portfile.cmake b/ports/xkbcommon/portfile.cmake index 9f11f08266784d..4244a18823c400 100644 --- a/ports/xkbcommon/portfile.cmake +++ b/ports/xkbcommon/portfile.cmake @@ -1,3 +1,9 @@ + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + set(PATCHES meson.build.patch) + # this patch is not 100% correct since xcb and xcb-xkb can be build dynamically in a custom triplet + # However, VCPKG currently is limited by the possibilities of meson and they have to fix their lib dependency detection +endif() # Get source code: vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -5,6 +11,7 @@ vcpkg_from_github( REF e3c3420a7146f4ea6225d6fb417baa05a79c8202 # v 0.10.0 SHA512 58f6cce838084757e052d2c2bbf989409c950ab30d373eaf5fa782ab0ead85cf2b85e006aaa194306800d004d0bc96564667dc332c9762d203e1657bdc663336 HEAD_REF master + PATCHES ${PATCHES} ) vcpkg_configure_meson( From 907b69e97f7be574e6fa2107e46c9a9cdb3f9ebb Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 31 Jan 2020 13:26:54 +0100 Subject: [PATCH 290/419] force rebuild of x ports --- ports/xorg-macros/CONTROL | 2 +- ports/xproto/CONTROL | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/xorg-macros/CONTROL b/ports/xorg-macros/CONTROL index 7bc4917d98bcfa..95bb0412cbaf27 100644 --- a/ports/xorg-macros/CONTROL +++ b/ports/xorg-macros/CONTROL @@ -1,4 +1,4 @@ -Source: xorg-macros +Source: xorg-macros Version: 1.19.2 Homepage: https://xcb.freedesktop.org/ Description: X.org macros utilities. diff --git a/ports/xproto/CONTROL b/ports/xproto/CONTROL index 2bf022e856d88f..5f167687438906 100644 --- a/ports/xproto/CONTROL +++ b/ports/xproto/CONTROL @@ -2,4 +2,4 @@ Source: xproto Version: 2019.2 Homepage: https://gitlab.freedesktop.org/xorg/proto/xorgproto Description: X Window System unified protocol definitions -Build-Depends: xorg-macros +Build-Depends: xorg-macros From d4ac20eb8067a06b3108e729f2800164d01d4f39 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 31 Jan 2020 13:28:51 +0100 Subject: [PATCH 291/419] fix prefix --- scripts/cmake/vcpkg_fixup_pkgconfig.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/cmake/vcpkg_fixup_pkgconfig.cmake b/scripts/cmake/vcpkg_fixup_pkgconfig.cmake index 52780db9412f7c..b97939fcde7483 100644 --- a/scripts/cmake/vcpkg_fixup_pkgconfig.cmake +++ b/scripts/cmake/vcpkg_fixup_pkgconfig.cmake @@ -33,7 +33,7 @@ function(vcpkg_fixup_pkgconfig) message(STATUS "Fixing pkgconfig - debug") message(STATUS "Files: ${_vfpkg_DEBUG_FILES}") - foreach(_file ${_vfct_DEBUG_FILES}) + foreach(_file ${_vfpkg_DEBUG_FILES}) file(READ "${_file}" _contents) string(REPLACE "${CURRENT_PACKAGES_DIR}" "\${prefix}" _contents "${_contents}") string(REPLACE "${CURRENT_INSTALLED_DIR}" "\${prefix}" _contents "${_contents}") From 905ccdfdb6eb25697dd10f10e8604f8a7459f2ce Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 31 Jan 2020 13:31:27 +0100 Subject: [PATCH 292/419] add deps --- ports/xext/CONTROL | 1 + ports/xfixes/CONTROL | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/xext/CONTROL b/ports/xext/CONTROL index 5451918474ccdc..042dbe241bcbf2 100644 --- a/ports/xext/CONTROL +++ b/ports/xext/CONTROL @@ -2,3 +2,4 @@ Source: xext Version: 1.3.4 Homepage: https://gitlab.freedesktop.org/xorg/lib/libxext Description: Xlib-based library for common extensions to the X11 protocol +Build-Depends: xorg-macros diff --git a/ports/xfixes/CONTROL b/ports/xfixes/CONTROL index 01d96cec9c2f47..700fec73e61055 100644 --- a/ports/xfixes/CONTROL +++ b/ports/xfixes/CONTROL @@ -2,4 +2,4 @@ Source: xfixes Version: 5.0.3 Homepage: https://gitlab.freedesktop.org/xorg/lib/libxfixes Description: Xlib-based library for the XFIXES Extension -Build-Depends: +Build-Depends: xorg-macros From 781b526ce31ec2d74b5ec9da859d801421a809ac Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 31 Jan 2020 13:33:09 +0100 Subject: [PATCH 293/419] remove ws --- ports/xorg-macros/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/xorg-macros/CONTROL b/ports/xorg-macros/CONTROL index 95bb0412cbaf27..7bc4917d98bcfa 100644 --- a/ports/xorg-macros/CONTROL +++ b/ports/xorg-macros/CONTROL @@ -1,4 +1,4 @@ -Source: xorg-macros +Source: xorg-macros Version: 1.19.2 Homepage: https://xcb.freedesktop.org/ Description: X.org macros utilities. From b8a171f6966c803720a91f0f6bcd63071c62d87d Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 31 Jan 2020 13:36:02 +0100 Subject: [PATCH 294/419] cleanup --- ports/xcb-image/portfile.cmake | 34 ---------------------------------- 1 file changed, 34 deletions(-) diff --git a/ports/xcb-image/portfile.cmake b/ports/xcb-image/portfile.cmake index e5d3cec85c3184..d03207198e4b3e 100644 --- a/ports/xcb-image/portfile.cmake +++ b/ports/xcb-image/portfile.cmake @@ -1,37 +1,3 @@ -# Common Ambient Variables: -# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} -# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} -# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} -# CURRENT_INSTALLED_DIR = ${VCPKG_ROOT_DIR}\installed\${TRIPLET} -# DOWNLOADS = ${VCPKG_ROOT_DIR}\downloads -# PORT = current port name (zlib, etc) -# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) -# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) -# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) -# VCPKG_ROOT_DIR = -# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) -# VCPKG_TOOLCHAIN = ON OFF -# TRIPLET_SYSTEM_ARCH = arm x86 x64 -# BUILD_ARCH = "Win32" "x64" "ARM" -# MSBUILD_PLATFORM = "Win32"/"x64"/${TRIPLET_SYSTEM_ARCH} -# DEBUG_CONFIG = "Debug Static" "Debug Dll" -# RELEASE_CONFIG = "Release Static"" "Release DLL" -# VCPKG_TARGET_IS_WINDOWS -# VCPKG_TARGET_IS_UWP -# VCPKG_TARGET_IS_LINUX -# VCPKG_TARGET_IS_OSX -# VCPKG_TARGET_IS_FREEBSD -# VCPKG_TARGET_IS_ANDROID -# VCPKG_TARGET_IS_MINGW -# VCPKG_TARGET_EXECUTABLE_SUFFIX -# VCPKG_TARGET_STATIC_LIBRARY_SUFFIX -# VCPKG_TARGET_SHARED_LIBRARY_SUFFIX -# -# See additional helpful variables in /docs/maintainers/vcpkg_common_definitions.md - -# # Specifies if the port install should fail immediately given a condition -# vcpkg_fail_port_install(MESSAGE "Xlib currently only supports Linux and Mac platforms" ON_TARGET "Windows") -vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Linux and Mac platforms" ON_TARGET "Windows") ## requires AUTOCONF, LIBTOOL and PKCONF vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org/xorg From 92a05441711e832fc177f83e6f2c42e298e39263 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 31 Jan 2020 13:37:19 +0100 Subject: [PATCH 295/419] update deps --- ports/ice/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/ice/CONTROL b/ports/ice/CONTROL index c74503a646d5d6..56792cd25925ab 100644 --- a/ports/ice/CONTROL +++ b/ports/ice/CONTROL @@ -2,4 +2,4 @@ Source: ice Version: 1.0.10 Homepage: https://gitlab.freedesktop.org/xorg/lib/libice Description: Inter-Client Exchange Library -Build-Depends: xorg-macros, bzip2, xtrans \ No newline at end of file +Build-Depends: xorg-macros, bzip2, xtrans, xproto \ No newline at end of file From 4aa06db85e02747656df0ecb7a1280d3a18a90c1 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 31 Jan 2020 13:41:50 +0100 Subject: [PATCH 296/419] ws change and fix typo --- ports/xorg-macros/CONTROL | 2 +- scripts/cmake/vcpkg_fixup_pkgconfig.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/xorg-macros/CONTROL b/ports/xorg-macros/CONTROL index 7bc4917d98bcfa..78fd48fcdb6748 100644 --- a/ports/xorg-macros/CONTROL +++ b/ports/xorg-macros/CONTROL @@ -1,4 +1,4 @@ Source: xorg-macros Version: 1.19.2 Homepage: https://xcb.freedesktop.org/ -Description: X.org macros utilities. +Description: X.org macros utilities. diff --git a/scripts/cmake/vcpkg_fixup_pkgconfig.cmake b/scripts/cmake/vcpkg_fixup_pkgconfig.cmake index b97939fcde7483..2653ac026eb28a 100644 --- a/scripts/cmake/vcpkg_fixup_pkgconfig.cmake +++ b/scripts/cmake/vcpkg_fixup_pkgconfig.cmake @@ -17,7 +17,7 @@ function(vcpkg_fixup_pkgconfig) endif() if(NOT _vfpkg_DEBUG_FILES) - file(GLOB_RECURSE __vfpkg_DEBUG_FILES "${CURRENT_PACKAGES_DIR}/debug/**/*.pc") + file(GLOB_RECURSE _vfpkg_DEBUG_FILES "${CURRENT_PACKAGES_DIR}/debug/**/*.pc") list(FILTER _vfpkg_DEBUG_FILES INCLUDE REGEX "${CURRENT_PACKAGES_DIR}/debug/") endif() From 75f2bfea9ef89a5976f339518f52cd6597770cdf Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 31 Jan 2020 13:47:52 +0100 Subject: [PATCH 297/419] fix deps --- ports/xcb-render-util/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/xcb-render-util/CONTROL b/ports/xcb-render-util/CONTROL index beb25b69a36aeb..e296375cbc2bb0 100644 --- a/ports/xcb-render-util/CONTROL +++ b/ports/xcb-render-util/CONTROL @@ -2,4 +2,4 @@ Source: xcb-render-util Version: 0.3.9 Homepage: https://xcb.freedesktop.org/ Description: XCB convenience functions for the Render extension. -Build-Depends: xorg-macros, bzip2, xproto, xcb-util-m4 +Build-Depends: xcb From cfd3f6234233a4cb428774a18db87bf81134651d Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 31 Jan 2020 14:35:19 +0100 Subject: [PATCH 298/419] update Qt Control fields --- ports/qt5-3d/CONTROL | 2 +- ports/qt5-activeqt/CONTROL | 2 +- ports/qt5-base/CONTROL | 16 ++++++++-------- ports/qt5-charts/CONTROL | 2 +- ports/qt5-connectivity/CONTROL | 2 +- ports/qt5-datavis3d/CONTROL | 2 +- ports/qt5-declarative/CONTROL | 2 +- ports/qt5-gamepad/CONTROL | 2 +- ports/qt5-graphicaleffects/CONTROL | 2 +- ports/qt5-imageformats/CONTROL | 2 +- ports/qt5-location/CONTROL | 2 +- ports/qt5-macextras/CONTROL | 2 +- ports/qt5-mqtt/CONTROL | 2 +- ports/qt5-multimedia/CONTROL | 2 +- ports/qt5-networkauth/CONTROL | 2 +- ports/qt5-purchasing/CONTROL | 2 +- ports/qt5-quickcontrols/CONTROL | 2 +- ports/qt5-quickcontrols2/CONTROL | 2 +- ports/qt5-remoteobjects/CONTROL | 2 +- ports/qt5-script/CONTROL | 2 +- ports/qt5-scxml/CONTROL | 2 +- ports/qt5-sensors/CONTROL | 2 +- ports/qt5-serialport/CONTROL | 2 +- ports/qt5-speech/CONTROL | 2 +- ports/qt5-svg/CONTROL | 2 +- ports/qt5-tools/CONTROL | 2 +- ports/qt5-virtualkeyboard/CONTROL | 2 +- ports/qt5-webchannel/CONTROL | 2 +- ports/qt5-websockets/CONTROL | 2 +- ports/qt5-webview/CONTROL | 2 +- ports/qt5-winextras/CONTROL | 2 +- ports/qt5-xmlpatterns/CONTROL | 2 +- ports/qt5/CONTROL | 4 ++-- 33 files changed, 41 insertions(+), 41 deletions(-) diff --git a/ports/qt5-3d/CONTROL b/ports/qt5-3d/CONTROL index 1b8f0cd61d4f3a..28589ac2ef20ff 100644 --- a/ports/qt5-3d/CONTROL +++ b/ports/qt5-3d/CONTROL @@ -1,4 +1,4 @@ Source: qt5-3d -Version: 5.12.5-1 +Version: 5.12.7 Description: Qt5 3d Module - Functionality for near-realtime simulation systems with support for 2D and 3D rendering Build-Depends: qt5-base, qt5-declarative, qt5-imageformats, qt5-gamepad diff --git a/ports/qt5-activeqt/CONTROL b/ports/qt5-activeqt/CONTROL index 4ec2594b35d2f4..5ce39a19dec95d 100644 --- a/ports/qt5-activeqt/CONTROL +++ b/ports/qt5-activeqt/CONTROL @@ -1,4 +1,4 @@ Source: qt5-activeqt -Version: 5.12.5 +Version: 5.12.7 Description: Qt5 ActiveQt Module - ActiveX components Build-Depends: qt5-base diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL index 090d35799153b8..e01fbf0338b8f7 100644 --- a/ports/qt5-base/CONTROL +++ b/ports/qt5-base/CONTROL @@ -1,8 +1,8 @@ -Source: qt5-base -Version: 5.12.5-10 -Homepage: https://www.qt.io/ -Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components. -Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl, angle (!windows), egl-registry, icu (!uwp), fontconfig (!windows) - -Feature: latest -Description: Build latest qt version (5.13.1) instead of LTS +Source: qt5-base +Version: 5.12.7 +Homepage: https://www.qt.io/ +Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components. +Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl, angle (!windows), egl-registry, icu (!uwp), fontconfig (!windows) + +Feature: latest +Description: Build latest qt version (5.13.1) instead of LTS diff --git a/ports/qt5-charts/CONTROL b/ports/qt5-charts/CONTROL index 192c57b417e495..7e11beb9cfb3e0 100644 --- a/ports/qt5-charts/CONTROL +++ b/ports/qt5-charts/CONTROL @@ -1,4 +1,4 @@ Source: qt5-charts -Version: 5.12.5-1 +Version: 5.12.7 Description: Qt5 Charts Module - UI components for displaying charts, driven by static or dynamic data models Build-Depends: qt5-base, qt5-declarative, qt5-multimedia diff --git a/ports/qt5-connectivity/CONTROL b/ports/qt5-connectivity/CONTROL index 0bec2a8b4ca8cc..89b9fd9836dec3 100644 --- a/ports/qt5-connectivity/CONTROL +++ b/ports/qt5-connectivity/CONTROL @@ -1,4 +1,4 @@ Source: qt5-connectivity -Version: 5.12.5-1 +Version: 5.12.7 Description: Qt5 Connectivity module - Provides access to Bluetooth and NFC hardware Build-Depends: qt5-base, qt5-androidextras (android) diff --git a/ports/qt5-datavis3d/CONTROL b/ports/qt5-datavis3d/CONTROL index 56b99852d8a641..4001171fe43a1e 100644 --- a/ports/qt5-datavis3d/CONTROL +++ b/ports/qt5-datavis3d/CONTROL @@ -1,4 +1,4 @@ Source: qt5-datavis3d -Version: 5.12.5-1 +Version: 5.12.7 Description: Qt5 Data Visualization 3d Module - UI Components for creating 3D data visualizations Build-Depends: qt5-base, qt5-declarative, qt5-multimedia diff --git a/ports/qt5-declarative/CONTROL b/ports/qt5-declarative/CONTROL index 636c090424ea94..2216dd0e66bdd6 100644 --- a/ports/qt5-declarative/CONTROL +++ b/ports/qt5-declarative/CONTROL @@ -1,4 +1,4 @@ Source: qt5-declarative -Version: 5.12.5-1 +Version: 5.12.7 Description: Qt5 Declarative (Quick 2) Module. Includes QtQuick, QtQuickParticles, QtQuickWidgets, QtQml, and QtPacketProtocol. Build-Depends: qt5-base, qt5-imageformats, qt5-svg diff --git a/ports/qt5-gamepad/CONTROL b/ports/qt5-gamepad/CONTROL index e7b99662b98759..f87eefef8e3a38 100644 --- a/ports/qt5-gamepad/CONTROL +++ b/ports/qt5-gamepad/CONTROL @@ -1,4 +1,4 @@ Source: qt5-gamepad -Version: 5.12.5-1 +Version: 5.12.7 Description: Qt5 Gamepad Module - Enables Qt applications to support the use of gamepad hardware Build-Depends: qt5-base, qt5-declarative diff --git a/ports/qt5-graphicaleffects/CONTROL b/ports/qt5-graphicaleffects/CONTROL index 111dfd7b4f9158..10e2e60e4b5a99 100644 --- a/ports/qt5-graphicaleffects/CONTROL +++ b/ports/qt5-graphicaleffects/CONTROL @@ -1,4 +1,4 @@ Source: qt5-graphicaleffects -Version: 5.12.5-1 +Version: 5.12.7 Description: Qt5 GraphicalEffects Module. Build-Depends: qt5-base, qt5-declarative diff --git a/ports/qt5-imageformats/CONTROL b/ports/qt5-imageformats/CONTROL index 20ee53538f67e6..d99f73fd79e45a 100644 --- a/ports/qt5-imageformats/CONTROL +++ b/ports/qt5-imageformats/CONTROL @@ -1,4 +1,4 @@ Source: qt5-imageformats -Version: 5.12.5-3 +Version: 5.12.7 Description: Qt5 Image Formats Module - Plugins for additional image formats: TIFF, MNG, TGA, WBMP Build-Depends: qt5-base, tiff, libwebp, jasper diff --git a/ports/qt5-location/CONTROL b/ports/qt5-location/CONTROL index 05de15d9dff105..e3af7f5758975a 100644 --- a/ports/qt5-location/CONTROL +++ b/ports/qt5-location/CONTROL @@ -1,4 +1,4 @@ Source: qt5-location -Version: 5.12.5-2 +Version: 5.12.7 Description: Qt5 Location Module - Displays map, navigation, and place content in a QML application. Build-Depends: qt5-base, qt5-declarative, qt5-quickcontrols, qt5-quickcontrols2, qt5-serialport diff --git a/ports/qt5-macextras/CONTROL b/ports/qt5-macextras/CONTROL index 21b0ad5fa78699..6024cbf976ef4c 100644 --- a/ports/qt5-macextras/CONTROL +++ b/ports/qt5-macextras/CONTROL @@ -1,4 +1,4 @@ Source: qt5-macextras -Version: 5.12.5 +Version: 5.12.7 Description: Qt5 Mac Extras Module. Provides platform-specific APIs for mac. Build-Depends: qt5-base diff --git a/ports/qt5-mqtt/CONTROL b/ports/qt5-mqtt/CONTROL index 1c7cc8740c6d67..4962cffe4ab0fd 100644 --- a/ports/qt5-mqtt/CONTROL +++ b/ports/qt5-mqtt/CONTROL @@ -1,4 +1,4 @@ Source: qt5-mqtt -Version: 5.12.5 +Version: 5.12.7 Description: Qt5 MQTT module. Build-Depends: qt5-base diff --git a/ports/qt5-multimedia/CONTROL b/ports/qt5-multimedia/CONTROL index c82238ab3b8200..88877288dc3979 100644 --- a/ports/qt5-multimedia/CONTROL +++ b/ports/qt5-multimedia/CONTROL @@ -1,4 +1,4 @@ Source: qt5-multimedia -Version: 5.12.5-1 +Version: 5.12.7 Description: Qt5 Multimedia Module - Classes and widgets for audio, video, radio and camera functionality Build-Depends: qt5-base, qt5-declarative diff --git a/ports/qt5-networkauth/CONTROL b/ports/qt5-networkauth/CONTROL index 9115290bf052b0..f1bdd7b282255b 100644 --- a/ports/qt5-networkauth/CONTROL +++ b/ports/qt5-networkauth/CONTROL @@ -1,4 +1,4 @@ Source: qt5-networkauth -Version: 5.12.5 +Version: 5.12.7 Description: Qt5 Network Authorization Module Build-Depends: qt5-base diff --git a/ports/qt5-purchasing/CONTROL b/ports/qt5-purchasing/CONTROL index f970ba418cf55a..38ae1fa10f3385 100644 --- a/ports/qt5-purchasing/CONTROL +++ b/ports/qt5-purchasing/CONTROL @@ -1,4 +1,4 @@ Source: qt5-purchasing -Version: 5.12.5-1 +Version: 5.12.7 Description: Qt5 Purchasing Module - Enables in-app purchase of products in Qt applications. Build-Depends: qt5-base, qt5-declarative, qt5-androidextras (android) diff --git a/ports/qt5-quickcontrols/CONTROL b/ports/qt5-quickcontrols/CONTROL index 11287f68f385d1..c82c49d5ce459c 100644 --- a/ports/qt5-quickcontrols/CONTROL +++ b/ports/qt5-quickcontrols/CONTROL @@ -1,4 +1,4 @@ Source: qt5-quickcontrols -Version: 5.12.5-1 +Version: 5.12.7 Description: Qt5 QuickControls Module. Build-Depends: qt5-base, qt5-declarative, qt5-graphicaleffects diff --git a/ports/qt5-quickcontrols2/CONTROL b/ports/qt5-quickcontrols2/CONTROL index 5a9601fa492f24..dc67cc2dc5003a 100644 --- a/ports/qt5-quickcontrols2/CONTROL +++ b/ports/qt5-quickcontrols2/CONTROL @@ -1,4 +1,4 @@ Source: qt5-quickcontrols2 -Version: 5.12.5-1 +Version: 5.12.7 Description: Qt5 QuickControls2 Module. Build-Depends: qt5-base, qt5-declarative, qt5-imageformats diff --git a/ports/qt5-remoteobjects/CONTROL b/ports/qt5-remoteobjects/CONTROL index def806c79e0309..769e88b733b411 100644 --- a/ports/qt5-remoteobjects/CONTROL +++ b/ports/qt5-remoteobjects/CONTROL @@ -1,4 +1,4 @@ Source: qt5-remoteobjects -Version: 5.12.5-1 +Version: 5.12.7 Description: Qt5 Remoteobjects module - Provides an easy to use mechanism for sharing a QObject's API (Properties/Signals/Slots) between processes or devices. Build-Depends: qt5-base, qt5-declarative diff --git a/ports/qt5-script/CONTROL b/ports/qt5-script/CONTROL index 040064f60b2f03..c530661f3d8e5f 100644 --- a/ports/qt5-script/CONTROL +++ b/ports/qt5-script/CONTROL @@ -1,4 +1,4 @@ Source: qt5-script -Version: 5.12.5-1 +Version: 5.12.7 Build-Depends: qt5-base, qt5-tools Description:Qt5 Script Module. diff --git a/ports/qt5-scxml/CONTROL b/ports/qt5-scxml/CONTROL index c2f22a15b75cd4..ba0ed43fcf7019 100644 --- a/ports/qt5-scxml/CONTROL +++ b/ports/qt5-scxml/CONTROL @@ -1,4 +1,4 @@ Source: qt5-scxml -Version: 5.12.5 +Version: 5.12.7 Description: Qt5 SCXML Module - Provides classes and tools for creating state machines from SCXML files and embedding them in applications Build-Depends: qt5-base, qt5-declarative diff --git a/ports/qt5-sensors/CONTROL b/ports/qt5-sensors/CONTROL index 1c7218beca9f25..fe680b8d4ab23c 100644 --- a/ports/qt5-sensors/CONTROL +++ b/ports/qt5-sensors/CONTROL @@ -1,4 +1,4 @@ Source: qt5-sensors -Version: 5.12.5-1 +Version: 5.12.7 Description: Qt5 Sensors module - Provides access to sensor hardware and motion gesture recognition. Build-Depends: qt5-base, qt5-declarative diff --git a/ports/qt5-serialport/CONTROL b/ports/qt5-serialport/CONTROL index 732f6a7da3aed3..a6019d24e4712f 100644 --- a/ports/qt5-serialport/CONTROL +++ b/ports/qt5-serialport/CONTROL @@ -1,4 +1,4 @@ Source: qt5-serialport -Version: 5.12.5 +Version: 5.12.7 Description: Qt5 Serial Port - provides access to hardware and virtual serial ports Build-Depends: qt5-base diff --git a/ports/qt5-speech/CONTROL b/ports/qt5-speech/CONTROL index 682422a95298ce..9f2c2491e6a8c9 100644 --- a/ports/qt5-speech/CONTROL +++ b/ports/qt5-speech/CONTROL @@ -1,4 +1,4 @@ Source: qt5-speech -Version: 5.12.5-1 +Version: 5.12.7 Description: Qt5 Speech Module Build-Depends: qt5-base, atlmfc (windows), qt5-declarative, qt5-multimedia diff --git a/ports/qt5-svg/CONTROL b/ports/qt5-svg/CONTROL index cbc01727a514b1..ea94b582aad655 100644 --- a/ports/qt5-svg/CONTROL +++ b/ports/qt5-svg/CONTROL @@ -1,4 +1,4 @@ Source: qt5-svg -Version: 5.12.5 +Version: 5.12.7 Description: Qt5 SVG Module - provides classes for displaying the contents of SVG files Build-Depends: qt5-base diff --git a/ports/qt5-tools/CONTROL b/ports/qt5-tools/CONTROL index bfa94474c61323..c5f0184cc3801a 100644 --- a/ports/qt5-tools/CONTROL +++ b/ports/qt5-tools/CONTROL @@ -1,4 +1,4 @@ Source: qt5-tools -Version: 5.12.5-3 +Version: 5.12.7 Description: Qt5 Tools Module; Includes deployment tools and helpers, Qt Designer, Assistant, and other applications Build-Depends: qt5-base, qt5-declarative, qt5-activeqt (windows) diff --git a/ports/qt5-virtualkeyboard/CONTROL b/ports/qt5-virtualkeyboard/CONTROL index dce415c5a781d4..764e36b3c272e0 100644 --- a/ports/qt5-virtualkeyboard/CONTROL +++ b/ports/qt5-virtualkeyboard/CONTROL @@ -1,4 +1,4 @@ Source: qt5-virtualkeyboard -Version: 5.12.5-1 +Version: 5.12.7 Description: Qt5 Virtual Keyboard Module - A framework for implementing different input methods. Supports localized keyboard layouts and custom visual themes Build-Depends: qt5-svg, qt5-quickcontrols, qt5-multimedia, qt5-quickcontrols diff --git a/ports/qt5-webchannel/CONTROL b/ports/qt5-webchannel/CONTROL index e8adae19710905..e8f758ae660ce7 100644 --- a/ports/qt5-webchannel/CONTROL +++ b/ports/qt5-webchannel/CONTROL @@ -1,4 +1,4 @@ Source: qt5-webchannel -Version: 5.12.5-1 +Version: 5.12.7 Description: Qt5 Web Channel module - Provides access to QObject or QML objects from HTML clients for seamless integration of Qt applications with HTML/JavaScript clients. Build-Depends: qt5-base, qt5-declarative diff --git a/ports/qt5-websockets/CONTROL b/ports/qt5-websockets/CONTROL index fbfeba6c44988c..e5289ac98d3075 100644 --- a/ports/qt5-websockets/CONTROL +++ b/ports/qt5-websockets/CONTROL @@ -1,4 +1,4 @@ Source: qt5-websockets -Version: 5.12.5 +Version: 5.12.7 Description: Qt5 Web Sockets Module - provides WebSocket communication compliant with RFC 6455 Build-Depends: qt5-base, qt5-declarative diff --git a/ports/qt5-webview/CONTROL b/ports/qt5-webview/CONTROL index 16aa0bbf618bfc..a3d2a6ddcd8373 100644 --- a/ports/qt5-webview/CONTROL +++ b/ports/qt5-webview/CONTROL @@ -1,4 +1,4 @@ Source: qt5-webview -Version: 5.12.5-1 +Version: 5.12.7 Description: Qt5 WebView module - Provides a way to display web content in a QML application without necessarily including a full web browser stack by using native APIs where it makes sense. Build-Depends: qt5-declarative diff --git a/ports/qt5-winextras/CONTROL b/ports/qt5-winextras/CONTROL index 5d948ee5ce16cc..afc0882348f5d0 100644 --- a/ports/qt5-winextras/CONTROL +++ b/ports/qt5-winextras/CONTROL @@ -1,4 +1,4 @@ Source: qt5-winextras -Version: 5.12.5-1 +Version: 5.12.7 Description: Qt5 Windows Extras Module. Provides platform-specific APIs for Windows. Build-Depends: qt5-base, atlmfc (windows), qt5-declarative, qt5-multimedia diff --git a/ports/qt5-xmlpatterns/CONTROL b/ports/qt5-xmlpatterns/CONTROL index 15a67649806f77..02810d18e128b5 100644 --- a/ports/qt5-xmlpatterns/CONTROL +++ b/ports/qt5-xmlpatterns/CONTROL @@ -1,4 +1,4 @@ Source: qt5-xmlpatterns -Version: 5.12.5-1 +Version: 5.12.7 Description: Qt5 XML Patterns Module - Support for XPath, XQuery, XSLT and XML schema validation Build-Depends: qt5-base, qt5-declarative diff --git a/ports/qt5/CONTROL b/ports/qt5/CONTROL index fcad24707dcfb7..d9310aa6dce41a 100644 --- a/ports/qt5/CONTROL +++ b/ports/qt5/CONTROL @@ -11,7 +11,7 @@ Description: Build the essential qt modules Feature: latest Build-Depends: qt5-base[latest] -Description: Build latest qt version (5.13.1) instead of LTS +Description: Build latest qt version (5.14.1) instead of LTS Feature: default Build-Depends: qt5[3d, webchannel, websockets, extras, sensors, serialport, speech, virtualkeyboard, purchasing, scxml, charts, datavis3d, gamepad, graphicaleffects, location, webglplugin, webview, translations, remoteobjects, connectivity, canvas3d] @@ -19,7 +19,7 @@ Description: Build the essential qt modules Feature: all Build-Depends: qt5[3d, webchannel, websockets, extras, xmlpatterns, sensors, serialport, speech, svg, tools, virtualkeyboard, networkauth, purchasing, quickcontrols, quickcontrols2, script, scxml, activeqt, charts, datavis3d, declarative, gamepad, graphicaleffects, imageformats, location, multimedia, mqtt, webglplugin, webview, wayland, webengine, serialbus, translations, doc, remoteobjects, connectivity, canvas3d] -Description: Install all Qt5 submodules (Warning: Could take a long time...) +Description: Install all Qt5 submodules (Warning: Could take a long time and fail...) Feature: extras Build-Depends: qt5-winextras (windows), qt5-macextras (osx), qt5-x11extras (linux), qt5-androidextras (android) From 8300fae556a966e4ff9677ab61f40bc5e5adea1f Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 31 Jan 2020 14:41:10 +0100 Subject: [PATCH 299/419] update qt hashes to 5.12.7 --- ports/qt5-base/cmake/qt_port_hashes.cmake | 85 +++++++++++------------ 1 file changed, 42 insertions(+), 43 deletions(-) diff --git a/ports/qt5-base/cmake/qt_port_hashes.cmake b/ports/qt5-base/cmake/qt_port_hashes.cmake index 4ea373035eb4ae..564a678990b708 100644 --- a/ports/qt5-base/cmake/qt_port_hashes.cmake +++ b/ports/qt5-base/cmake/qt_port_hashes.cmake @@ -1,56 +1,55 @@ #Every update requires an update of these hashes and the version within the control file of each of the 32 ports. #So it is probably better to have a central location for these hashes and let the ports update via a script set(QT_MAJOR_MINOR_VER 5.12) -set(QT_PATCH_VER 5) +set(QT_PATCH_VER 7) set(QT_UPDATE_VERSION 0) # Switch to update qt and not build qt. Creates a file cmake/qt_new_hashes.cmake in qt5-base with the new hashes. set(QT_PORT_LIST base 3d activeqt charts connectivity datavis3d declarative gamepad graphicaleffects imageformats location macextras mqtt multimedia networkauth purchasing quickcontrols quickcontrols2 remoteobjects script scxml sensors serialport speech svg tools virtualkeyboard webchannel websockets webview winextras xmlpatterns) -set(QT_HASH_qt5-base 9a95060318cadfcd6dace6b28353fa868a8dcfe9def0bd884edf7d9f72606bae625de0269323a94b81d594a6c398106c266304106329b79c7dae4e5b88269660) -set(QT_HASH_qt5-3d 8cc23417b4a41bf9d19052e05c7e3be8773be062f1f5998a7784573ef9c35a04da50ce67a65b3709065bb3cf243aac8ede4bea60f0420a5400cbe6c9c7bdf05b) -set(QT_HASH_qt5-activeqt 6233bb64ca45b6b0065afa50a3082c6df7e4e20d36040dfaf391e02876f50c41ec293db79a13636aeae9469deefad35ced42902548f9fcd78476359ad4450bee) -set(QT_HASH_qt5-charts a3ba8c6a606430cd87f85661116dbb2692e0bb472f0a73310aca1950f4437563d04ee950437a48a399b1a4881dd264cd1e6fdd4f30b6c3110704ec48d1467da1) -set(QT_HASH_qt5-connectivity 96cdb27aa0e439094e3f1de0c7a680973c3ce2c65bbbff38affe25a3708c9e4e3c1c6a403d698303f77a5f261b44ac657e01a769b62a1565e0a8c64c8ac80bd5) -set(QT_HASH_qt5-datavis3d 7911d911678827ca4a704b824b8841c8e8508484fb83265d4d05e64787ac1184387b9ed0870090b3233c736f5e484adc7776ba12a1173da0fceeaac46845c6f4) -set(QT_HASH_qt5-declarative 026c5024c06e44b6e91099d1ee912f38017f314ae0125227010d25d733447c692299cc7c47edc1a4bf39366a9c9c9fe77d3a249905f2ae982d0725317d824b9b) -set(QT_HASH_qt5-gamepad bc4148bb75de53dd0885fc25ce7d679d7a5426a23ce9c93482fd11e8d6003cebe4c958fc07f17817a43f1d4449756deff24c0350fd33e100aeb2c302c650ae33) -set(QT_HASH_qt5-graphicaleffects 489a308af5f56ff2b023375ddf705f8a1b15c0e1fb1ec3bc6e5f66a80b5863d63aa0e57a3aef025ab965694add8d71424123bca120ce8d8b8448e7218f7fc640) -set(QT_HASH_qt5-imageformats 9fa76b7eec083596c45f68642b49dc88c2759a28cb9359935c3a64604082acea9adecee49bb0828cc587b86d469aec7169f8f72f83a15194c4fc10f0ca25fae0) -set(QT_HASH_qt5-location fe82194e4e6bc2a2e6e3c55e3360afdfd56a6495a8d87bfbdceb29255430954d4c1adc62f1f82e63b23778f0bf03b0a50d6f5d2a963bd786f2cf2fbed7450ccc) -set(QT_HASH_qt5-macextras 80779bf9c49ff89b866327a3358cede9308c41d6a49d8d6aa29661f4ad98d191c2f68d9af0d89be36fe54d094972f7a7689ecc26bc2bfcf53e9be1305e107178) -set(QT_HASH_qt5-mqtt 3167de873dc3d42607440237c7b341c270079a1edd72588ebe95082ab209bbd24496d60d41c87ade166b595fda924a52cb2ff0efd05b48aa4c77c7b51b125f36) -set(QT_HASH_qt5-multimedia a59983d887c8de462399fd53beb640c1b865c17f8b1a83635c2e1d27903861dd588eb64935d7c02d733c51c9a21174065e70a5fc1aa78600e5540c489b7695a3) -set(QT_HASH_qt5-networkauth d7849518614a7bdb2ddbcf92b773f5e7c26f1af4ba07f0304b4634ed69bf3c17798509d28af2c49aba0cfad35a1cad5bda27acdbde3aa8d86038efeb9f5001e0) -set(QT_HASH_qt5-purchasing b9f7e43cf4a8e23bc167d2473fa6f8af47455f066b584daf18d97d4a67dd766aaf17c7b897b2bae20cf636253174430be664815e1e86aeb07ed870bb2969ad0d) -set(QT_HASH_qt5-quickcontrols 4539a6ce1ee20f71f6bf48271bc3fe1125bd21899cf36142d1c3d41a68ba56211f27d6e4403c69e86bd4698c7c7c79bc60f2a78ef1b19c5eab5b8690d1a01037) -set(QT_HASH_qt5-quickcontrols2 afbd742783d83eabf182031e218c2f611709cd66f2b4886317bd356ffff2afabe820e1f552f478a0c3f74daf6fd1f5256900448f5445b84792d6a71b42ccd20a) -set(QT_HASH_qt5-remoteobjects ed3314b1c66f9375bdc101029eaf730a630157ee41c094de2ff9cc5340c3c92a781dcb2b2cf0b8bbad8b19e566fb80f2d3b76e58624e990f90f23b8cdd21bd54) -set(QT_HASH_qt5-script a422e47873ddf4c84adf00f51b721465acedfac535b0daeede63eac0d41c6f4f07d5a5f86513c86e981f3a0024020be03730670befab2a20cd4d6564c98d6c90) -set(QT_HASH_qt5-scxml 23d340994af3e217ae58698dd0cd38f30d67d74a042d58cabbd0f38a6c13a8d64d6238cd6dee246ce0f99d5206bc210749941b88e5f745d3b92207eab06730b1) -set(QT_HASH_qt5-sensors 81ac74e4c0a3d1942393c9267bbcc50af0e04a6f163d566010d6053dc4c69a67395c3f4b7564a50ec84ac88a715edd002920be4e145e6bd23d082a021dee1e5a) -set(QT_HASH_qt5-serialport f3a5fb8c9a9513c16f52bd22b4fd4c6400819863237762f459d9f612ef2457447733cc8ed2bd645f182ab9eab6ddb5bcdbca2fbd67745def1a5fad1392087f4e) -set(QT_HASH_qt5-speech 2a1a2c86ee3b5501623bb0c2c8e5b6f96b353707fe0eb804629187899eca5952c665ef037c4257f635edf34ddea03bc686f472a4a346d9f8e2adc7479f640482) -set(QT_HASH_qt5-svg 3d7f89d106b36c8a0fd04c6e6f0ccde0c50ced7192980ea7d9330ba73d9307559e60ed2b10c28481a419d19aaae6609bde9e1dd74ccedf340dacf0194a60429d) -set(QT_HASH_qt5-tools e88af049ad9261720bc44ff9030113179d9429eaf073bed45115decd520ecf5d3ca860983f012bac189310ce9f3826b1fcb484faadb4f6d0b16c67c0d998f34c) -set(QT_HASH_qt5-virtualkeyboard e4581673451c40bf39b9793b0131bbad29e8a3f9db2d42adb23b48847bd674b6820717c051b76e506d4fd52e87c79b042533be85285a0cce9bcdc49cca964e66) -set(QT_HASH_qt5-webchannel 8ea543f29e8f686961b033c1246714b1535d0be730026bef4b4ee172ce602c706d8a16b8391510a302df7be6545007a2f42311eb1aea4da326c3addde16ca2b2) -set(QT_HASH_qt5-websockets 970ad232ad1258630404d5e7347721505a780497e1775f88591098f11bca48cbf62c4f02491b133d31e4304eb9e16f923292c5b778e22d530d7a5a4e95d422ba) -set(QT_HASH_qt5-webview 310beedf88cefc05458e99838e7cb71971aa24ba6c460ff3da804c2ab7f56167ca1067ddca71ee29ced32ea974fe405261f24c8bbcac0c7b69063d7c4e38a4de) -set(QT_HASH_qt5-winextras 053ca5f60c7946f6409ef34094b4a7d1431039407a5195e539e8edfda795da20fc695ceec58ae0df15e4dcc597047518d06a424d11fb4aaf6ae82f1d4badab33) -set(QT_HASH_qt5-xmlpatterns 30b25e152970bfe51fcdeffa43d11dd51496e5ea6a5da644b13fa0ce4835302ebec651c1ecdcf9590c6689598cea9bd63748aab4ee0ec69f9155dc310a7c04c3) - +set(QT_HASH_qt5-base c8b90e50ec1824236541273b81024f1332c604748a038a48bc377b4c8e0886bfc27132990758abfd8ab9ea2aa5f1e42181ff369a0df4bc879dad0ef95868fde3) +set(QT_HASH_qt5-3d 57c07756fb5838cf5201d4bf1ce5be843ba117356be768b5060750d3a8f117098ca97c8d10343d9554fa6d95ac00d7ee28ace6e6fb2770f18a1b575236b8afec) +set(QT_HASH_qt5-activeqt 00daeba4ca2751d3c3f10bd798040316d817e1a9866a760a3acd6ac6055a0c87b888b87a77c112401fd9fed8a5a146ad0c274cd2bdc03c48088f667dfe182e8e) +set(QT_HASH_qt5-charts 6e18b9e20616b43d95376ef229edd2eb2a2924bc05c44c9108b8e5fd94e20a80e34cadf03d36a1d45f62f2d7ba3a26b3e823def0af2c25c630830eb92bb22ceb) +set(QT_HASH_qt5-connectivity 42d2831eafd136344839ec6dce1f408d6e8822dd55f593286a1aa74b61766aa5ecf35bcf918ace6fa551b68407b829c3602d67b32b8c5ce16d19325c33f61359) +set(QT_HASH_qt5-datavis3d a5c60318a7115cd7368b8d2e7c1a83c207734ab63e9c6b7dfa451a3752d9e1f5ca6d718b65d1b11ecd59a6049adb2de8e5f78a305f3ee5d828d664bb11c5b0a6) +set(QT_HASH_qt5-declarative 119155aed8ad6e74f7be2d0e44bf630fc493227c6ad0fdbd9a85bba8770939a0dd6c21a8583851e5adf243d51bdeb64bf79e1c4898176898e05a3897052315b6) +set(QT_HASH_qt5-gamepad a7d3cc74e9a0b269acadfd5faa2a72ef3132762c51c31a346319899f165d67c9d92e0f1b80c4e748209c31502f30600bf0d012e8f478caf959f34ff33389ba05) +set(QT_HASH_qt5-graphicaleffects fd6b59198e834a9e36e58445055610ac6dcfcb96d405d2dc294e0397460d6fdd119cfd4b0f29f43009154d623071dcb335223e33872fbfb5b6004abe9b6f5a55) +set(QT_HASH_qt5-imageformats 1d721969bdb64b9674ecde992424e02997f051422d8d762d0e7930ae549792d1152751398ee2a906055da9d26df02d93f565d82a2e80a2659dcbd3ad347b4727) +set(QT_HASH_qt5-location e82673e56f648a675df36c32a73217bf49b309a356c0de9e4defe14c3070d1d482d797fc11adca632edb59af9993f92e562dc5cb44dbcbad677ac3980c35676c) +set(QT_HASH_qt5-macextras 00) +set(QT_HASH_qt5-mqtt 00) +set(QT_HASH_qt5-multimedia 25bce2851190cc4df47432c8ddee831fe9ea172f4a612a18bde6b1ce8c0f0fdc09ca0e484dad9e2d8659bfe0c84e2801a84c7f75d32976a5a9cdf1ba9e871f3c) +set(QT_HASH_qt5-networkauth 484724ce60975c74e737c082f08dfc889e327618ca8efa83ed47b940ae515c836db9fd78ba67e930d27a1c1cd91cb14bdc055500c287c2e9853ddcfe1e1c43a6) +set(QT_HASH_qt5-purchasing 08f2e97acab278e5fd53ef5ec9f3c9e15d3bf9d412f8d83ef4a0ab16619b4cc46940ee9ba5a770db98e79c4fbad24fca55d50de78ce3c30162ac6fb3ebf2d4c0) +set(QT_HASH_qt5-quickcontrols 75f8600ec001131ac510057c6b16a5c34aae3a5ad6af5dc801ea3c63896e290c1bb5d71dd404613cf2958cdd965a924c1783029ec5d392f4db43aefa3ea0821c) +set(QT_HASH_qt5-quickcontrols2 bd469316594e09da064fc6792c08ee87f345ab8c27bd33ae3fc38d184bebabf1ed824147eb960ac2700c67a683097c7615aebb0f717dc1a5ff1b330f27554ae9) +set(QT_HASH_qt5-remoteobjects 7d0591e8b0232b65ce76fba18098aeee23390403430dae411f12e3bad4e3721c5160d6d46ed5fefcc38e01dcd593231f7a7f6eaf421ed91c6939af25d96bd9fc) +set(QT_HASH_qt5-script 49a1b0563734908be0f3b99f0295f1f869f831d8e2b6ae77bd70c2a2f1fbc6bea8a8bda0092a1519d03f2969cfe38fede64530d9221734d907efd3137b9769be) +set(QT_HASH_qt5-scxml 3c044127bb3f41945f959386c664d66035606dddac843fe029aeb52f0807f23e5ff2adced21e94533312d0030149866a80d49e0b3aa9222c6e6b99636d26dbd6) +set(QT_HASH_qt5-sensors baa576792347bd0a95178a7e0b5ad47bcd4828d64b3801bfb1394647d95f8255b8800e52d9be0bde50b2fc9f0633d21ada940d4b7ff17c8cce72499b7b4a06ee) +set(QT_HASH_qt5-serialport 59d14147bfb9e4885e9c88f70b261c021d4947cc04ce9982e821ae8b307d6323d797e6788764c206bef7b3013c6b9bed9288573c2ede33d4321c9f5a6907d1f5) +set(QT_HASH_qt5-speech e3bc06f7952eee5c34f33c1a4404ccd12dd8886ef8d8af527dba41b58a27c5c667fea4bdaed7bfcfdcc9a2ca0f4a19f35c2c92995565a696828b5b4a41e31b3e) +set(QT_HASH_qt5-svg 13e6053c99cc0f5b31bc48df0a8b93cfa26e49f3aa2732850747c7a8b3e78ff0a1c620e2a8729d291b5a6cf935d9a481f361ec9f6a78ae090ca997b344786f47) +set(QT_HASH_qt5-tools d1e0b55e4eb5c22c9a912cf28a62f30e02d020a22085f5556e0ef9034aca849423cb2d6c9d27ffb3a6ffefe4a2e522b84ec1dd5ce700360d746c22be0c59c94b) +set(QT_HASH_qt5-virtualkeyboard c8ebd905d15d23ea72df5857c25438b25a50e49f332bcf79cc3c81a9951589a56d11c3aaf7986387065f5020ad770efe93ca1e2a14fdfc6f1333b8e6439dd66e) +set(QT_HASH_qt5-webchannel a5587abd6daf60f985cfa29c68449347bd22a8f63c6027400b02378b9c85cfbe1a45e8a844609b99b8646bcf980b0dd262b191226a0c8fd931b3e96696fe6469) +set(QT_HASH_qt5-websockets 96762336abdb460a3279a6f47456e0b5690572f203a14fa2f0bf9e71a5cffbf6f512682e2c681ee3d3c2a87eb56ff5ac938f5ac828558b0e2745335f08201349) +set(QT_HASH_qt5-webview 73e79c5f4d7b67b9cd2513abd709deccedcad3e5ab50755ba70f7e8123031acab6e38299eed7c03ccd3478f19d58cdc75726863f280a44b1c852aaa4d816f9a4) +set(QT_HASH_qt5-winextras 450959c57e0cbcd35738232c4ba3ecaae1bec4c10fbca6d8ce31cf9029440835ddfea6811be7d9274a784b58c2a54c7bd721859e9b8439e2583bb15cfb9fda8e) +set(QT_HASH_qt5-xmlpatterns f228c9c20b5aa00fc4f0e6918a53b780f10d58288c2af2b0edb8e279f1d21dd7a22afb0a08115cd0e3cab7adec1b4d2ee44cd1aff9298fb62b60a77d8d147ea9) ##TODO -set(QT_HASH_qt5-doc 896539861151fc65b30d1685bacc0332bef131d2c9850fe29f2c58efecd99313fd45a28f77108403fba65fc64a5af6ba8a4d37f60016bd406597e682aef11cd2) -set(QT_HASH_qt5-x11extras 1e83c2d350f423053fe07c41a8b889391100df93dd50f700e98116c36b3dbad9637a618765daf97b82b7ffcd0687fc52c9590d9ce48c2a9204f1edc6d2cae248) -set(QT_HASH_qt5-androidextras dd353112b70988a48891d34aa49ed9e8d0840a7174952879da450302be182f75a19762b25b63110dbfcc3efe41af7e9dec1eef90c44eec46bcdd861256de784d) -set(QT_HASH_qt5-canvas3d 6fe4b01eef1a319faf57d545f79d8e945cfeeea306c2aa26ec3b96d4524ccec0e336fcff65a252bf40141e00f870aa2672c045dc4881a322c1b53cb00b684470) -set(QT_HASH_qt5-translations a2120add3b82fd84d44a064f08c5e781410c86dfd5eee39a01f44840063be5b4030c47989a2e6a413c4298d79b473f50968078a12793b9145d7ee8a722fd1698) -set(QT_HASH_qt5-serialbus bf013a1e052cb0011c05f5dd52757f4944c86f4bd61f57244ffa299cd443166a80d27493a0ec8e22dcff817e89081502f091736bd37a27616de933e51184b0f4) -set(QT_HASH_qt5-webengine b485d37dca14f1cf4adf01bd8b1ae52c1d4916d7acf6ed210bc9feaece8efc2aa6cee8a3ef9174b50b767e373379c6a18d14db4426ac53a8c27d2d7b222826df) -set(QT_HASH_qt5-webglplugin 8c78761ddde2acbf862fa7ee2a5c33b6ebfdba283dfffb1a77027ed727105b16fc5ab191a8b48c491a8b29e857a03984206bfffaae0864490c8bb4c850803f73) -set(QT_HASH_qt5-wayland 19e19b3d6226839856f8e8792665eda1f09f0bbf95a38077bdf2831205ee09254c8df6a521ba3f5a228bcd98c4d1929a2bd9e9aa2f6f14c218d4d7458d1a866c) +set(QT_HASH_qt5-doc 0b3b2aa09429b7a20dd9704de5dc51392937e57949873088e33d54e41e05bebb17f95a57bb852bc510977eff0deba6453c115b7fb5e7021f4e182aa0c15474c0) +set(QT_HASH_qt5-x11extras 1cf6b82fd884c88c941fc5d1a1bcc1e3da50fd1252c83c23c72411cbc7a9d81ff5b363175908b30927718706bc40a03b0cc9e64a96e91544e0a40af2c4144afd) +set(QT_HASH_qt5-androidextras 00) +set(QT_HASH_qt5-canvas3d 7f8374a98b4cd9e463ccfa29697f3b77c9b505953730c668ee4cb1cfc45d26a7c5c7a102a2779f70174a13333a91f5a3f6df096bf55ceb17258548ec86048794) +set(QT_HASH_qt5-translations 6a4af59d916f060d726acfaf12e23c09adc73243f1f38bd3cb76a7d688dcb78b69ced6606dce2615a1ebdec09d210547d51975d0678d092cb61153551b1f6fff) +set(QT_HASH_qt5-serialbus 66230ca95cb86bd3408dfa79236e37c350f4df8be8886d8f6206f0822068a05a24bfd3e29e5a5cc3c3cdd9f437d4609e5ee2c3fc7c4813117a1bb349a873dfb0) +set(QT_HASH_qt5-webengine ff9e07abf5b708ef2320cccc53e032a3e0042926c71e5a76c880d4f97fb7f2c4ae4db2587c7998bae8690cd6f48a2dc4df1c2f5122121def99bef5ee7f7e70f2) +set(QT_HASH_qt5-webglplugin 3a06e66734b2937ca84919fd93ec35c7768b11d8fa7916a48d9be19cec091f2acd6966bd495bde141b17582ae36c8a32718b13946977331b18e403eadfb02c53) +set(QT_HASH_qt5-wayland 28d3d4b5df0c35bea5a9c9ffd032b01fe6c51a4c32d6ecc823d5103871f282ced9f7670901b6b74c0c042e7f816df5107d362d154ba109cfe8e3ba61b63778d5) if(QT_UPDATE_VERSION) From 2355295b3cdab9b5c45711d273c6f6e3ca56b35a Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 31 Jan 2020 16:13:33 +0100 Subject: [PATCH 300/419] fix xlib and glib detection on linux. glib pkgconfig does not work due to vcpkg's custom cmake build --- ports/qt5-base/patches/glib.patch | 14 +++++++++++ ports/qt5-base/patches/xlib.patch | 39 +++++++++++++++++++++++++++++++ ports/qt5-base/portfile.cmake | 2 ++ 3 files changed, 55 insertions(+) create mode 100644 ports/qt5-base/patches/glib.patch create mode 100644 ports/qt5-base/patches/xlib.patch diff --git a/ports/qt5-base/patches/glib.patch b/ports/qt5-base/patches/glib.patch new file mode 100644 index 00000000000000..f9a17296a5cedc --- /dev/null +++ b/ports/qt5-base/patches/glib.patch @@ -0,0 +1,14 @@ +diff --git a/src/corelib/configure.json b/src/corelib/configure.json +index 068b80c51..497450523 100644 +--- a/src/corelib/configure.json ++++ b/src/corelib/configure.json +@@ -44,7 +44,8 @@ + }, + "headers": "glib.h", + "sources": [ +- { "type": "pkgConfig", "args": "glib-2.0 gthread-2.0" } ++ { "type": "pkgConfig", "args": "glib-2.0 gthread-2.0" }, ++ "-lglib-2.0 -lgthread-2.0" + ] + }, + "posix_iconv": { diff --git a/ports/qt5-base/patches/xlib.patch b/ports/qt5-base/patches/xlib.patch new file mode 100644 index 00000000000000..9c572e5f0204c3 --- /dev/null +++ b/ports/qt5-base/patches/xlib.patch @@ -0,0 +1,39 @@ +diff --git a/src/gui/configure.json b/src/gui/configure.json +index 9a749516b..242f47504 100644 +--- a/src/gui/configure.json ++++ b/src/gui/configure.json +@@ -568,7 +568,9 @@ + }, + "headers": "X11/Xlib.h", + "sources": [ +- { "type": "makeSpec", "spec": "X11" } ++ { "type": "makeSpec", "spec": "X11" }, ++ { "type": "pkgConfig", "args": "x11" }, ++ { "type": "pkgConfig", "args": "x11 --static" } + ] + }, + "x11sm": { +@@ -590,6 +592,7 @@ + "headers": "xcb/xcb.h", + "sources": [ + { "type": "pkgConfig", "args": "xcb >= 1.9" }, ++ { "type": "pkgConfig", "args": "xcb >= 1.9 --static" }, + "-lxcb" + ] + }, +@@ -691,6 +694,7 @@ + "headers": "X11/Xlib-xcb.h", + "sources": [ + { "type": "pkgConfig", "args": "x11-xcb" }, ++ { "type": "pkgConfig", "args": "x11-xcb --static" }, + "-lX11-xcb" + ], + "use": "xcb xlib" +@@ -711,6 +715,7 @@ + "headers": "xcb/xkb.h", + "sources": [ + { "type": "pkgConfig", "args": "xcb-xkb >= 1.10" }, ++ { "type": "pkgConfig", "args": "xcb-xkb >= 1.10 --static" }, + "-lxcb-xkb" + ], + "use": "xcb" diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 5347e040d29ede..1164de69cc602d 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -46,6 +46,8 @@ qt_download_submodule( OUT_SOURCE_PATH SOURCE_PATH patches/Qt5BasicConfig.patch patches/Qt5PluginTarget.patch patches/prl_parser.patch + patches/xlib.patch + patches/glib.patch ) # Remove vendored dependencies to ensure they are not picked up by the build From 2ea3d69fe9262b1dad0900284a5a176a078fecb6 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 31 Jan 2020 21:29:17 +0100 Subject: [PATCH 301/419] update baseline update missing hashes update empty include/packages add info for placeholder ports not yet correctly working (e.g. qt5-wayland) --- ports/qt5-base/cmake/qt_port_hashes.cmake | 6 +++--- ports/qt5-canvas3d/portfile.cmake | 1 + ports/qt5-doc/portfile.cmake | 4 ++++ ports/qt5-translations/portfile.cmake | 1 + ports/qt5-wayland/portfile.cmake | 4 ++++ ports/qt5-webengine/portfile.cmake | 3 ++- ports/qt5-webglplugin/portfile.cmake | 1 + ports/qt5/CONTROL | 2 +- scripts/ci.baseline.txt | 18 ++++++++++++++++++ 9 files changed, 35 insertions(+), 5 deletions(-) diff --git a/ports/qt5-base/cmake/qt_port_hashes.cmake b/ports/qt5-base/cmake/qt_port_hashes.cmake index 564a678990b708..fd73c589e100da 100644 --- a/ports/qt5-base/cmake/qt_port_hashes.cmake +++ b/ports/qt5-base/cmake/qt_port_hashes.cmake @@ -19,8 +19,8 @@ set(QT_HASH_qt5-gamepad a7d3cc74e9a0b269acadfd5faa2a72ef3132762c51c3 set(QT_HASH_qt5-graphicaleffects fd6b59198e834a9e36e58445055610ac6dcfcb96d405d2dc294e0397460d6fdd119cfd4b0f29f43009154d623071dcb335223e33872fbfb5b6004abe9b6f5a55) set(QT_HASH_qt5-imageformats 1d721969bdb64b9674ecde992424e02997f051422d8d762d0e7930ae549792d1152751398ee2a906055da9d26df02d93f565d82a2e80a2659dcbd3ad347b4727) set(QT_HASH_qt5-location e82673e56f648a675df36c32a73217bf49b309a356c0de9e4defe14c3070d1d482d797fc11adca632edb59af9993f92e562dc5cb44dbcbad677ac3980c35676c) -set(QT_HASH_qt5-macextras 00) -set(QT_HASH_qt5-mqtt 00) +set(QT_HASH_qt5-macextras 3b5be4a929fef28061f195ad5aad2eafa9e5a3e03f405f8d3bf9eb5bfe66443d90a4d6ff6081a3cc1557017b896f70f617d828c874414572477d7950167291de ) +set(QT_HASH_qt5-mqtt 83c105ef7c4ccdb87cb2fa8d35da32ef6be32aeb57f6ec2b0176e9e565a7d8dd8989727e03b5c982073b63a752d39a865eeaa62a82d3cfaa22bfef60978cdef0 ) set(QT_HASH_qt5-multimedia 25bce2851190cc4df47432c8ddee831fe9ea172f4a612a18bde6b1ce8c0f0fdc09ca0e484dad9e2d8659bfe0c84e2801a84c7f75d32976a5a9cdf1ba9e871f3c) set(QT_HASH_qt5-networkauth 484724ce60975c74e737c082f08dfc889e327618ca8efa83ed47b940ae515c836db9fd78ba67e930d27a1c1cd91cb14bdc055500c287c2e9853ddcfe1e1c43a6) set(QT_HASH_qt5-purchasing 08f2e97acab278e5fd53ef5ec9f3c9e15d3bf9d412f8d83ef4a0ab16619b4cc46940ee9ba5a770db98e79c4fbad24fca55d50de78ce3c30162ac6fb3ebf2d4c0) @@ -43,7 +43,7 @@ set(QT_HASH_qt5-xmlpatterns f228c9c20b5aa00fc4f0e6918a53b780f10d58288c2a ##TODO set(QT_HASH_qt5-doc 0b3b2aa09429b7a20dd9704de5dc51392937e57949873088e33d54e41e05bebb17f95a57bb852bc510977eff0deba6453c115b7fb5e7021f4e182aa0c15474c0) set(QT_HASH_qt5-x11extras 1cf6b82fd884c88c941fc5d1a1bcc1e3da50fd1252c83c23c72411cbc7a9d81ff5b363175908b30927718706bc40a03b0cc9e64a96e91544e0a40af2c4144afd) -set(QT_HASH_qt5-androidextras 00) +set(QT_HASH_qt5-androidextras d2bdef84b0749d921fa2f71aef15b91ccafe40f6edfe9d47b7999072b3b8c5e7a143c91a6e96c14933c13b91ebbc657c287716db0efcb1da2b7ccb2ed239384d) set(QT_HASH_qt5-canvas3d 7f8374a98b4cd9e463ccfa29697f3b77c9b505953730c668ee4cb1cfc45d26a7c5c7a102a2779f70174a13333a91f5a3f6df096bf55ceb17258548ec86048794) set(QT_HASH_qt5-translations 6a4af59d916f060d726acfaf12e23c09adc73243f1f38bd3cb76a7d688dcb78b69ced6606dce2615a1ebdec09d210547d51975d0678d092cb61153551b1f6fff) set(QT_HASH_qt5-serialbus 66230ca95cb86bd3408dfa79236e37c350f4df8be8886d8f6206f0822068a05a24bfd3e29e5a5cc3c3cdd9f437d4609e5ee2c3fc7c4813117a1bb349a873dfb0) diff --git a/ports/qt5-canvas3d/portfile.cmake b/ports/qt5-canvas3d/portfile.cmake index 214726759f3cf1..d473c56257aced 100644 --- a/ports/qt5-canvas3d/portfile.cmake +++ b/ports/qt5-canvas3d/portfile.cmake @@ -1,2 +1,3 @@ +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) qt_submodule_installation() \ No newline at end of file diff --git a/ports/qt5-doc/portfile.cmake b/ports/qt5-doc/portfile.cmake index 214726759f3cf1..062eed423e06f0 100644 --- a/ports/qt5-doc/portfile.cmake +++ b/ports/qt5-doc/portfile.cmake @@ -1,2 +1,6 @@ +if(VCPKG_TARGET_IS_WINDOWS) + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + message(STATUS "${PORT} will not build any artifacts on Windows!") +endif() include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) qt_submodule_installation() \ No newline at end of file diff --git a/ports/qt5-translations/portfile.cmake b/ports/qt5-translations/portfile.cmake index 214726759f3cf1..d473c56257aced 100644 --- a/ports/qt5-translations/portfile.cmake +++ b/ports/qt5-translations/portfile.cmake @@ -1,2 +1,3 @@ +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) qt_submodule_installation() \ No newline at end of file diff --git a/ports/qt5-wayland/portfile.cmake b/ports/qt5-wayland/portfile.cmake index 214726759f3cf1..a9d16989ea4643 100644 --- a/ports/qt5-wayland/portfile.cmake +++ b/ports/qt5-wayland/portfile.cmake @@ -1,2 +1,6 @@ +#Will not build on Windows! +message(WARNING "This port is just a placeholder until the required wayland libraries have been added into VCPKG! \ + As such the build will most likely fail until your system has the required wayland libraries installed (untested)") + include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) qt_submodule_installation() \ No newline at end of file diff --git a/ports/qt5-webengine/portfile.cmake b/ports/qt5-webengine/portfile.cmake index d216207b1fd04a..f1f1301760c3ff 100644 --- a/ports/qt5-webengine/portfile.cmake +++ b/ports/qt5-webengine/portfile.cmake @@ -1,5 +1,6 @@ -include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) +include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) vcpkg_find_acquire_program(FLEX) vcpkg_find_acquire_program(BISON) diff --git a/ports/qt5-webglplugin/portfile.cmake b/ports/qt5-webglplugin/portfile.cmake index 214726759f3cf1..d473c56257aced 100644 --- a/ports/qt5-webglplugin/portfile.cmake +++ b/ports/qt5-webglplugin/portfile.cmake @@ -1,2 +1,3 @@ +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) qt_submodule_installation() \ No newline at end of file diff --git a/ports/qt5/CONTROL b/ports/qt5/CONTROL index d9310aa6dce41a..9381802b62be4d 100644 --- a/ports/qt5/CONTROL +++ b/ports/qt5/CONTROL @@ -18,7 +18,7 @@ Build-Depends: qt5[3d, webchannel, websockets, extras, sensors, serialport, spee Description: Build the essential qt modules Feature: all -Build-Depends: qt5[3d, webchannel, websockets, extras, xmlpatterns, sensors, serialport, speech, svg, tools, virtualkeyboard, networkauth, purchasing, quickcontrols, quickcontrols2, script, scxml, activeqt, charts, datavis3d, declarative, gamepad, graphicaleffects, imageformats, location, multimedia, mqtt, webglplugin, webview, wayland, webengine, serialbus, translations, doc, remoteobjects, connectivity, canvas3d] +Build-Depends: qt5[3d, webchannel, websockets, extras, xmlpatterns, sensors, serialport, speech, svg, tools, virtualkeyboard, networkauth, purchasing, quickcontrols, quickcontrols2, script, scxml, activeqt, charts, datavis3d, declarative, gamepad, graphicaleffects, imageformats, location, multimedia, mqtt, webglplugin, webview, serialbus, translations, doc, remoteobjects, connectivity, canvas3d], qt5[webengine] (!static), qt5[wayland] (!windows) Description: Install all Qt5 submodules (Warning: Could take a long time and fail...) Feature: extras diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index d6f35a90b63808..d0fec2b4b45ff6 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1421,12 +1421,30 @@ qscintilla:x64-linux=fail #unsupported platforms/systems qt5-activeqt:x64-linux=skip qt5-activeqt:x64-osx=skip +qt5-androidextras:x64-windows=skip +qt5-androidextras:x64-windows-static=skip +qt5-androidextras:x86-windows=skip +qt5-androidextras:x64-osx=skip qt5-macextras:x64-linux=skip qt5-macextras:x64-windows=skip qt5-macextras:x64-windows-static=skip qt5-macextras:x86-windows=skip qt5-winextras:x64-linux=skip qt5-winextras:x64-osx=skip +qt5-x11extras:x64-windows=skip +qt5-x11extras:x64-windows-static=skip +qt5-x11extras:x86-windows=skip +qt5-x11extras:x64-osx=fail +#Does not build anything on windows +qt5-doc:x64-windows=skip +qt5-doc:x64-windows-static=skip +qt5-doc:x86-windows=skip +#Wayland libraries are not yet in VCPKG so this port is just a placeholder +qt5-wayland:x64-windows=skip +qt5-wayland:x64-windows-static=skip +qt5-wayland:x86-windows=skip +qt5-wayland:x64-linux=fail +qt5-wayland:x64-osx=fail quickfast:x64-linux=ignore quickfix:x64-linux=ignore quickfix:x64-windows=ignore From 19cc23c6ff5dd8dfcd63978ae859eb59d7dcdffe Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 31 Jan 2020 21:37:16 +0100 Subject: [PATCH 302/419] fix linux qt targets not having debug properties. --- ports/qt5-base/patches/Qt5BasicConfig.patch | 24 ++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/ports/qt5-base/patches/Qt5BasicConfig.patch b/ports/qt5-base/patches/Qt5BasicConfig.patch index d113fb6695bee1..75a0142f361812 100644 --- a/ports/qt5-base/patches/Qt5BasicConfig.patch +++ b/ports/qt5-base/patches/Qt5BasicConfig.patch @@ -29,7 +29,18 @@ index c72989288..a88234dca 100644 !!ELSE set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") !!ENDIF -@@ -270,9 +278,8 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -265,14 +265,19 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + !!IF !isEmpty(CMAKE_RELEASE_TYPE) + !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) + _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" ) ++ if(EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\") ++ _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) ++ endif() + !!ELSE + _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) ++ if(EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\") ++ _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) ++ endif() !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) @@ -76,3 +87,14 @@ index c72989288..a88234dca 100644 !!ELSE set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") !!ENDIF +@@ -482,6 +482,9 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) + !!ENDIF + _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) ++ if(EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\") ++ _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) ++ endif() + !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD + endif() + !!ENDIF // CMAKE_RELEASE_TYPE + \ No newline at end of file From d8ad806e72b7a0f24e0d11ee89be9f8d0d316429 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 31 Jan 2020 21:38:29 +0100 Subject: [PATCH 303/419] remove most of the wrapper --- ports/qt5-base/vcpkg-cmake-wrapper.cmake | 72 ++++++------------------ 1 file changed, 17 insertions(+), 55 deletions(-) diff --git a/ports/qt5-base/vcpkg-cmake-wrapper.cmake b/ports/qt5-base/vcpkg-cmake-wrapper.cmake index 3e22f087c111bf..bf4c108a8bb0c3 100644 --- a/ports/qt5-base/vcpkg-cmake-wrapper.cmake +++ b/ports/qt5-base/vcpkg-cmake-wrapper.cmake @@ -17,63 +17,25 @@ endfunction() get_target_property(_target_type Qt5::Core TYPE) if("${_target_type}" STREQUAL "STATIC_LIBRARY") - find_package(ZLIB) - find_package(JPEG) - find_package(PNG) - find_package(Freetype) - find_package(sqlite3 CONFIG) - find_package(PostgreSQL MODULE REQUIRED) - find_package(double-conversion CONFIG) - find_package(OpenSSL) - find_package(harfbuzz CONFIG) - - set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES - ZLIB::ZLIB JPEG::JPEG PNG::PNG Freetype::Freetype sqlite3 harfbuzz::harfbuzz - double-conversion::double-conversion OpenSSL::SSL OpenSSL::Crypto PostgreSQL::PostgreSQL - ) - - add_qt_library(Qt5::Core - pcre2-16 - icuin icui18n - icutu icuuc icuio - icudt icudata - Qt5ThemeSupport - Qt5EventDispatcherSupport - Qt5PlatformCompositorSupport - Qt5FontDatabaseSupport) - - if(MSVC) - set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES - Netapi32.lib Ws2_32.lib Mincore.lib Winmm.lib Iphlpapi.lib Wtsapi32.lib Dwmapi.lib Imm32.lib) - - add_qt_library(Qt5::Core Qt5WindowsUIAutomationSupport qwindows qdirect2d) + if(WIN32) elseif(UNIX AND NOT APPLE) - add_qt_library(Qt5::Core - Qt5GraphicsSupport - Qt5ClipboardSupport - Qt5AccessibilitySupport) elseif(APPLE) - set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES - "-weak_framework DiskArbitration" "-weak_framework IOKit" "-weak_framework Foundation" "-weak_framework CoreServices" - "-weak_framework AppKit" "-weak_framework Security" "-weak_framework ApplicationServices" - "-weak_framework CoreFoundation" "-weak_framework SystemConfiguration" - "-weak_framework Carbon" - "-weak_framework QuartzCore" - "-weak_framework CoreVideo" - "-weak_framework Metal" - "-weak_framework CoreText" - "-weak_framework ApplicationServices" - "-weak_framework CoreGraphics" - "-weak_framework OpenGL" - "-weak_framework AGL" - "-weak_framework ImageIO" - "z" "m" - cups) - add_qt_library(Qt5::Core - Qt5GraphicsSupport - Qt5ClipboardSupport - Qt5AccessibilitySupport - qcocoa) + # set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES + # "-weak_framework DiskArbitration" "-weak_framework IOKit" "-weak_framework Foundation" "-weak_framework CoreServices" + # "-weak_framework AppKit" "-weak_framework Security" "-weak_framework ApplicationServices" + # "-weak_framework CoreFoundation" "-weak_framework SystemConfiguration" + # "-weak_framework Carbon" + # "-weak_framework QuartzCore" + # "-weak_framework CoreVideo" + # "-weak_framework Metal" + # "-weak_framework CoreText" + # "-weak_framework ApplicationServices" + # "-weak_framework CoreGraphics" + # "-weak_framework OpenGL" + # "-weak_framework AGL" + # "-weak_framework ImageIO" + # "z" "m" + # cups) endif() endif() From 2eafdbafede88f1c75193e3564abf141c3934d22 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 31 Jan 2020 22:58:47 +0100 Subject: [PATCH 304/419] update deps --- ports/xdmcp/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/xdmcp/CONTROL b/ports/xdmcp/CONTROL index 890ad1a37502f5..0cf1ab5d211022 100644 --- a/ports/xdmcp/CONTROL +++ b/ports/xdmcp/CONTROL @@ -2,4 +2,4 @@ Source: xdmcp Version: 1.1.3 Homepage: https://gitlab.freedesktop.org/xorg/lib/libxdmcp Description: X Display Manager Control Protocol library -Build-Depends: xorg-macros, bzip2 \ No newline at end of file +Build-Depends: xorg-macros, bzip2, xproto \ No newline at end of file From 9346e61307701bea69c174f78fcba2a9b3dbe267 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 31 Jan 2020 22:58:57 +0100 Subject: [PATCH 305/419] ws change to force rebuild of x libraries --- ports/xorg-macros/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/xorg-macros/CONTROL b/ports/xorg-macros/CONTROL index 78fd48fcdb6748..9d4ef3258062b0 100644 --- a/ports/xorg-macros/CONTROL +++ b/ports/xorg-macros/CONTROL @@ -1,4 +1,4 @@ Source: xorg-macros -Version: 1.19.2 +Version: 1.19.2-1 Homepage: https://xcb.freedesktop.org/ Description: X.org macros utilities. From 55fcfec4817ec223e93bfb0be6a4776c7c2b5efc Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 31 Jan 2020 23:43:30 +0100 Subject: [PATCH 306/419] cleanup and moved every *.pc to (debug)/lib/pkgconfig --- ports/pthread-stubs/portfile.cmake | 1 - ports/sm/portfile.cmake | 1 - ports/xau/portfile.cmake | 1 - ports/xcb-image/portfile.cmake | 1 - ports/xcb-keysyms/portfile.cmake | 35 --------------- ports/xcb-proto/portfile.cmake | 42 ------------------ ports/xcb-render-util/portfile.cmake | 35 --------------- ports/xcb-util/portfile.cmake | 35 --------------- ports/xcb-wm/portfile.cmake | 35 --------------- ports/xcb/portfile.cmake | 46 -------------------- ports/xdmcp/portfile.cmake | 1 - ports/xext/portfile.cmake | 53 ----------------------- ports/xfixes/portfile.cmake | 53 ----------------------- ports/xi/portfile.cmake | 52 ---------------------- ports/xkbcommon/portfile.cmake | 13 +++--- ports/xlib/portfile.cmake | 52 ---------------------- ports/xmu/portfile.cmake | 1 - ports/xorg-macros/portfile.cmake | 43 +++--------------- ports/xproto/portfile.cmake | 62 +++----------------------- ports/xrender/portfile.cmake | 52 ---------------------- ports/xt/portfile.cmake | 1 - ports/xtrans/portfile.cmake | 65 ++++------------------------ 22 files changed, 28 insertions(+), 652 deletions(-) diff --git a/ports/pthread-stubs/portfile.cmake b/ports/pthread-stubs/portfile.cmake index d3e40c110b3661..f0ecd514a6a015 100644 --- a/ports/pthread-stubs/portfile.cmake +++ b/ports/pthread-stubs/portfile.cmake @@ -24,7 +24,6 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS "${CURRENT_INSTALLED_DIR}/share/xorg/pkgconfig/" PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" ) diff --git a/ports/sm/portfile.cmake b/ports/sm/portfile.cmake index c1b23c5d16d7c9..9bced21a1cc419 100644 --- a/ports/sm/portfile.cmake +++ b/ports/sm/portfile.cmake @@ -23,7 +23,6 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS "${CURRENT_INSTALLED_DIR}/share/xorg/pkgconfig/" PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" ) diff --git a/ports/xau/portfile.cmake b/ports/xau/portfile.cmake index c38c6b4533dba2..e91808801a96b2 100644 --- a/ports/xau/portfile.cmake +++ b/ports/xau/portfile.cmake @@ -23,7 +23,6 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS "${CURRENT_INSTALLED_DIR}/share/xorg/pkgconfig/" PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" ) diff --git a/ports/xcb-image/portfile.cmake b/ports/xcb-image/portfile.cmake index d03207198e4b3e..fcf0a9536a4868 100644 --- a/ports/xcb-image/portfile.cmake +++ b/ports/xcb-image/portfile.cmake @@ -22,7 +22,6 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS "${CURRENT_INSTALLED_DIR}/share/xorg/pkgconfig/" PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" ) diff --git a/ports/xcb-keysyms/portfile.cmake b/ports/xcb-keysyms/portfile.cmake index d9e24a9589e054..eb26b9e2f2904a 100644 --- a/ports/xcb-keysyms/portfile.cmake +++ b/ports/xcb-keysyms/portfile.cmake @@ -1,37 +1,3 @@ -# Common Ambient Variables: -# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} -# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} -# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} -# CURRENT_INSTALLED_DIR = ${VCPKG_ROOT_DIR}\installed\${TRIPLET} -# DOWNLOADS = ${VCPKG_ROOT_DIR}\downloads -# PORT = current port name (zlib, etc) -# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) -# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) -# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) -# VCPKG_ROOT_DIR = -# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) -# VCPKG_TOOLCHAIN = ON OFF -# TRIPLET_SYSTEM_ARCH = arm x86 x64 -# BUILD_ARCH = "Win32" "x64" "ARM" -# MSBUILD_PLATFORM = "Win32"/"x64"/${TRIPLET_SYSTEM_ARCH} -# DEBUG_CONFIG = "Debug Static" "Debug Dll" -# RELEASE_CONFIG = "Release Static"" "Release DLL" -# VCPKG_TARGET_IS_WINDOWS -# VCPKG_TARGET_IS_UWP -# VCPKG_TARGET_IS_LINUX -# VCPKG_TARGET_IS_OSX -# VCPKG_TARGET_IS_FREEBSD -# VCPKG_TARGET_IS_ANDROID -# VCPKG_TARGET_IS_MINGW -# VCPKG_TARGET_EXECUTABLE_SUFFIX -# VCPKG_TARGET_STATIC_LIBRARY_SUFFIX -# VCPKG_TARGET_SHARED_LIBRARY_SUFFIX -# -# See additional helpful variables in /docs/maintainers/vcpkg_common_definitions.md - -# # Specifies if the port install should fail immediately given a condition -# vcpkg_fail_port_install(MESSAGE "Xlib currently only supports Linux and Mac platforms" ON_TARGET "Windows") -vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Linux and Mac platforms" ON_TARGET "Windows") ## requires AUTOCONF, LIBTOOL and PKCONF vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org/xorg @@ -56,7 +22,6 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS "${CURRENT_INSTALLED_DIR}/share/xorg/pkgconfig/" PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" ) diff --git a/ports/xcb-proto/portfile.cmake b/ports/xcb-proto/portfile.cmake index 53ec82bda42a69..1dfaa6cc2e3e7a 100644 --- a/ports/xcb-proto/portfile.cmake +++ b/ports/xcb-proto/portfile.cmake @@ -1,38 +1,3 @@ -# Common Ambient Variables: -# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} -# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} -# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} -# CURRENT_INSTALLED_DIR = ${VCPKG_ROOT_DIR}\installed\${TRIPLET} -# DOWNLOADS = ${VCPKG_ROOT_DIR}\downloads -# PORT = current port name (zlib, etc) -# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) -# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) -# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) -# VCPKG_ROOT_DIR = -# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) -# VCPKG_TOOLCHAIN = ON OFF -# TRIPLET_SYSTEM_ARCH = arm x86 x64 -# BUILD_ARCH = "Win32" "x64" "ARM" -# MSBUILD_PLATFORM = "Win32"/"x64"/${TRIPLET_SYSTEM_ARCH} -# DEBUG_CONFIG = "Debug Static" "Debug Dll" -# RELEASE_CONFIG = "Release Static"" "Release DLL" -# VCPKG_TARGET_IS_WINDOWS -# VCPKG_TARGET_IS_UWP -# VCPKG_TARGET_IS_LINUX -# VCPKG_TARGET_IS_OSX -# VCPKG_TARGET_IS_FREEBSD -# VCPKG_TARGET_IS_ANDROID -# VCPKG_TARGET_IS_MINGW -# VCPKG_TARGET_EXECUTABLE_SUFFIX -# VCPKG_TARGET_STATIC_LIBRARY_SUFFIX -# VCPKG_TARGET_SHARED_LIBRARY_SUFFIX -# -# See additional helpful variables in /docs/maintainers/vcpkg_common_definitions.md - -# # Specifies if the port install should fail immediately given a condition -# vcpkg_fail_port_install(MESSAGE "Xlib currently only supports Linux and Mac platforms" ON_TARGET "Windows") -vcpkg_fail_port_install(MESSAGE "Xlib currently only supports Linux and Mac platforms" ON_TARGET "Windows") - ## requires AUTOCONF, LIBTOOL and PKCONF message(STATUS "----- ${PORT} requires autoconf, libtool, pkconf and xmllint from the system package manager! -----") @@ -71,7 +36,6 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS "${CURRENT_INSTALLED_DIR}/share/xorg/pkgconfig/" PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" ) @@ -89,12 +53,6 @@ file(WRITE "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/xcb-proto.pc" "${_conten file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -# # Moves all .cmake files from /debug/share/Xlib/ to /share/Xlib/ -# # See /docs/maintainers/vcpkg_fixup_cmake_targets.md for more details -# vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/Xlib) - # # Handle copyright file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -# # Post-build test for cmake libraries -# vcpkg_test_cmake(PACKAGE_NAME Xlib) diff --git a/ports/xcb-render-util/portfile.cmake b/ports/xcb-render-util/portfile.cmake index d84bc19bafaba2..2a83d51b9f1f31 100644 --- a/ports/xcb-render-util/portfile.cmake +++ b/ports/xcb-render-util/portfile.cmake @@ -1,37 +1,3 @@ -# Common Ambient Variables: -# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} -# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} -# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} -# CURRENT_INSTALLED_DIR = ${VCPKG_ROOT_DIR}\installed\${TRIPLET} -# DOWNLOADS = ${VCPKG_ROOT_DIR}\downloads -# PORT = current port name (zlib, etc) -# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) -# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) -# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) -# VCPKG_ROOT_DIR = -# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) -# VCPKG_TOOLCHAIN = ON OFF -# TRIPLET_SYSTEM_ARCH = arm x86 x64 -# BUILD_ARCH = "Win32" "x64" "ARM" -# MSBUILD_PLATFORM = "Win32"/"x64"/${TRIPLET_SYSTEM_ARCH} -# DEBUG_CONFIG = "Debug Static" "Debug Dll" -# RELEASE_CONFIG = "Release Static"" "Release DLL" -# VCPKG_TARGET_IS_WINDOWS -# VCPKG_TARGET_IS_UWP -# VCPKG_TARGET_IS_LINUX -# VCPKG_TARGET_IS_OSX -# VCPKG_TARGET_IS_FREEBSD -# VCPKG_TARGET_IS_ANDROID -# VCPKG_TARGET_IS_MINGW -# VCPKG_TARGET_EXECUTABLE_SUFFIX -# VCPKG_TARGET_STATIC_LIBRARY_SUFFIX -# VCPKG_TARGET_SHARED_LIBRARY_SUFFIX -# -# See additional helpful variables in /docs/maintainers/vcpkg_common_definitions.md - -# # Specifies if the port install should fail immediately given a condition -# vcpkg_fail_port_install(MESSAGE "Xlib currently only supports Linux and Mac platforms" ON_TARGET "Windows") -vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Linux and Mac platforms" ON_TARGET "Windows") ## requires AUTOCONF, LIBTOOL and PKCONF vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org/xorg @@ -56,7 +22,6 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS "${CURRENT_INSTALLED_DIR}/share/xorg/pkgconfig/" PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" ) diff --git a/ports/xcb-util/portfile.cmake b/ports/xcb-util/portfile.cmake index 4d5b93b9761625..90f276f7147093 100644 --- a/ports/xcb-util/portfile.cmake +++ b/ports/xcb-util/portfile.cmake @@ -1,37 +1,3 @@ -# Common Ambient Variables: -# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} -# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} -# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} -# CURRENT_INSTALLED_DIR = ${VCPKG_ROOT_DIR}\installed\${TRIPLET} -# DOWNLOADS = ${VCPKG_ROOT_DIR}\downloads -# PORT = current port name (zlib, etc) -# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) -# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) -# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) -# VCPKG_ROOT_DIR = -# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) -# VCPKG_TOOLCHAIN = ON OFF -# TRIPLET_SYSTEM_ARCH = arm x86 x64 -# BUILD_ARCH = "Win32" "x64" "ARM" -# MSBUILD_PLATFORM = "Win32"/"x64"/${TRIPLET_SYSTEM_ARCH} -# DEBUG_CONFIG = "Debug Static" "Debug Dll" -# RELEASE_CONFIG = "Release Static"" "Release DLL" -# VCPKG_TARGET_IS_WINDOWS -# VCPKG_TARGET_IS_UWP -# VCPKG_TARGET_IS_LINUX -# VCPKG_TARGET_IS_OSX -# VCPKG_TARGET_IS_FREEBSD -# VCPKG_TARGET_IS_ANDROID -# VCPKG_TARGET_IS_MINGW -# VCPKG_TARGET_EXECUTABLE_SUFFIX -# VCPKG_TARGET_STATIC_LIBRARY_SUFFIX -# VCPKG_TARGET_SHARED_LIBRARY_SUFFIX -# -# See additional helpful variables in /docs/maintainers/vcpkg_common_definitions.md - -# # Specifies if the port install should fail immediately given a condition -# vcpkg_fail_port_install(MESSAGE "Xlib currently only supports Linux and Mac platforms" ON_TARGET "Windows") -vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Linux and Mac platforms" ON_TARGET "Windows") ## requires AUTOCONF, LIBTOOL and PKCONF vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org/xorg @@ -57,7 +23,6 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS "${CURRENT_INSTALLED_DIR}/share/xorg/pkgconfig/" PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" ) diff --git a/ports/xcb-wm/portfile.cmake b/ports/xcb-wm/portfile.cmake index 8b631d51c4d28c..004bec2daa8549 100644 --- a/ports/xcb-wm/portfile.cmake +++ b/ports/xcb-wm/portfile.cmake @@ -1,37 +1,3 @@ -# Common Ambient Variables: -# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} -# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} -# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} -# CURRENT_INSTALLED_DIR = ${VCPKG_ROOT_DIR}\installed\${TRIPLET} -# DOWNLOADS = ${VCPKG_ROOT_DIR}\downloads -# PORT = current port name (zlib, etc) -# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) -# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) -# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) -# VCPKG_ROOT_DIR = -# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) -# VCPKG_TOOLCHAIN = ON OFF -# TRIPLET_SYSTEM_ARCH = arm x86 x64 -# BUILD_ARCH = "Win32" "x64" "ARM" -# MSBUILD_PLATFORM = "Win32"/"x64"/${TRIPLET_SYSTEM_ARCH} -# DEBUG_CONFIG = "Debug Static" "Debug Dll" -# RELEASE_CONFIG = "Release Static"" "Release DLL" -# VCPKG_TARGET_IS_WINDOWS -# VCPKG_TARGET_IS_UWP -# VCPKG_TARGET_IS_LINUX -# VCPKG_TARGET_IS_OSX -# VCPKG_TARGET_IS_FREEBSD -# VCPKG_TARGET_IS_ANDROID -# VCPKG_TARGET_IS_MINGW -# VCPKG_TARGET_EXECUTABLE_SUFFIX -# VCPKG_TARGET_STATIC_LIBRARY_SUFFIX -# VCPKG_TARGET_SHARED_LIBRARY_SUFFIX -# -# See additional helpful variables in /docs/maintainers/vcpkg_common_definitions.md - -# # Specifies if the port install should fail immediately given a condition -# vcpkg_fail_port_install(MESSAGE "Xlib currently only supports Linux and Mac platforms" ON_TARGET "Windows") -vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Linux and Mac platforms" ON_TARGET "Windows") ## requires AUTOCONF, LIBTOOL and PKCONF vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org/xorg @@ -56,7 +22,6 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS "${CURRENT_INSTALLED_DIR}/share/xorg/pkgconfig/" PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" ) diff --git a/ports/xcb/portfile.cmake b/ports/xcb/portfile.cmake index 92e704814256a5..21a433a6bc043e 100644 --- a/ports/xcb/portfile.cmake +++ b/ports/xcb/portfile.cmake @@ -1,38 +1,3 @@ -# Common Ambient Variables: -# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} -# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} -# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} -# CURRENT_INSTALLED_DIR = ${VCPKG_ROOT_DIR}\installed\${TRIPLET} -# DOWNLOADS = ${VCPKG_ROOT_DIR}\downloads -# PORT = current port name (zlib, etc) -# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) -# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) -# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) -# VCPKG_ROOT_DIR = -# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) -# VCPKG_TOOLCHAIN = ON OFF -# TRIPLET_SYSTEM_ARCH = arm x86 x64 -# BUILD_ARCH = "Win32" "x64" "ARM" -# MSBUILD_PLATFORM = "Win32"/"x64"/${TRIPLET_SYSTEM_ARCH} -# DEBUG_CONFIG = "Debug Static" "Debug Dll" -# RELEASE_CONFIG = "Release Static"" "Release DLL" -# VCPKG_TARGET_IS_WINDOWS -# VCPKG_TARGET_IS_UWP -# VCPKG_TARGET_IS_LINUX -# VCPKG_TARGET_IS_OSX -# VCPKG_TARGET_IS_FREEBSD -# VCPKG_TARGET_IS_ANDROID -# VCPKG_TARGET_IS_MINGW -# VCPKG_TARGET_EXECUTABLE_SUFFIX -# VCPKG_TARGET_STATIC_LIBRARY_SUFFIX -# VCPKG_TARGET_SHARED_LIBRARY_SUFFIX -# -# See additional helpful variables in /docs/maintainers/vcpkg_common_definitions.md - -# # Specifies if the port install should fail immediately given a condition -# vcpkg_fail_port_install(MESSAGE "Xlib currently only supports Linux and Mac platforms" ON_TARGET "Windows") -vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Linux and Mac platforms" ON_TARGET "Windows") - ## requires AUTOCONF, LIBTOOL and PKCONF vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org/xorg @@ -46,16 +11,6 @@ vcpkg_from_gitlab( set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") -#set(PKG_PATHS "$ENV{PKG_CONFIG_PATH}") -#set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${CURRENT_INSTALLED_DIR}/share/xorg/pkgconfig/:${CURRENT_INSTALLED_DIR}/lib/pkgconfig/") -#Alternatively, you may set the environment variables XCBPROTO_CFLAGS -#and XCBPROTO_LIBS to avoid the need to call pkg-config. -#See the pkg-config man page for more details. -#Package xcb-proto was not found in the pkg-config search path. -#Perhaps you should add the directory containing `xcb-proto.pc' -#to the PKG_CONFIG_PATH environment variable -#Package 'xcb-proto', required by 'world', not found - vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} AUTOCONFIG @@ -67,7 +22,6 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS "${CURRENT_INSTALLED_DIR}/share/xorg/pkgconfig/" PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" ) diff --git a/ports/xdmcp/portfile.cmake b/ports/xdmcp/portfile.cmake index 22b3bd3a6899ca..757f31373f329a 100644 --- a/ports/xdmcp/portfile.cmake +++ b/ports/xdmcp/portfile.cmake @@ -23,7 +23,6 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS "${CURRENT_INSTALLED_DIR}/share/xorg/pkgconfig/" PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" ) diff --git a/ports/xext/portfile.cmake b/ports/xext/portfile.cmake index fa9d799294bfed..06d894615920a2 100644 --- a/ports/xext/portfile.cmake +++ b/ports/xext/portfile.cmake @@ -1,51 +1,6 @@ -# Common Ambient Variables: -# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} -# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} -# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} -# CURRENT_INSTALLED_DIR = ${VCPKG_ROOT_DIR}\installed\${TRIPLET} -# DOWNLOADS = ${VCPKG_ROOT_DIR}\downloads -# PORT = current port name (zlib, etc) -# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) -# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) -# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) -# VCPKG_ROOT_DIR = -# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) -# VCPKG_TOOLCHAIN = ON OFF -# TRIPLET_SYSTEM_ARCH = arm x86 x64 -# BUILD_ARCH = "Win32" "x64" "ARM" -# MSBUILD_PLATFORM = "Win32"/"x64"/${TRIPLET_SYSTEM_ARCH} -# DEBUG_CONFIG = "Debug Static" "Debug Dll" -# RELEASE_CONFIG = "Release Static"" "Release DLL" -# VCPKG_TARGET_IS_WINDOWS -# VCPKG_TARGET_IS_UWP -# VCPKG_TARGET_IS_LINUX -# VCPKG_TARGET_IS_OSX -# VCPKG_TARGET_IS_FREEBSD -# VCPKG_TARGET_IS_ANDROID -# VCPKG_TARGET_IS_MINGW -# VCPKG_TARGET_EXECUTABLE_SUFFIX -# VCPKG_TARGET_STATIC_LIBRARY_SUFFIX -# VCPKG_TARGET_SHARED_LIBRARY_SUFFIX -# -# See additional helpful variables in /docs/maintainers/vcpkg_common_definitions.md - -# # Specifies if the port install should fail immediately given a condition -# vcpkg_fail_port_install(MESSAGE "Xlib currently only supports Linux and Mac platforms" ON_TARGET "Windows") -vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Linux and Mac platforms" ON_TARGET "Windows") - ## requires AUTOCONF, LIBTOOL and PKCONF message(STATUS "${PORT} requires autoconf, libtool and pkconf from the system package manager!") -#vcpkg_from_gitlab( -# GITLAB_URL https://gitlab.freedesktop.org/xorg -# OUT_SOURCE_PATH SOURCE_XTRANS -# REPO lib/libxtrans -# REF c4262efc9688e495261d8b23a12f956ab38e006f #v1.4 -# SHA512 137f0ffcae97f2375e5babbf21d336b67e7bf35f6a74377b14f035cdba66992d21f8d90f3c1dc243f8fd3d27d32af36c59af45443db59908969d0d65598865a2 -# HEAD_REF master # branch name -# #PATCHES example.patch #patch name -#) - vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org/xorg OUT_SOURCE_PATH SOURCE_PATH @@ -69,7 +24,6 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS "${CURRENT_INSTALLED_DIR}/share/xorg/pkgconfig/" PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" ) @@ -80,12 +34,5 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -# # Moves all .cmake files from /debug/share/Xlib/ to /share/Xlib/ -# # See /docs/maintainers/vcpkg_fixup_cmake_targets.md for more details -# vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/Xlib) - # # Handle copyright file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - -# # Post-build test for cmake libraries -# vcpkg_test_cmake(PACKAGE_NAME Xlib) diff --git a/ports/xfixes/portfile.cmake b/ports/xfixes/portfile.cmake index f5953ed20ce06c..7c7b510dc09fc4 100644 --- a/ports/xfixes/portfile.cmake +++ b/ports/xfixes/portfile.cmake @@ -1,51 +1,6 @@ -# Common Ambient Variables: -# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} -# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} -# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} -# CURRENT_INSTALLED_DIR = ${VCPKG_ROOT_DIR}\installed\${TRIPLET} -# DOWNLOADS = ${VCPKG_ROOT_DIR}\downloads -# PORT = current port name (zlib, etc) -# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) -# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) -# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) -# VCPKG_ROOT_DIR = -# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) -# VCPKG_TOOLCHAIN = ON OFF -# TRIPLET_SYSTEM_ARCH = arm x86 x64 -# BUILD_ARCH = "Win32" "x64" "ARM" -# MSBUILD_PLATFORM = "Win32"/"x64"/${TRIPLET_SYSTEM_ARCH} -# DEBUG_CONFIG = "Debug Static" "Debug Dll" -# RELEASE_CONFIG = "Release Static"" "Release DLL" -# VCPKG_TARGET_IS_WINDOWS -# VCPKG_TARGET_IS_UWP -# VCPKG_TARGET_IS_LINUX -# VCPKG_TARGET_IS_OSX -# VCPKG_TARGET_IS_FREEBSD -# VCPKG_TARGET_IS_ANDROID -# VCPKG_TARGET_IS_MINGW -# VCPKG_TARGET_EXECUTABLE_SUFFIX -# VCPKG_TARGET_STATIC_LIBRARY_SUFFIX -# VCPKG_TARGET_SHARED_LIBRARY_SUFFIX -# -# See additional helpful variables in /docs/maintainers/vcpkg_common_definitions.md - -# # Specifies if the port install should fail immediately given a condition -# vcpkg_fail_port_install(MESSAGE "Xlib currently only supports Linux and Mac platforms" ON_TARGET "Windows") -vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Linux and Mac platforms" ON_TARGET "Windows") - ## requires AUTOCONF, LIBTOOL and PKCONF message(STATUS "${PORT} requires autoconf, libtool and pkconf from the system package manager!") -#vcpkg_from_gitlab( -# GITLAB_URL https://gitlab.freedesktop.org/xorg -# OUT_SOURCE_PATH SOURCE_XTRANS -# REPO lib/libxtrans -# REF c4262efc9688e495261d8b23a12f956ab38e006f #v1.4 -# SHA512 137f0ffcae97f2375e5babbf21d336b67e7bf35f6a74377b14f035cdba66992d21f8d90f3c1dc243f8fd3d27d32af36c59af45443db59908969d0d65598865a2 -# HEAD_REF master # branch name -# #PATCHES example.patch #patch name -#) - vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org/xorg OUT_SOURCE_PATH SOURCE_PATH @@ -69,7 +24,6 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS "${CURRENT_INSTALLED_DIR}/share/xorg/pkgconfig/" PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" ) @@ -80,12 +34,5 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -# # Moves all .cmake files from /debug/share/Xlib/ to /share/Xlib/ -# # See /docs/maintainers/vcpkg_fixup_cmake_targets.md for more details -# vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/Xlib) - # # Handle copyright file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - -# # Post-build test for cmake libraries -# vcpkg_test_cmake(PACKAGE_NAME Xlib) diff --git a/ports/xi/portfile.cmake b/ports/xi/portfile.cmake index def2c141e4147e..55ba5f50813421 100644 --- a/ports/xi/portfile.cmake +++ b/ports/xi/portfile.cmake @@ -1,51 +1,6 @@ -# Common Ambient Variables: -# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} -# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} -# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} -# CURRENT_INSTALLED_DIR = ${VCPKG_ROOT_DIR}\installed\${TRIPLET} -# DOWNLOADS = ${VCPKG_ROOT_DIR}\downloads -# PORT = current port name (zlib, etc) -# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) -# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) -# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) -# VCPKG_ROOT_DIR = -# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) -# VCPKG_TOOLCHAIN = ON OFF -# TRIPLET_SYSTEM_ARCH = arm x86 x64 -# BUILD_ARCH = "Win32" "x64" "ARM" -# MSBUILD_PLATFORM = "Win32"/"x64"/${TRIPLET_SYSTEM_ARCH} -# DEBUG_CONFIG = "Debug Static" "Debug Dll" -# RELEASE_CONFIG = "Release Static"" "Release DLL" -# VCPKG_TARGET_IS_WINDOWS -# VCPKG_TARGET_IS_UWP -# VCPKG_TARGET_IS_LINUX -# VCPKG_TARGET_IS_OSX -# VCPKG_TARGET_IS_FREEBSD -# VCPKG_TARGET_IS_ANDROID -# VCPKG_TARGET_IS_MINGW -# VCPKG_TARGET_EXECUTABLE_SUFFIX -# VCPKG_TARGET_STATIC_LIBRARY_SUFFIX -# VCPKG_TARGET_SHARED_LIBRARY_SUFFIX -# -# See additional helpful variables in /docs/maintainers/vcpkg_common_definitions.md - -# # Specifies if the port install should fail immediately given a condition -# vcpkg_fail_port_install(MESSAGE "Xlib currently only supports Linux and Mac platforms" ON_TARGET "Windows") -vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Linux and Mac platforms" ON_TARGET "Windows") - ## requires AUTOCONF, LIBTOOL and PKCONF message(STATUS "${PORT} requires autoconf, libtool and pkconf from the system package manager!") -#vcpkg_from_gitlab( -# GITLAB_URL https://gitlab.freedesktop.org/xorg -# OUT_SOURCE_PATH SOURCE_XTRANS -# REPO lib/libxtrans -# REF c4262efc9688e495261d8b23a12f956ab38e006f #v1.4 -# SHA512 137f0ffcae97f2375e5babbf21d336b67e7bf35f6a74377b14f035cdba66992d21f8d90f3c1dc243f8fd3d27d32af36c59af45443db59908969d0d65598865a2 -# HEAD_REF master # branch name -# #PATCHES example.patch #patch name -#) - vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org/xorg OUT_SOURCE_PATH SOURCE_PATH @@ -69,7 +24,6 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS "${CURRENT_INSTALLED_DIR}/share/xorg/pkgconfig/" PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" ) @@ -80,12 +34,6 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -# # Moves all .cmake files from /debug/share/Xlib/ to /share/Xlib/ -# # See /docs/maintainers/vcpkg_fixup_cmake_targets.md for more details -# vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/Xlib) - # # Handle copyright file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -# # Post-build test for cmake libraries -# vcpkg_test_cmake(PACKAGE_NAME Xlib) diff --git a/ports/xkbcommon/portfile.cmake b/ports/xkbcommon/portfile.cmake index 4244a18823c400..fa05e5c2d80e2c 100644 --- a/ports/xkbcommon/portfile.cmake +++ b/ports/xkbcommon/portfile.cmake @@ -15,13 +15,12 @@ vcpkg_from_github( ) vcpkg_configure_meson( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -Denable-wayland=false - -Denable-docs=false - PKG_CONFIG_PATHS "${CURRENT_INSTALLED_DIR}/share/xorg/pkgconfig/" - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -Denable-wayland=false + -Denable-docs=false + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" ) vcpkg_install_meson() vcpkg_fixup_pkgconfig() diff --git a/ports/xlib/portfile.cmake b/ports/xlib/portfile.cmake index 6d23f449420033..a90f5d771197de 100644 --- a/ports/xlib/portfile.cmake +++ b/ports/xlib/portfile.cmake @@ -1,51 +1,6 @@ -# Common Ambient Variables: -# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} -# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} -# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} -# CURRENT_INSTALLED_DIR = ${VCPKG_ROOT_DIR}\installed\${TRIPLET} -# DOWNLOADS = ${VCPKG_ROOT_DIR}\downloads -# PORT = current port name (zlib, etc) -# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) -# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) -# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) -# VCPKG_ROOT_DIR = -# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) -# VCPKG_TOOLCHAIN = ON OFF -# TRIPLET_SYSTEM_ARCH = arm x86 x64 -# BUILD_ARCH = "Win32" "x64" "ARM" -# MSBUILD_PLATFORM = "Win32"/"x64"/${TRIPLET_SYSTEM_ARCH} -# DEBUG_CONFIG = "Debug Static" "Debug Dll" -# RELEASE_CONFIG = "Release Static"" "Release DLL" -# VCPKG_TARGET_IS_WINDOWS -# VCPKG_TARGET_IS_UWP -# VCPKG_TARGET_IS_LINUX -# VCPKG_TARGET_IS_OSX -# VCPKG_TARGET_IS_FREEBSD -# VCPKG_TARGET_IS_ANDROID -# VCPKG_TARGET_IS_MINGW -# VCPKG_TARGET_EXECUTABLE_SUFFIX -# VCPKG_TARGET_STATIC_LIBRARY_SUFFIX -# VCPKG_TARGET_SHARED_LIBRARY_SUFFIX -# -# See additional helpful variables in /docs/maintainers/vcpkg_common_definitions.md - -# # Specifies if the port install should fail immediately given a condition -# vcpkg_fail_port_install(MESSAGE "Xlib currently only supports Linux and Mac platforms" ON_TARGET "Windows") -vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Linux and Mac platforms" ON_TARGET "Windows") - ## requires AUTOCONF, LIBTOOL and PKCONF message(STATUS "${PORT} requires autoconf, libtool and pkconf from the system package manager!") -#vcpkg_from_gitlab( -# GITLAB_URL https://gitlab.freedesktop.org/xorg -# OUT_SOURCE_PATH SOURCE_XTRANS -# REPO lib/libxtrans -# REF c4262efc9688e495261d8b23a12f956ab38e006f #v1.4 -# SHA512 137f0ffcae97f2375e5babbf21d336b67e7bf35f6a74377b14f035cdba66992d21f8d90f3c1dc243f8fd3d27d32af36c59af45443db59908969d0d65598865a2 -# HEAD_REF master # branch name -# #PATCHES example.patch #patch name -#) - vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org/xorg OUT_SOURCE_PATH SOURCE_PATH @@ -69,7 +24,6 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS "${CURRENT_INSTALLED_DIR}/share/xorg/pkgconfig/" PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" ) @@ -80,12 +34,6 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -# # Moves all .cmake files from /debug/share/Xlib/ to /share/Xlib/ -# # See /docs/maintainers/vcpkg_fixup_cmake_targets.md for more details -# vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/Xlib) - # # Handle copyright file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -# # Post-build test for cmake libraries -# vcpkg_test_cmake(PACKAGE_NAME Xlib) diff --git a/ports/xmu/portfile.cmake b/ports/xmu/portfile.cmake index 23199ca8d25fec..145a6e869ab18a 100644 --- a/ports/xmu/portfile.cmake +++ b/ports/xmu/portfile.cmake @@ -23,7 +23,6 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS "${CURRENT_INSTALLED_DIR}/share/xorg/pkgconfig/" PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" ) diff --git a/ports/xorg-macros/portfile.cmake b/ports/xorg-macros/portfile.cmake index ccef60cce1b747..59dd0efa39ca1a 100644 --- a/ports/xorg-macros/portfile.cmake +++ b/ports/xorg-macros/portfile.cmake @@ -1,37 +1,4 @@ -# Common Ambient Variables: -# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} -# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} -# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} -# CURRENT_INSTALLED_DIR = ${VCPKG_ROOT_DIR}\installed\${TRIPLET} -# DOWNLOADS = ${VCPKG_ROOT_DIR}\downloads -# PORT = current port name (zlib, etc) -# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) -# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) -# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) -# VCPKG_ROOT_DIR = -# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) -# VCPKG_TOOLCHAIN = ON OFF -# TRIPLET_SYSTEM_ARCH = arm x86 x64 -# BUILD_ARCH = "Win32" "x64" "ARM" -# MSBUILD_PLATFORM = "Win32"/"x64"/${TRIPLET_SYSTEM_ARCH} -# DEBUG_CONFIG = "Debug Static" "Debug Dll" -# RELEASE_CONFIG = "Release Static"" "Release DLL" -# VCPKG_TARGET_IS_WINDOWS -# VCPKG_TARGET_IS_UWP -# VCPKG_TARGET_IS_LINUX -# VCPKG_TARGET_IS_OSX -# VCPKG_TARGET_IS_FREEBSD -# VCPKG_TARGET_IS_ANDROID -# VCPKG_TARGET_IS_MINGW -# VCPKG_TARGET_EXECUTABLE_SUFFIX -# VCPKG_TARGET_STATIC_LIBRARY_SUFFIX -# VCPKG_TARGET_SHARED_LIBRARY_SUFFIX -# -# See additional helpful variables in /docs/maintainers/vcpkg_common_definitions.md - set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) -# # Specifies if the port install should fail immediately given a condition -vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Linux and Mac platforms" ON_TARGET "Windows") ## requires AUTOCONF, LIBTOOL and PKCONF message(STATUS "----- ${PORT} requires autoconf, libtool and pkconf from the system package manager! -----") @@ -57,6 +24,8 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" ) vcpkg_install_make() @@ -71,8 +40,8 @@ string(REPLACE "${CURRENT_PACKAGES_DIR}" "${CURRENT_INSTALLED_DIR}" _contents "$ string(REPLACE "datarootdir=\${prefix}/share" "datarootdir=\${prefix}/share/xorg" _contents "${_contents}") string(REPLACE "includedir=${CURRENT_INSTALLED_DIR}/include" "includedir=\${prefix}/include" _contents "${_contents}") file(WRITE "${CURRENT_PACKAGES_DIR}/share/pkgconfig/xorg-macros.pc" "${_contents}") -#file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/pkgconfig/") -file(RENAME "${CURRENT_PACKAGES_DIR}/share/pkgconfig/" "${CURRENT_PACKAGES_DIR}/share/xorg/pkgconfig") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/pkgconfig/" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") file(READ "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig/xorg-macros.pc" _contents) string(REPLACE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_INSTALLED_DIR}/debug" _contents "${_contents}") @@ -80,9 +49,11 @@ string(REPLACE "datarootdir=\${prefix}/share}" "datarootdir=\${prefix}/share/xor string(REPLACE "includedir=${CURRENT_INSTALLED_DIR}/debug/include" "includedir=\${prefix}/../include" _contents "${_contents}") file(WRITE "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig/xorg-macros.pc" "${_contents}") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/xorg/debug/") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib") +file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig/" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/" "${CURRENT_PACKAGES_DIR}/share/xorg/debug/") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share/) # # Handle copyright file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/xproto/portfile.cmake b/ports/xproto/portfile.cmake index 473f1f2c2cc098..ba166317ef9121 100644 --- a/ports/xproto/portfile.cmake +++ b/ports/xproto/portfile.cmake @@ -1,51 +1,6 @@ -# Common Ambient Variables: -# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} -# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} -# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} -# CURRENT_INSTALLED_DIR = ${VCPKG_ROOT_DIR}\installed\${TRIPLET} -# DOWNLOADS = ${VCPKG_ROOT_DIR}\downloads -# PORT = current port name (zlib, etc) -# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) -# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) -# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) -# VCPKG_ROOT_DIR = -# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) -# VCPKG_TOOLCHAIN = ON OFF -# TRIPLET_SYSTEM_ARCH = arm x86 x64 -# BUILD_ARCH = "Win32" "x64" "ARM" -# MSBUILD_PLATFORM = "Win32"/"x64"/${TRIPLET_SYSTEM_ARCH} -# DEBUG_CONFIG = "Debug Static" "Debug Dll" -# RELEASE_CONFIG = "Release Static"" "Release DLL" -# VCPKG_TARGET_IS_WINDOWS -# VCPKG_TARGET_IS_UWP -# VCPKG_TARGET_IS_LINUX -# VCPKG_TARGET_IS_OSX -# VCPKG_TARGET_IS_FREEBSD -# VCPKG_TARGET_IS_ANDROID -# VCPKG_TARGET_IS_MINGW -# VCPKG_TARGET_EXECUTABLE_SUFFIX -# VCPKG_TARGET_STATIC_LIBRARY_SUFFIX -# VCPKG_TARGET_SHARED_LIBRARY_SUFFIX -# -# See additional helpful variables in /docs/maintainers/vcpkg_common_definitions.md - -# # Specifies if the port install should fail immediately given a condition -# vcpkg_fail_port_install(MESSAGE "Xlib currently only supports Linux and Mac platforms" ON_TARGET "Windows") -vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Linux and Mac platforms" ON_TARGET "Windows") - ## requires AUTOCONF, LIBTOOL and PKCONF message(STATUS "${PORT} requires autoconf, libtool and pkconf from the system package manager!") -#vcpkg_from_gitlab( -# GITLAB_URL https://gitlab.freedesktop.org/xorg -# OUT_SOURCE_PATH SOURCE_XTRANS -# REPO lib/libxtrans -# REF c4262efc9688e495261d8b23a12f956ab38e006f #v1.4 -# SHA512 137f0ffcae97f2375e5babbf21d336b67e7bf35f6a74377b14f035cdba66992d21f8d90f3c1dc243f8fd3d27d32af36c59af45443db59908969d0d65598865a2 -# HEAD_REF master # branch name -# #PATCHES example.patch #patch name -#) - vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org/xorg OUT_SOURCE_PATH SOURCE_PATH @@ -69,7 +24,6 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS "${CURRENT_INSTALLED_DIR}/share/xorg/pkgconfig/" PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" ) @@ -77,18 +31,16 @@ vcpkg_configure_make( vcpkg_install_make() vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/xorg/") -file(RENAME "${CURRENT_PACKAGES_DIR}/share/pkgconfig/" "${CURRENT_PACKAGES_DIR}/share/xorg/pkgconfig") - -# # Moves all .cmake files from /debug/share/Xlib/ to /share/Xlib/ -# # See /docs/maintainers/vcpkg_fixup_cmake_targets.md for more details -# vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/Xlib) +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/") +file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig/" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/pkgconfig/" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # # Handle copyright file(GLOB_RECURSE _files "${SOURCE_PATH}/COPYING*") file(INSTALL ${_files} DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(TOUCH "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") -# # Post-build test for cmake libraries -# vcpkg_test_cmake(PACKAGE_NAME Xlib) + diff --git a/ports/xrender/portfile.cmake b/ports/xrender/portfile.cmake index acf9fa63274dc4..17c7da174d34a1 100644 --- a/ports/xrender/portfile.cmake +++ b/ports/xrender/portfile.cmake @@ -1,51 +1,6 @@ -# Common Ambient Variables: -# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} -# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} -# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} -# CURRENT_INSTALLED_DIR = ${VCPKG_ROOT_DIR}\installed\${TRIPLET} -# DOWNLOADS = ${VCPKG_ROOT_DIR}\downloads -# PORT = current port name (zlib, etc) -# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) -# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) -# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) -# VCPKG_ROOT_DIR = -# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) -# VCPKG_TOOLCHAIN = ON OFF -# TRIPLET_SYSTEM_ARCH = arm x86 x64 -# BUILD_ARCH = "Win32" "x64" "ARM" -# MSBUILD_PLATFORM = "Win32"/"x64"/${TRIPLET_SYSTEM_ARCH} -# DEBUG_CONFIG = "Debug Static" "Debug Dll" -# RELEASE_CONFIG = "Release Static"" "Release DLL" -# VCPKG_TARGET_IS_WINDOWS -# VCPKG_TARGET_IS_UWP -# VCPKG_TARGET_IS_LINUX -# VCPKG_TARGET_IS_OSX -# VCPKG_TARGET_IS_FREEBSD -# VCPKG_TARGET_IS_ANDROID -# VCPKG_TARGET_IS_MINGW -# VCPKG_TARGET_EXECUTABLE_SUFFIX -# VCPKG_TARGET_STATIC_LIBRARY_SUFFIX -# VCPKG_TARGET_SHARED_LIBRARY_SUFFIX -# -# See additional helpful variables in /docs/maintainers/vcpkg_common_definitions.md - -# # Specifies if the port install should fail immediately given a condition -# vcpkg_fail_port_install(MESSAGE "Xlib currently only supports Linux and Mac platforms" ON_TARGET "Windows") -vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Linux and Mac platforms" ON_TARGET "Windows") - ## requires AUTOCONF, LIBTOOL and PKCONF message(STATUS "${PORT} requires autoconf, libtool and pkconf from the system package manager!") -#vcpkg_from_gitlab( -# GITLAB_URL https://gitlab.freedesktop.org/xorg -# OUT_SOURCE_PATH SOURCE_XTRANS -# REPO lib/libxtrans -# REF c4262efc9688e495261d8b23a12f956ab38e006f #v1.4 -# SHA512 137f0ffcae97f2375e5babbf21d336b67e7bf35f6a74377b14f035cdba66992d21f8d90f3c1dc243f8fd3d27d32af36c59af45443db59908969d0d65598865a2 -# HEAD_REF master # branch name -# #PATCHES example.patch #patch name -#) - vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org/xorg OUT_SOURCE_PATH SOURCE_PATH @@ -69,7 +24,6 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS "${CURRENT_INSTALLED_DIR}/share/xorg/pkgconfig/" PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" ) @@ -80,12 +34,6 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -# # Moves all .cmake files from /debug/share/Xlib/ to /share/Xlib/ -# # See /docs/maintainers/vcpkg_fixup_cmake_targets.md for more details -# vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/Xlib) - # # Handle copyright file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -# # Post-build test for cmake libraries -# vcpkg_test_cmake(PACKAGE_NAME Xlib) diff --git a/ports/xt/portfile.cmake b/ports/xt/portfile.cmake index 9ca44257aae27d..c9f21ec1fce616 100644 --- a/ports/xt/portfile.cmake +++ b/ports/xt/portfile.cmake @@ -23,7 +23,6 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS "${CURRENT_INSTALLED_DIR}/share/xorg/pkgconfig/" PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" ) diff --git a/ports/xtrans/portfile.cmake b/ports/xtrans/portfile.cmake index f4f893bfe7f675..5596f2e55fd2f0 100644 --- a/ports/xtrans/portfile.cmake +++ b/ports/xtrans/portfile.cmake @@ -1,37 +1,4 @@ -# Common Ambient Variables: -# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} -# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} -# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} -# CURRENT_INSTALLED_DIR = ${VCPKG_ROOT_DIR}\installed\${TRIPLET} -# DOWNLOADS = ${VCPKG_ROOT_DIR}\downloads -# PORT = current port name (zlib, etc) -# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) -# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) -# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) -# VCPKG_ROOT_DIR = -# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) -# VCPKG_TOOLCHAIN = ON OFF -# TRIPLET_SYSTEM_ARCH = arm x86 x64 -# BUILD_ARCH = "Win32" "x64" "ARM" -# MSBUILD_PLATFORM = "Win32"/"x64"/${TRIPLET_SYSTEM_ARCH} -# DEBUG_CONFIG = "Debug Static" "Debug Dll" -# RELEASE_CONFIG = "Release Static"" "Release DLL" -# VCPKG_TARGET_IS_WINDOWS -# VCPKG_TARGET_IS_UWP -# VCPKG_TARGET_IS_LINUX -# VCPKG_TARGET_IS_OSX -# VCPKG_TARGET_IS_FREEBSD -# VCPKG_TARGET_IS_ANDROID -# VCPKG_TARGET_IS_MINGW -# VCPKG_TARGET_EXECUTABLE_SUFFIX -# VCPKG_TARGET_STATIC_LIBRARY_SUFFIX -# VCPKG_TARGET_SHARED_LIBRARY_SUFFIX -# -# See additional helpful variables in /docs/maintainers/vcpkg_common_definitions.md set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) -# # Specifies if the port install should fail immediately given a condition -# vcpkg_fail_port_install(MESSAGE "Xlib currently only supports Linux and Mac platforms" ON_TARGET "Windows") -vcpkg_fail_port_install(MESSAGE "Xlib currently only supports Linux and Mac platforms" ON_TARGET "Windows") ## requires AUTOCONF, LIBTOOL and PKCONF vcpkg_from_gitlab( @@ -43,18 +10,7 @@ vcpkg_from_gitlab( HEAD_REF master # branch name #PATCHES example.patch #patch name ) -#export ACLOCAL="aclocal -I $PREFIX/share/aclocal" -#file(COPY "${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/xorg-macros.m4" DESTINATION "${SOURCE_PATH}") -#set(PKG_PATHS "$ENV{PKG_CONFIG_PATH}") -#set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${CURRENT_INSTALLED_DIR}/share/xorg/pkgconfig/:${CURRENT_INSTALLED_DIR}/lib/pkgconfig/") -#Alternatively, you may set the environment variables XCBPROTO_CFLAGS -#and XCBPROTO_LIBS to avoid the need to call pkg-config. -#See the pkg-config man page for more details. -#Package xcb-proto was not found in the pkg-config search path. -#Perhaps you should add the directory containing `xcb-proto.pc' -#to the PKG_CONFIG_PATH environment variable -#Package 'xcb-proto', required by 'world', not found set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} @@ -68,43 +24,38 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS "${CURRENT_INSTALLED_DIR}/share/xorg/pkgconfig/" PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" ) vcpkg_install_make() - vcpkg_fixup_pkgconfig() file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/xorg/") #file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/xorg/aclocal/") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/include") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib") file(RENAME "${CURRENT_PACKAGES_DIR}/include/" "${CURRENT_PACKAGES_DIR}/share/${PORT}/include") # the include folder is moved since it contains source files. It is not meant as a traditional include folder but as a shared files folder for different x libraries. -file(RENAME "${CURRENT_PACKAGES_DIR}/share/pkgconfig/" "${CURRENT_PACKAGES_DIR}/share/xorg/pkgconfig") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/pkgconfig/" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") file(RENAME "${CURRENT_PACKAGES_DIR}/share/aclocal/" "${CURRENT_PACKAGES_DIR}/share/xorg/aclocal") file(RENAME "${CURRENT_PACKAGES_DIR}/share/doc/" "${CURRENT_PACKAGES_DIR}/share/xorg/doc") +file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/" "${CURRENT_PACKAGES_DIR}/share/xorg/debug") -set(_file "${CURRENT_PACKAGES_DIR}/share/xorg/pkgconfig/xtrans.pc" ) +set(_file "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/xtrans.pc" ) file(READ "${_file}" _contents) string(REPLACE "includedir=\${prefix}/include" "includedir=\${prefix}/share/xtrans/include" _contents "${_contents}") file(WRITE "${_file}" "${_contents}") -set(_file "${CURRENT_PACKAGES_DIR}/share/xorg/debug/pkgconfig/xtrans.pc" ) +set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/xtrans.pc" ) file(READ "${_file}" _contents) string(REPLACE "includedir=\${prefix}/../include" "includedir=\${prefix}/../share/xtrans/include" _contents "${_contents}") file(WRITE "${_file}" "${_contents}") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) - -# # Moves all .cmake files from /debug/share/Xlib/ to /share/Xlib/ -# # See /docs/maintainers/vcpkg_fixup_cmake_targets.md for more details -# vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/Xlib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # # Handle copyright file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - -# # Post-build test for cmake libraries -# vcpkg_test_cmake(PACKAGE_NAME Xlib) From dcd64f320d2c3177018fa69601860424ad77f9ef Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 31 Jan 2020 23:43:39 +0100 Subject: [PATCH 307/419] forgot one --- ports/ice/portfile.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/ice/portfile.cmake b/ports/ice/portfile.cmake index affcbe6319a29b..0c6f9c1d124182 100644 --- a/ports/ice/portfile.cmake +++ b/ports/ice/portfile.cmake @@ -23,7 +23,6 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS "${CURRENT_INSTALLED_DIR}/share/xorg/pkgconfig/" PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" ) From 66cf8d308210b857f87a416054145eb7b532bc3b Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 1 Feb 2020 01:12:49 +0100 Subject: [PATCH 308/419] addd more xorg ports --- ports/dmx/CONTROL | 6 +++ ports/dmx/portfile.cmake | 40 ++++++++++++++++++++ ports/font-util/CONTROL | 6 +++ ports/font-util/portfile.cmake | 65 +++++++++++++++++++++++++++++++++ ports/fontenc/CONTROL | 6 +++ ports/fontenc/portfile.cmake | 39 ++++++++++++++++++++ ports/pciaccess/CONTROL | 6 +++ ports/pciaccess/portfile.cmake | 41 +++++++++++++++++++++ ports/xcb-cursor/CONTROL | 6 +++ ports/xcb-cursor/portfile.cmake | 43 ++++++++++++++++++++++ ports/xcb-errors/CONTROL | 6 +++ ports/xcb-errors/portfile.cmake | 39 ++++++++++++++++++++ ports/xcwm/CONTROL | 6 +++ ports/xcwm/portfile.cmake | 43 ++++++++++++++++++++++ ports/xinerama/CONTROL | 5 +++ ports/xinerama/portfile.cmake | 39 ++++++++++++++++++++ ports/xkbfile/CONTROL | 6 +++ ports/xkbfile/portfile.cmake | 39 ++++++++++++++++++++ ports/xshmfence/CONTROL | 6 +++ ports/xshmfence/portfile.cmake | 39 ++++++++++++++++++++ 20 files changed, 486 insertions(+) create mode 100644 ports/dmx/CONTROL create mode 100644 ports/dmx/portfile.cmake create mode 100644 ports/font-util/CONTROL create mode 100644 ports/font-util/portfile.cmake create mode 100644 ports/fontenc/CONTROL create mode 100644 ports/fontenc/portfile.cmake create mode 100644 ports/pciaccess/CONTROL create mode 100644 ports/pciaccess/portfile.cmake create mode 100644 ports/xcb-cursor/CONTROL create mode 100644 ports/xcb-cursor/portfile.cmake create mode 100644 ports/xcb-errors/CONTROL create mode 100644 ports/xcb-errors/portfile.cmake create mode 100644 ports/xcwm/CONTROL create mode 100644 ports/xcwm/portfile.cmake create mode 100644 ports/xinerama/CONTROL create mode 100644 ports/xinerama/portfile.cmake create mode 100644 ports/xkbfile/CONTROL create mode 100644 ports/xkbfile/portfile.cmake create mode 100644 ports/xshmfence/CONTROL create mode 100644 ports/xshmfence/portfile.cmake diff --git a/ports/dmx/CONTROL b/ports/dmx/CONTROL new file mode 100644 index 00000000000000..a0184fceaed69d --- /dev/null +++ b/ports/dmx/CONTROL @@ -0,0 +1,6 @@ +Source: dmx +Version: 1.1.4 +Homepage: https://gitlab.freedesktop.org/xorg/lib/libdmx +Description: X Window System DMX (Distributed Multihead X) extension library +Build-Depends: xorg-macros, xproto, xext + diff --git a/ports/dmx/portfile.cmake b/ports/dmx/portfile.cmake new file mode 100644 index 00000000000000..ec9b65d309e027 --- /dev/null +++ b/ports/dmx/portfile.cmake @@ -0,0 +1,40 @@ +## requires AUTOCONF, LIBTOOL and PKCONF +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libdmx + REF 6056db9a2fa8ad1ea55f8b8e2cbf5972408d612f #1.1.4 + SHA512 f7b0a3fb26bc68e5dd27a0afa98ed29fed31956fd07f89b57171d7f9d9a0a87185876551dbf312b8d90a66fa50de06992cf9eb386fa98dd8133946de3c37e274 + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) +#file(TOUCH ${SOURCE_PATH}/m4/dummy) +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL ${SHELL_PATH} + #OPTIONS + #OPTIONS_DEBUG + #OPTIONS_RELEASE + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Handle copyright +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +#file(TOUCH "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") #already installed by xproto + + diff --git a/ports/font-util/CONTROL b/ports/font-util/CONTROL new file mode 100644 index 00000000000000..b18707656cf966 --- /dev/null +++ b/ports/font-util/CONTROL @@ -0,0 +1,6 @@ +Source: font-util +Version: 1.3.2 +Homepage: https://gitlab.freedesktop.org/xorg/font/util +Description: X.Org font package creation/installation utilities +Build-Depends: xorg-macros + diff --git a/ports/font-util/portfile.cmake b/ports/font-util/portfile.cmake new file mode 100644 index 00000000000000..9bc592b40246d8 --- /dev/null +++ b/ports/font-util/portfile.cmake @@ -0,0 +1,65 @@ +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) +# requires AUTOCONF, LIBTOOL and PKCONF +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO font/util + REF d45011b8324fecebb4fc79e57491d341dd96e325 #1.3.2 + SHA512 d783cbb5b8b0975891a247f98b78c2afadfd33e1d26ee8bcf7ab7ccc11615b0150d07345c719182b0929afc3c54dc3288a01a789b5374e18aff883ac23d15b04 + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) +#file(TOUCH ${SOURCE_PATH}/m4/dummy) +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL ${SHELL_PATH} + #OPTIONS + #OPTIONS_DEBUG + #OPTIONS_RELEASE + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/xorg/") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/aclocal/" "${CURRENT_PACKAGES_DIR}/share/xorg/aclocal") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/fonts/" "${CURRENT_PACKAGES_DIR}/share/xorg/fonts") +#file(RENAME "${CURRENT_PACKAGES_DIR}/share/font-util/" "${CURRENT_PACKAGES_DIR}/share/xorg/font-util") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/man") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/man/" "${CURRENT_PACKAGES_DIR}/share/${PORT}/man") + +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/") +file(RENAME "${CURRENT_PACKAGES_DIR}/bin/" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") + +set(_file "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/fontutil.pc") +file(READ "${_file}" _contents) +string(REPLACE "datarootdir=\${prefix}/share" "datarootdir=\${prefix}/share/xorg" _contents "${_contents}") +string(REPLACE "exec_prefix=\${prefix}" "exec_prefix=\${prefix}/tools/${PORT}" _contents "${_contents}") +file(WRITE "${_file}" "${_contents}") + +set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/fontutil.pc") +file(READ "${_file}" _contents) +string(REPLACE "datarootdir=\${prefix}/share" "datarootdir=\${prefix}/../share/xorg" _contents "${_contents}") +string(REPLACE "exec_prefix=\${prefix}" "exec_prefix=\${prefix}/../tools/${PORT}" _contents "${_contents}") +file(WRITE "${_file}" "${_contents}") + +# # Handle copyright +#file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/") +#file(TOUCH "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") #already installed by xproto +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") +#file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/font-util) +#file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) diff --git a/ports/fontenc/CONTROL b/ports/fontenc/CONTROL new file mode 100644 index 00000000000000..00ba36f4ce249c --- /dev/null +++ b/ports/fontenc/CONTROL @@ -0,0 +1,6 @@ +Source: fontenc +Version: 1.1.4 +Homepage: https://gitlab.freedesktop.org/xorg/lib/libfontenc +Description: X font encoding library +Build-Depends: xorg-macros, zlib, xproto, font-util + diff --git a/ports/fontenc/portfile.cmake b/ports/fontenc/portfile.cmake new file mode 100644 index 00000000000000..8ea30c91a4af5e --- /dev/null +++ b/ports/fontenc/portfile.cmake @@ -0,0 +1,39 @@ +## requires AUTOCONF, LIBTOOL and PKCONF +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libfontenc + REF 2baea13978759d1a011fc6d739465893b554d30a #1.1.4 + SHA512 5ebef8b516a2377b004894b53d56ad960bc5179d9f9a36e18bc2228ea04e8f87e9baffd4883c21783dd1f4c57d7f521cdfa42c1e9facae60c6fc2c9f5472230e + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) +#file(TOUCH ${SOURCE_PATH}/m4/dummy) +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL ${SHELL_PATH} + #OPTIONS + #OPTIONS_DEBUG + #OPTIONS_RELEASE + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Handle copyright +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/") +file(TOUCH "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") #already installed by xproto + + diff --git a/ports/pciaccess/CONTROL b/ports/pciaccess/CONTROL new file mode 100644 index 00000000000000..5e601a38265d69 --- /dev/null +++ b/ports/pciaccess/CONTROL @@ -0,0 +1,6 @@ +Source: pciaccess +Version: 0.16 +Homepage: https://gitlab.freedesktop.org/xorg/lib/libpciaccess +Description: Generic PCI access library +Build-Depends: xorg-macros, zlib + diff --git a/ports/pciaccess/portfile.cmake b/ports/pciaccess/portfile.cmake new file mode 100644 index 00000000000000..920f531f93268f --- /dev/null +++ b/ports/pciaccess/portfile.cmake @@ -0,0 +1,41 @@ +vcpkg_fail_port_install(ON_TARGET "Windows" "OSX") + +## requires AUTOCONF, LIBTOOL and PKCONF +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libpciaccess + REF fbd1f0fe79ba25b72635f8e36a6c33d7e0ca19f6 #0.16 + SHA512 e148e513453e4d6c131287d69910fa14b66557039acdfe3c59ec8de280841a62b9c727203331ebc2e9f0f1797dccbe22ca99aeecae78314448ef3cca017bc883 + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) +#file(TOUCH ${SOURCE_PATH}/m4/dummy) +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL ${SHELL_PATH} + OPTIONS --with-zlib + #OPTIONS_DEBUG + #OPTIONS_RELEASE + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Handle copyright +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/") +file(TOUCH "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") #already installed by xproto + + diff --git a/ports/xcb-cursor/CONTROL b/ports/xcb-cursor/CONTROL new file mode 100644 index 00000000000000..aa137a623270a4 --- /dev/null +++ b/ports/xcb-cursor/CONTROL @@ -0,0 +1,6 @@ +Source: xcb-cursor +Version: 0.1.3 +Homepage: https://xcb.freedesktop.org/ +Description: XCB port of libXcursor +Build-Depends: xcb, xcb-util, xcb-render-util, xcb-image + diff --git a/ports/xcb-cursor/portfile.cmake b/ports/xcb-cursor/portfile.cmake new file mode 100644 index 00000000000000..b9f400369c34e2 --- /dev/null +++ b/ports/xcb-cursor/portfile.cmake @@ -0,0 +1,43 @@ +## requires AUTOCONF, LIBTOOL, PKCONF, GPERF +vcpkg_find_acquire_program(GPERF) +get_filename_component(GPERF_DIR "${GPERF}" DIRECTORY) +vcpkg_add_to_path("${GPERF_DIR}") + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxcb-cursor + REF 95b9a8fd876fdbbc854cdf3d90317be3846c7417 #0.1.3 + SHA512 cca7bf1f2aeaab8d256052a676098d7c600b90dc47cf9bc84d11229e59fbf5c83f7f877b8538f7cc662983807566d28c87b3501abc7cab76cc553d9db29eceb9 + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) +file(TOUCH ${SOURCE_PATH}/m4/dummy) +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL ${SHELL_PATH} + #OPTIONS + #OPTIONS_DEBUG + #OPTIONS_RELEASE + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Handle copyright +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/") +file(TOUCH "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") #already installed by xproto + + diff --git a/ports/xcb-errors/CONTROL b/ports/xcb-errors/CONTROL new file mode 100644 index 00000000000000..3675cb6fe5fd81 --- /dev/null +++ b/ports/xcb-errors/CONTROL @@ -0,0 +1,6 @@ +Source: xcb-errors +Version: 1.0 +Homepage: https://xcb.freedesktop.org/ +Description: XCB port of Xlib's XImage and XShmImage functions. +Build-Depends: xcb, xcb-util + diff --git a/ports/xcb-errors/portfile.cmake b/ports/xcb-errors/portfile.cmake new file mode 100644 index 00000000000000..e15708b85dcefc --- /dev/null +++ b/ports/xcb-errors/portfile.cmake @@ -0,0 +1,39 @@ +## requires AUTOCONF, LIBTOOL and PKCONF +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxcb-errors + REF 332f357aa662ad61625ee804f93c5503b2a0c3ec #1.0 + SHA512 e2b1ad74434760b94035ba91a2f43012523f007e82a1c99380be9f08ca8545f31dcfd772cef593c709cef941ff6d8ab421f47b2f3f01ba956cbaa15e4b928b8b + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) +file(TOUCH ${SOURCE_PATH}/m4/dummy) +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL ${SHELL_PATH} + #OPTIONS + #OPTIONS_DEBUG + #OPTIONS_RELEASE + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Handle copyright +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/") +file(TOUCH "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") #already installed by xproto + + diff --git a/ports/xcwm/CONTROL b/ports/xcwm/CONTROL new file mode 100644 index 00000000000000..3bdeb8c67caea4 --- /dev/null +++ b/ports/xcwm/CONTROL @@ -0,0 +1,6 @@ +Source: xcwm +Version: 1.1.0 +Homepage: https://gitlab.freedesktop.org/xorg/lib/libxcwm +Description: Rootless Compositing Window Manager library +Build-Depends: xorg-macros, xcb, xcb-image, xcb-keysyms, xcb-wm + diff --git a/ports/xcwm/portfile.cmake b/ports/xcwm/portfile.cmake new file mode 100644 index 00000000000000..bf293917c64795 --- /dev/null +++ b/ports/xcwm/portfile.cmake @@ -0,0 +1,43 @@ +IF(NOT VCPKG_TARGET_IS_OSX) + #message(FATAL_ERROR "${PORT} only builds on OSX") +endif() + +## requires AUTOCONF, LIBTOOL and PKCONF +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxcwm + REF ff4c47ac4e22dd561d888ef14de5c92268b4ca78 #head + SHA512 711611ff8ed7fa192b8c4c1c017bf0e0177e71cc246c80393aa5a3d99c161a3dea6a526499ff0ee24e7c08e98cf0b1b216700f85927616b921be314cb7e0beb8 + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) +#file(TOUCH ${SOURCE_PATH}/m4/dummy) +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL ${SHELL_PATH} + #OPTIONS + #OPTIONS_DEBUG + #OPTIONS_RELEASE + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Handle copyright +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/") +file(TOUCH "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") #already installed by xproto + + diff --git a/ports/xinerama/CONTROL b/ports/xinerama/CONTROL new file mode 100644 index 00000000000000..26edab75194f74 --- /dev/null +++ b/ports/xinerama/CONTROL @@ -0,0 +1,5 @@ +Source: xinerama +Version: 1.1.4 +Homepage: https://gitlab.freedesktop.org/xorg/lib/libxinerama +Description: Xlib API for Xinerama extension to X11 Protocol +Build-Depends: xorg-macros, x11, xext diff --git a/ports/xinerama/portfile.cmake b/ports/xinerama/portfile.cmake new file mode 100644 index 00000000000000..b79e50222085e3 --- /dev/null +++ b/ports/xinerama/portfile.cmake @@ -0,0 +1,39 @@ +## requires AUTOCONF, LIBTOOL and PKCONF +message(STATUS "${PORT} requires autoconf, libtool and pkconf from the system package manager!") + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxinerama + REF c3ab2361f13154921df2992f9eacc1ea1b3f946b #1.1.4 + SHA512 c65ed77d370e063f861ff9ed3abee5ad89be9ba452de987263da702985b1aa5be2ddd464e67b7978155e072e67f03ef49192a87fa707fcead408434e1771cbc0 + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) + +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL "export ACLOCAL=\"aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/\"" + #OPTIONS + #OPTIONS_DEBUG + #OPTIONS_RELEASE + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + diff --git a/ports/xkbfile/CONTROL b/ports/xkbfile/CONTROL new file mode 100644 index 00000000000000..6b32f75a01ef43 --- /dev/null +++ b/ports/xkbfile/CONTROL @@ -0,0 +1,6 @@ +Source: xkbfile +Version: 1.1.0 +Homepage: https://gitlab.freedesktop.org/xorg/lib/libxkbfile +Description: XKB file handling routines +Build-Depends: xorg-macros, x11, xproto + diff --git a/ports/xkbfile/portfile.cmake b/ports/xkbfile/portfile.cmake new file mode 100644 index 00000000000000..f5540f90327f64 --- /dev/null +++ b/ports/xkbfile/portfile.cmake @@ -0,0 +1,39 @@ +## requires AUTOCONF, LIBTOOL and PKCONF +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxkbfile + REF 261992d42905f209cd5bf6afcf8a7ae3aa30b3ff #1.1.0 + SHA512 5be520e408d25331c9a97648f2a6fa832f0d4f49f93f71490b89746da0fbbda404eaab3797c5fbe195287dc94581a6703fa4ecc2511e046127af057eab60378f + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) +#file(TOUCH ${SOURCE_PATH}/m4/dummy) +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL ${SHELL_PATH} + #OPTIONS + #OPTIONS_DEBUG + #OPTIONS_RELEASE + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Handle copyright +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/") +file(TOUCH "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") #already installed by xproto + + diff --git a/ports/xshmfence/CONTROL b/ports/xshmfence/CONTROL new file mode 100644 index 00000000000000..a2be58e3654a49 --- /dev/null +++ b/ports/xshmfence/CONTROL @@ -0,0 +1,6 @@ +Source: xshmfence +Version: 1.3 +Homepage: https://gitlab.freedesktop.org/xorg/lib/libxshmfence +Description: Shared memory 'SyncFence' synchronization primitive +Build-Depends: xorg-macros, bzip2, pthread, xproto + diff --git a/ports/xshmfence/portfile.cmake b/ports/xshmfence/portfile.cmake new file mode 100644 index 00000000000000..4c0e2ad35bf47b --- /dev/null +++ b/ports/xshmfence/portfile.cmake @@ -0,0 +1,39 @@ +## requires AUTOCONF, LIBTOOL and PKCONF +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxshmfence + REF f38b2e73071ba516127f8f5ae47f48df58dc9d53 #1.3 + SHA512 d3342db68b24b2b139977655fc42fde9b22cc1b786e1df6f14c5084e195d2208c11391b9a1769b4d6f9d41d21c163c1d9aa92f72059ada468375daaeee8dffdb + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) +#file(TOUCH ${SOURCE_PATH}/m4/dummy) +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL ${SHELL_PATH} + #OPTIONS + #OPTIONS_DEBUG + #OPTIONS_RELEASE + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Handle copyright +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/") +file(TOUCH "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") #already installed by xproto + + From c2d1b0a0ec8cd3cad7ca87864f7ce3348d912c82 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 1 Feb 2020 01:19:38 +0100 Subject: [PATCH 309/419] cleanup. --- ports/xcb-proto/CONTROL | 5 ----- ports/xcb-proto/portfile.cmake | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/ports/xcb-proto/CONTROL b/ports/xcb-proto/CONTROL index 3773887ccd0ebe..428f6453b3c083 100644 --- a/ports/xcb-proto/CONTROL +++ b/ports/xcb-proto/CONTROL @@ -3,8 +3,3 @@ Version: 1.13 Homepage: https://xcb.freedesktop.org/ Description: XML-XCB protocol descriptions used by libxcb for the X11 protocol & extensions Build-Depends: bzip2, xorg-macros, libxml2[lint] -Default-Features: - -Feature: no-feature -Description: just a dummy -Build-Depends: diff --git a/ports/xcb-proto/portfile.cmake b/ports/xcb-proto/portfile.cmake index 1dfaa6cc2e3e7a..8bad1027113775 100644 --- a/ports/xcb-proto/portfile.cmake +++ b/ports/xcb-proto/portfile.cmake @@ -1,7 +1,7 @@ ## requires AUTOCONF, LIBTOOL and PKCONF message(STATUS "----- ${PORT} requires autoconf, libtool, pkconf and xmllint from the system package manager! -----") -set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) find_program(XMLLINT_PATH NAMES xmllint PATHS "${CURRENT_INSTALLED_DIR}/tools/libxml2") if(NOT XMLLINT_PATH) From eb275cafc4f1bf5c1eb3dd161b070610f1fb10f5 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 1 Feb 2020 21:55:42 +0100 Subject: [PATCH 310/419] actual forgot to commit the prl parser --- ports/qt5-base/patches/prl_parser.patch | 260 ++++++++++++++++++++++++ ports/qt5-base/portfile.cmake | 1 + 2 files changed, 261 insertions(+) create mode 100644 ports/qt5-base/patches/prl_parser.patch diff --git a/ports/qt5-base/patches/prl_parser.patch b/ports/qt5-base/patches/prl_parser.patch new file mode 100644 index 00000000000000..479b9b76edd567 --- /dev/null +++ b/ports/qt5-base/patches/prl_parser.patch @@ -0,0 +1,260 @@ +diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +index 81db0d92c..51016f3fa 100644 +--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in ++++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +@@ -1,6 +1,6 @@ + +-if (CMAKE_VERSION VERSION_LESS 3.1.0) +- message(FATAL_ERROR \"Qt 5 $${CMAKE_MODULE_NAME} module requires at least CMake version 3.1.0\") ++if (CMAKE_VERSION VERSION_LESS 3.6.0) # Increase for cmake_parse_arguments ++ message(FATAL_ERROR \"Qt 5 $${CMAKE_MODULE_NAME} module requires at least CMake version 3.6.0\") + endif() + + !!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND) +@@ -34,6 +34,167 @@ set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.VERSION)") + set(Qt5$${CMAKE_MODULE_NAME}_LIBRARIES Qt5::$${CMAKE_MODULE_NAME}) + !!ENDIF // TEMPLATE != aux + ++###### Added by VCPKG ++function(_qt5_$${CMAKE_MODULE_NAME}_parse_prl) ++ cmake_parse_arguments(_qt_prl \"\" \"CONFIGURATION;TARGET;PRL_FILE;LIB_FILE;OUT_DEPS;OUT_FLAGS\" \"\" ${ARGN}) ++ if(NOT _qt_prl_CONFIGURATION) ++ message(FATAL_ERROR \"qt_parse_prl requires parameter CONFIGURATION\") ++ endif() ++ if(NOT _qt_prl_TARGET) ++ message(FATAL_ERROR \"qt_parse_prl requires parameter TARGET\") ++ endif() ++ if(NOT _qt_prl_PRL_FILE AND NOT _qt_prl_LIB_FILE) ++ message(FATAL_ERROR \"qt_parse_prl requires parameter PRL_FILE or LIB_FILE\") ++ endif() ++ if(NOT _qt_prl_OUT_DEPS) ++ message(FATAL_ERROR \"qt_parse_prl requires parameter OUT_DEPS\") ++ endif() ++ if(NOT _qt_prl_OUT_FLAGS) ++ message(FATAL_ERROR \"qt_parse_prl requires parameter OUT_FLAGS\") ++ endif() ++ ++ if(_qt_prl_LIB_FILE) ++ set(_parsed_prl \"${_qt_prl_LIB_FILE}\") ++ string(REGEX REPLACE \"${CMAKE_STATIC_LIBRARY_SUFFIX}$\" \".prl\" _parsed_prl \"${_parsed_prl}\") ++ else() ++ set(_parsed_prl \"${_qt_prl_PRL_FILE}\") ++ endif() ++ ++ message(STATUS \"Reading file: ${_parsed_prl}\") ++ if(NOT EXISTS \"${_parsed_prl}\") ++ message(FATAL_ERROR \"Could not find PRL file: ${_parsed_prl}\") ++ endif() ++ file(STRINGS \"${_parsed_prl}\" _static_depends REGEX \"^QMAKE_PRL_LIBS[ \\t]+=[ \\t]+.+$\") ++ message(STATUS \"QMAKE_PRL_LIBS as read : ${_static_depends}\n\n\") ++ string(REGEX REPLACE \"QMAKE_PRL_LIBS[ \\t]+=[ \\t]+\" \"\" _static_depends \"${_static_depends}\") ++ string(REGEX REPLACE \" -L\\\\$\\\\$([^ ]+)\" [[ ;-L\$\$\\1; ]] _static_depends \"${_static_depends}\") # - L Normal Case ++ if(WIN32) ++ string(REGEX REPLACE \"-L\\\\\\\"([^\\\\\\\"]+)\\\\\\\"\" \" ;-L\\\"\\\\1\\\"; \" _static_depends \"${_static_depends}\") # -L Tricky Case with spaces ++ string(REGEX REPLACE [[\\\"?[A-Z]:\\\\\\\\Program Files( \\(x86\\))*\\\\\\\\Windows Kits\\\\\\\\[0-9]+\\\\\\\\lib\\\\\\\\[0-9|.]+\\\\\\\\um\\\\\\\\x64(\\\\\\\\|/)([^\\\"]+)\\\"?]] \";\\\\3;\" _static_depends \"${_static_depends}\") ++ string(REGEX REPLACE [[ \\\"([^\\"]+)\\\" ]] \" ;\\\"\\\\1\\\"; \" _static_depends \"${_static_depends}\") ++ # Every path with a space in it should be handled now! ++ else() ++ string(REGEX REPLACE \" -l([^ ]+)\" [[;-l\\1;]] _static_depends \"${_static_depends}\") # - l case on targets other than windows ++ endif() ++ string(REGEX REPLACE \"[\\t ]+[^\\\\\\\"]([^( |\\\\\\\")]+)[^\\\\\\\"]([\\t ]+|[\\t ]*$)\" \";\\\\0; \" _static_depends \"${_static_depends}\") ++ string(REGEX REPLACE \"[\\t ]*;[\\t ]*\" \";\" _static_depends \"${_static_depends}\") # remove unnecessary whitespaces ++ string(REGEX REPLACE \"(;[\\t ]*;)+\" \";\" _static_depends \"${_static_depends}\") # remove empty elements from the list ++ #string(REGEX REPLACE \" [\\"]\" \";\\\\\\\"\" _static_depends \"${_static_depends}\") ++ message(STATUS \"QMAKE_PRL_LIBS as a list : ${_static_depends}\n\n\") ++ ++ #Logic Backported from Qt 5.14 ++ set(_search_paths) ++ set(_fw_search_paths) ++ set(_framework_flag) ++ if(\"${_qt_prl_CONFIGURATION}\" STREQUAL \"DEBUG\") ++ set(_prl_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}${LIB_LOCATION}\") ++ else() ++ set(_prl_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${LIB_LOCATION}\") ++ endif() ++ string(REPLACE \"\$\$[QT_INSTALL_LIBS]/\" \"${_prl_location}\" _static_depends \"${_static_depends}\") ++ string(REGEX REPLACE \"[ \t]+\" \";\" _standard_libraries \"${CMAKE_CXX_STANDARD_LIBRARIES}\") ++ foreach(_flag IN LISTS _static_depends) ++ if(_flag MATCHES \"^-framework$\") ++ # Handle the next flag as framework name ++ set(_framework_flag 1) ++ elseif(_flag MATCHES \"^-F(.*)$\") ++ # Handle -F/foo/bar flags by recording the framework search paths to be used ++ # by find_library. ++ list(APPEND _fw_search_paths \"${CMAKE_MATCH_1}\") ++ elseif(_framework_flag OR _flag MATCHES \"^-l(.*)$\") ++ if(_framework_flag) ++ # Handle Darwin framework bundles passed as -framework Foo ++ unset(_framework_flag) ++ set(_lib ${_flag}) ++ else() ++ # Handle normal libraries passed as -lfoo ++ set(_lib \"${CMAKE_MATCH_1}\") ++ foreach(_standard_library ${_standard_libraries}) ++ if(_standard_library MATCHES \"^${_lib}(\\\\.lib)?$\") ++ set(_lib_is_default_linked TRUE) ++ break() ++ endif() ++ endforeach() ++ endif() ++ if (_lib_is_default_linked) ++ unset(_lib_is_default_linked) ++ elseif(_lib MATCHES \"^pthread$\") ++ find_package(Threads REQUIRED) ++ list(APPEND _lib_deps Threads::Threads) ++ else() ++ set(current_search_paths \"${_search_paths}\") ++ if(_framework_flag) ++ set(current_search_paths \"${_fw_search_paths}\") ++ endif() ++ if(current_search_paths) ++ find_library(_Qt5$${CMAKE_MODULE_NAME}_${Configuration}_${_lib}_PATH ${_lib} HINTS ${current_search_paths} NO_DEFAULT_PATH) ++ endif() ++ find_library(_Qt5$${CMAKE_MODULE_NAME}_${Configuration}_${_lib}_PATH ${_lib}) ++ mark_as_advanced(_Qt5$${CMAKE_MODULE_NAME}_${Configuration}_${_lib}_PATH) ++ if(_Qt5$${CMAKE_MODULE_NAME}_${Configuration}_${_lib}_PATH) ++ list(APPEND _lib_deps ++ ${_Qt5$${CMAKE_MODULE_NAME}_${Configuration}_${_lib}_PATH} ++ ) ++ else() ++ message(FATAL_ERROR \"Library not found: ${_lib}\") ++ endif() ++ unset(_framework_flag) ++ endif() ++ elseif(EXISTS \"${_flag}\") ++ # The flag is an absolute path to an existing library ++ list(APPEND _lib_deps \"${_flag}\") ++ elseif(_flag MATCHES \"^-L(.*)$\") ++ # Handle -Lfoo flags by putting their paths in the search path used by find_library above ++ list(APPEND _search_paths \"${CMAKE_MATCH_1}\") ++ elseif(_flag MATCHES \"\\\.(lib|a|so)$\") #Library name only. No -l. Probably missing some cases ++ #message(STATUS \"Added to link deps (${Configuration}): ${_flag}\") ++ list(APPEND _lib_deps ${_flag}) # changed from _link_flags ++ else() ++ # Handle all remaining flags by simply passing them to the linker ++ #message(STATUS \"Added to link flags (${Configuration}): ${_flag}\") ++ list(APPEND _lib_flags ${_flag}) # changed from _link_flags ++ endif() ++ endforeach() ++ ++ message(STATUS \"${_qt_prl_TARGET} links (via PRL ${_qt_prl_CONFIGURATION}): ${_lib_deps}\") ++ message(STATUS \"${_qt_prl_TARGET} has linker flags (via PRL): ${_lib_flags}\") ++ #get_target_property(_test_interface ${_qt_prl_TARGET} INTERFACE_LINK_LIBRARIES) ++ #message(STATUS \"INTERFACE_LINK_LIBRARIES of target before ${_qt_prl_TARGET}: ${_test_interface} \") ++ set(_prl_out_libs) ++ foreach(_prl_lib IN LISTS _lib_deps) ++ if(\"${_qt_prl_CONFIGURATION}\" STREQUAL \"DEBUG\") ++ #message(STATUS \"DEBUG: ${_prl_lib}\") ++ #set_property(TARGET ${_qt_prl_TARGET} APPEND PROPERTY INTERFACE_LINK_LIBRARIES \"\\$<\\$:${_prl_lib}>\") ++ list(APPEND _prl_out_libs \"\\$<\\$:${_prl_lib}>\") ++ else() ++ #message(STATUS \"RELEASE: ${_prl_lib}\") ++ #set_property(TARGET ${_qt_prl_TARGET} APPEND PROPERTY INTERFACE_LINK_LIBRARIES \"\\$<\\$>:${_prl_lib}>\") ++ list(APPEND _prl_out_libs \"\\$<\\$>:${_prl_lib}>\") ++ endif() ++ endforeach() ++ set(${_qt_prl_OUT_DEPS} "${_prl_out_libs}" PARENT_SCOPE) ++ unset(_prl_lib) ++ ++ set(_prl_out_flags) ++ foreach(_prl_flag IN LISTS _lib_flags) ++ if(\"${_qt_prl_CONFIGURATION}\" STREQUAL \"DEBUG\") ++ #set_property(TARGET ${_qt_prl_TARGET} APPEND PROPERTY INTERFACE_LINK_LIBRARIES \"\\$<\\$:${_prl_flag}>\") ++ list(APPEND _prl_out_flags \"\\$<\\$:${_prl_flag}>\") ++ else() ++ #set_property(TARGET ${_qt_prl_TARGET} APPEND PROPERTY INTERFACE_LINK_LIBRARIES \"\\$<\\$>:${_prl_flag}>\") ++ list(APPEND _prl_out_flags \"\\$<\\$>:${_prl_flag}>\") ++ endif() ++ endforeach() ++ set(${_qt_prl_OUT_FLAGS} "${_prl_out_flags}" PARENT_SCOPE) ++ unset(_prl_flag) ++ ++ #get_target_property(_test_interface ${_qt_prl_TARGET} INTERFACE_LINK_LIBRARIES) ++ #message(STATUS \"INTERFACE_LINK_LIBRARIES of target after ${_qt_prl_TARGET}: ${_test_interface} \") ++endfunction() ++ ++###### END Added by VCPKG ++ ++ + macro(_qt5_$${CMAKE_MODULE_NAME}_check_file_exists file) + if(NOT EXISTS \"${file}\" ) + message(FATAL_ERROR \"The imported target \\\"Qt5::$${CMAKE_MODULE_NAME}\\\" references the file +@@ -52,6 +189,24 @@ endmacro() + macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATION IMPLIB_LOCATION) + set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) + ++!!IF !isEmpty(CMAKE_WINDOWS_BUILD) ++!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) ++ if(\"${Configuration}\" STREQUAL \"DEBUG\") ++ set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") ++ else() ++ set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") ++ endif() ++!!ELSE ++ set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") ++!!ENDIF ++ _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib}) ++ if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\") ++ set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES ++ \"IMPORTED_IMPLIB_${Configuration}\" ${imported_implib} ++ ) ++ endif() ++!!ENDIF ++ + !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) + if(\"${Configuration}\" STREQUAL \"DEBUG\") + set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") +@@ -60,35 +215,24 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI + endif() + !!ELSE + set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") ++!!ENDIF ++!!IF !isEmpty(CMAKE_STATIC_TYPE) ++ _qt5_$${CMAKE_MODULE_NAME}_parse_prl(TARGET Qt5::$${CMAKE_MODULE_NAME} LIB_FILE \"${imported_location}\" CONFIGURATION \"${Configuration}\" OUT_DEPS PRL_DEPS OUT_FLAGS PRL_FLAGS) ++!!ELSE ++ _qt5_$${CMAKE_MODULE_NAME}_parse_prl(TARGET Qt5::$${CMAKE_MODULE_NAME} LIB_FILE \"${imported_implib}\" CONFIGURATION \"${Configuration}\" OUT_DEPS PRL_DEPS OUT_FLAGS PRL_FLAGS) + !!ENDIF + _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) ++ set_property(TARGET ${_qt_prl_TARGET} APPEND PROPERTY INTERFACE_LINK_LIBRARIES \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES};${PRL_DEPS};${PRL_FLAGS}\") + set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES +- \"INTERFACE_LINK_LIBRARIES\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\" ++ #\"INTERFACE_LINK_LIBRARIES\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES};${PRL_DEPS};${PRL_FLAGS}\" + \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} + !!IF !isEmpty(CMAKE_LIB_SONAME) + \"IMPORTED_SONAME_${Configuration}\" \"$${CMAKE_LIB_SONAME}\" + !!ENDIF + # For backward compatibility with CMake < 2.8.12 +- \"IMPORTED_LINK_INTERFACE_LIBRARIES_${Configuration}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\" ++ \"IMPORTED_LINK_INTERFACE_LIBRARIES_${Configuration}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES};${PRL_DEPS};${PRL_FLAGS}\" + ) + +-!!IF !isEmpty(CMAKE_WINDOWS_BUILD) +-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- if(\"${Configuration}\" STREQUAL \"DEBUG\") +- set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") +- else() +- set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") +- endif() +-!!ELSE +- set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") +-!!ENDIF +- _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib}) +- if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\") +- set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES +- \"IMPORTED_IMPLIB_${Configuration}\" ${imported_implib} +- ) +- endif() +-!!ENDIF + endmacro() + !!ENDIF + +@@ -366,6 +510,8 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + set_target_properties(Qt5::${Plugin} PROPERTIES + \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} + ) ++ _qt5_$${CMAKE_MODULE_NAME}_parse_prl(TARGET Qt5::${Plugin} LIB_FILE \"${imported_location}\" CONFIGURATION \"${Configuration}\" OUT_DEPS PRL_DEPS OUT_FLAGS PRL_FLAGS) ++ set_property(TARGET Qt5::${Plugin} APPEND PROPERTY INTERFACE_LINK_LIBRARIES \"${PRL_DEPS};${PRL_FLAGS}\") + endmacro() + + if (pluginTargets) + diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 93a0eb53f24ec4..f37a2f25b5032f 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -45,6 +45,7 @@ qt_download_submodule( OUT_SOURCE_PATH SOURCE_PATH #CMake fixes patches/Qt5BasicConfig.patch patches/Qt5PluginTarget.patch + patches/prl_parser.patch # Modified backport of the prl parser from Qt5.14.1 without using QMAKE_PRL_LIBS_FOR_CMAKE ) # Remove vendored dependencies to ensure they are not picked up by the build From 48e26c38687e2ac317a409801ce0ae638260b8a9 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 1 Feb 2020 21:56:04 +0100 Subject: [PATCH 311/419] fix the config a bit differently. have to check linux configs again --- ports/qt5-base/patches/Qt5BasicConfig.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ports/qt5-base/patches/Qt5BasicConfig.patch b/ports/qt5-base/patches/Qt5BasicConfig.patch index 75a0142f361812..b0530321eab157 100644 --- a/ports/qt5-base/patches/Qt5BasicConfig.patch +++ b/ports/qt5-base/patches/Qt5BasicConfig.patch @@ -33,14 +33,14 @@ index c72989288..a88234dca 100644 !!IF !isEmpty(CMAKE_RELEASE_TYPE) !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" ) -+ if(EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\") -+ _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) -+ endif() ++ #if(EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\") ++ #_populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) # Linux? ++ #endif() !!ELSE _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) -+ if(EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\") -+ _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) -+ endif() ++ #if(EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\") ++ #_populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) ## Linux? ++ #endif() !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) @@ -92,7 +92,7 @@ index c72989288..a88234dca 100644 !!ENDIF _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) + if(EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\") -+ _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) ++ _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) ### Linux? + endif() !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD endif() From 2659cc79dbb1530267f76550df0d77d84022a2ed Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 1 Feb 2020 22:04:00 +0100 Subject: [PATCH 312/419] commit the remaining x libraries --- ports/applewm/CONTROL | 5 ++++ ports/applewm/portfile.cmake | 38 ++++++++++++++++++++++++++ ports/fs/CONTROL | 5 ++++ ports/fs/portfile.cmake | 38 ++++++++++++++++++++++++++ ports/xaw/CONTROL | 5 ++++ ports/xaw/portfile.cmake | 38 ++++++++++++++++++++++++++ ports/xaw3d/CONTROL | 5 ++++ ports/xaw3d/portfile.cmake | 38 ++++++++++++++++++++++++++ ports/xcomposite/CONTROL | 5 ++++ ports/xcomposite/portfile.cmake | 38 ++++++++++++++++++++++++++ ports/xcursor/CONTROL | 5 ++++ ports/xcursor/portfile.cmake | 38 ++++++++++++++++++++++++++ ports/xdamage/CONTROL | 5 ++++ ports/xdamage/portfile.cmake | 38 ++++++++++++++++++++++++++ ports/xfont/CONTROL | 5 ++++ ports/xfont/portfile.cmake | 38 ++++++++++++++++++++++++++ ports/xft/CONTROL | 5 ++++ ports/xft/portfile.cmake | 38 ++++++++++++++++++++++++++ ports/xp/CONTROL | 5 ++++ ports/xp/portfile.cmake | 38 ++++++++++++++++++++++++++ ports/xpm/CONTROL | 5 ++++ ports/xpm/portfile.cmake | 47 ++++++++++++++++++++++++++++++++ ports/xpresent/CONTROL | 5 ++++ ports/xpresent/portfile.cmake | 39 ++++++++++++++++++++++++++ ports/xrandr/CONTROL | 5 ++++ ports/xrandr/portfile.cmake | 38 ++++++++++++++++++++++++++ ports/xrandrutils/CONTROL | 5 ++++ ports/xrandrutils/portfile.cmake | 40 +++++++++++++++++++++++++++ ports/xres/CONTROL | 5 ++++ ports/xres/portfile.cmake | 38 ++++++++++++++++++++++++++ ports/xscrnsaver/CONTROL | 5 ++++ ports/xscrnsaver/portfile.cmake | 38 ++++++++++++++++++++++++++ ports/xv/CONTROL | 5 ++++ ports/xv/portfile.cmake | 38 ++++++++++++++++++++++++++ ports/xvmc/CONTROL | 5 ++++ ports/xvmc/portfile.cmake | 38 ++++++++++++++++++++++++++ ports/xxf86dga/CONTROL | 5 ++++ ports/xxf86dga/portfile.cmake | 38 ++++++++++++++++++++++++++ ports/xxf86vm/CONTROL | 5 ++++ ports/xxf86vm/portfile.cmake | 38 ++++++++++++++++++++++++++ 40 files changed, 872 insertions(+) create mode 100644 ports/applewm/CONTROL create mode 100644 ports/applewm/portfile.cmake create mode 100644 ports/fs/CONTROL create mode 100644 ports/fs/portfile.cmake create mode 100644 ports/xaw/CONTROL create mode 100644 ports/xaw/portfile.cmake create mode 100644 ports/xaw3d/CONTROL create mode 100644 ports/xaw3d/portfile.cmake create mode 100644 ports/xcomposite/CONTROL create mode 100644 ports/xcomposite/portfile.cmake create mode 100644 ports/xcursor/CONTROL create mode 100644 ports/xcursor/portfile.cmake create mode 100644 ports/xdamage/CONTROL create mode 100644 ports/xdamage/portfile.cmake create mode 100644 ports/xfont/CONTROL create mode 100644 ports/xfont/portfile.cmake create mode 100644 ports/xft/CONTROL create mode 100644 ports/xft/portfile.cmake create mode 100644 ports/xp/CONTROL create mode 100644 ports/xp/portfile.cmake create mode 100644 ports/xpm/CONTROL create mode 100644 ports/xpm/portfile.cmake create mode 100644 ports/xpresent/CONTROL create mode 100644 ports/xpresent/portfile.cmake create mode 100644 ports/xrandr/CONTROL create mode 100644 ports/xrandr/portfile.cmake create mode 100644 ports/xrandrutils/CONTROL create mode 100644 ports/xrandrutils/portfile.cmake create mode 100644 ports/xres/CONTROL create mode 100644 ports/xres/portfile.cmake create mode 100644 ports/xscrnsaver/CONTROL create mode 100644 ports/xscrnsaver/portfile.cmake create mode 100644 ports/xv/CONTROL create mode 100644 ports/xv/portfile.cmake create mode 100644 ports/xvmc/CONTROL create mode 100644 ports/xvmc/portfile.cmake create mode 100644 ports/xxf86dga/CONTROL create mode 100644 ports/xxf86dga/portfile.cmake create mode 100644 ports/xxf86vm/CONTROL create mode 100644 ports/xxf86vm/portfile.cmake diff --git a/ports/applewm/CONTROL b/ports/applewm/CONTROL new file mode 100644 index 00000000000000..0d46c58d71730a --- /dev/null +++ b/ports/applewm/CONTROL @@ -0,0 +1,5 @@ +Source: applewm +Version: 1.4.1 +Homepage: https://gitlab.freedesktop.org/xorg/lib/libapplewm +Description: Xlib-based library for the Apple-WM extension +Build-Depends: xorg-macros, bzip2, xproto, x11, xext diff --git a/ports/applewm/portfile.cmake b/ports/applewm/portfile.cmake new file mode 100644 index 00000000000000..b1778c4470e877 --- /dev/null +++ b/ports/applewm/portfile.cmake @@ -0,0 +1,38 @@ +message(STATUS "----- ${PORT} requires autoconf, libtool and pkconf from the system package manager! -----") + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libapplewm + REF 78e9081bd1dc88e4a86fc6e401647bdb5265fef7 # 1.4.1 + SHA512 d46d2be838b8ea7116ee0e312adafa80f6551762b5f7b5e503bd40e74fc0b43b45255e8135d03f831d5c483b98aac992fcd91a7e22119261e76778571a72ef07 + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) + +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL "export ACLOCAL=\"aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/\"" + #OPTIONS + #OPTIONS_DEBUG + #OPTIONS_RELEASE + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + diff --git a/ports/fs/CONTROL b/ports/fs/CONTROL new file mode 100644 index 00000000000000..24dc8fa7d957db --- /dev/null +++ b/ports/fs/CONTROL @@ -0,0 +1,5 @@ +Source: fs +Version: 1.0.8 +Homepage: https://gitlab.freedesktop.org/xorg/lib/libfs +Description: X Font Service client library +Build-Depends: xorg-macros, bzip2, xproto, xtrans diff --git a/ports/fs/portfile.cmake b/ports/fs/portfile.cmake new file mode 100644 index 00000000000000..89b9f61e7bedfa --- /dev/null +++ b/ports/fs/portfile.cmake @@ -0,0 +1,38 @@ +message(STATUS "----- ${PORT} requires autoconf, libtool and pkconf from the system package manager! -----") + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libfs + REF 02de7390e58f00a3701f656a2b205dc6c8dafb58 # 1.0.8 + SHA512 d46d2be838b8ea7116ee0e312adafa80f6551762b5f7b5e503bd40e74fc0b43b45255e8135d03f831d5c483b98aac992fcd91a7e22119261e76778571a72ef07 + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) + +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL "export ACLOCAL=\"aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/\"" + #OPTIONS + #OPTIONS_DEBUG + #OPTIONS_RELEASE + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + diff --git a/ports/xaw/CONTROL b/ports/xaw/CONTROL new file mode 100644 index 00000000000000..db272facd81fa7 --- /dev/null +++ b/ports/xaw/CONTROL @@ -0,0 +1,5 @@ +Source: xaw +Version: 1.0.13 +Homepage: https://gitlab.freedesktop.org/xorg/lib/libxaw +Description: X Athena Widget Set, based on the X Toolkit Intrinsics (Xt) Library +Build-Depends: xorg-macros, bzip2, xproto, x11, xext, xt, xmu, xpm diff --git a/ports/xaw/portfile.cmake b/ports/xaw/portfile.cmake new file mode 100644 index 00000000000000..9e7b8a5dd03c07 --- /dev/null +++ b/ports/xaw/portfile.cmake @@ -0,0 +1,38 @@ +message(STATUS "----- ${PORT} requires autoconf, libtool and pkconf from the system package manager! -----") + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxaw + REF 8c82c47a770274c50944f002b97369c4e30872d8 # 1.0.13 + SHA512 15b7afc706fe50c55391846892961e3286165e43513009664cfca7c443f9f9eafa32e17e8ba8089a0ae2d568aab4117f7e5ff696052ee58f6da78e3d9ad7e721 + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) + +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL "export ACLOCAL=\"aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/\"" + #OPTIONS + #OPTIONS_DEBUG + #OPTIONS_RELEASE + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + diff --git a/ports/xaw3d/CONTROL b/ports/xaw3d/CONTROL new file mode 100644 index 00000000000000..21f6b239ac07d3 --- /dev/null +++ b/ports/xaw3d/CONTROL @@ -0,0 +1,5 @@ +Source: xaw3d +Version: 1.6.3 +Homepage: https://gitlab.freedesktop.org/xorg/lib/libxaw3d +Description: 3D appearance variant of the X Athena Widget Set, based on the X Toolkit Intrinsics (Xt) Library +Build-Depends: xorg-macros, bzip2, xproto, x11, xext, xt, xmu diff --git a/ports/xaw3d/portfile.cmake b/ports/xaw3d/portfile.cmake new file mode 100644 index 00000000000000..bb973f1309b37b --- /dev/null +++ b/ports/xaw3d/portfile.cmake @@ -0,0 +1,38 @@ +message(STATUS "----- ${PORT} requires autoconf, libtool, Yacc, lex and pkconf from the system package manager! -----") #Lex and Yacc + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxaw3d + REF 62e18b8884efd39e8d764442f7b354d3e34fefbd # 1.6.3 + SHA512 c4cfbf3e6085c1b9e0fae3a15b1ec2a27af20c5f14c20a47f4c0fc96512feded888c7152484667135880bf93a12b0837730f29be416ea290795b385cbe511c5e + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) + +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL "export ACLOCAL=\"aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/\"" + #OPTIONS + #OPTIONS_DEBUG + #OPTIONS_RELEASE + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + diff --git a/ports/xcomposite/CONTROL b/ports/xcomposite/CONTROL new file mode 100644 index 00000000000000..39b2defbd8dbe6 --- /dev/null +++ b/ports/xcomposite/CONTROL @@ -0,0 +1,5 @@ +Source: xcomposite +Version: 0.4.5 +Homepage: https://gitlab.freedesktop.org/xorg/lib/libxcomposite +Description: Xlib-based client library for the Composite extension to the X11 protocol +Build-Depends: xorg-macros, bzip2, x11, xproto, xfixes \ No newline at end of file diff --git a/ports/xcomposite/portfile.cmake b/ports/xcomposite/portfile.cmake new file mode 100644 index 00000000000000..9fed12171031f9 --- /dev/null +++ b/ports/xcomposite/portfile.cmake @@ -0,0 +1,38 @@ +message(STATUS "----- ${PORT} requires autoconf, libtool and pkconf from the system package manager! -----") + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxcomposite + REF fd7d02cc014ac9bf5bb7e68b66102ea36a76a59a # 0.4.5 + SHA512 68ee9d61d364816bf190db010f624312e9daf8d6b411dc209486ac0c7d92b3c75ca5a2650bc085b0c444bec1adfefca593e1d9e6fda4ba12ab5f12ebe7fd6ade + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) + +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL "export ACLOCAL=\"aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/\"" + #OPTIONS + #OPTIONS_DEBUG + #OPTIONS_RELEASE + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + diff --git a/ports/xcursor/CONTROL b/ports/xcursor/CONTROL new file mode 100644 index 00000000000000..0a6717c8b9698c --- /dev/null +++ b/ports/xcursor/CONTROL @@ -0,0 +1,5 @@ +Source: xcursor +Version: 1.2.0 +Homepage: https://gitlab.freedesktop.org/xorg/lib/libxcursor +Description: Xlib-based Cursor management library +Build-Depends: xorg-macros, bzip2, x11, xproto, xfixes, xrender \ No newline at end of file diff --git a/ports/xcursor/portfile.cmake b/ports/xcursor/portfile.cmake new file mode 100644 index 00000000000000..c12e5f70d1b280 --- /dev/null +++ b/ports/xcursor/portfile.cmake @@ -0,0 +1,38 @@ +message(STATUS "----- ${PORT} requires autoconf, libtool and pkconf from the system package manager! -----") + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxcursor + REF b84b5d100f193fda0630c4d6fa889cd3e05ca033 # 1.2.0 + SHA512 b260aed8ae833cbbdef1e7f027d92c3705d60fc6a1174f6ee1fe5b6374ba2c90145f90ed687ad57daf229231b0e0548cb2773c418bdca85b55bee8bc3a803cce + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) + +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL "export ACLOCAL=\"aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/\"" + #OPTIONS + #OPTIONS_DEBUG + #OPTIONS_RELEASE + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + diff --git a/ports/xdamage/CONTROL b/ports/xdamage/CONTROL new file mode 100644 index 00000000000000..62d91ce57024bc --- /dev/null +++ b/ports/xdamage/CONTROL @@ -0,0 +1,5 @@ +Source: xdamage +Version: 1.1.5 +Homepage: https://gitlab.freedesktop.org/xorg/lib/libxdamage +Description: X Damage Extension library +Build-Depends: xorg-macros, bzip2, x11, xproto, xfixes \ No newline at end of file diff --git a/ports/xdamage/portfile.cmake b/ports/xdamage/portfile.cmake new file mode 100644 index 00000000000000..5363908c8cf4a1 --- /dev/null +++ b/ports/xdamage/portfile.cmake @@ -0,0 +1,38 @@ +message(STATUS "----- ${PORT} requires autoconf, libtool and pkconf from the system package manager! -----") + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxdamage + REF 977b04cd69738806e0b48fcf5c725763d065f06d # 1.1.5 + SHA512 79c3a4c63f6c50c39d324183b98ad7e70235aed1c8385acf2f593739c71e7929119448be3e15dffd276b32e4fbb056508deeb35f450f74b85c101047f68d4339 + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) + +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL "export ACLOCAL=\"aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/\"" + #OPTIONS + #OPTIONS_DEBUG + #OPTIONS_RELEASE + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + diff --git a/ports/xfont/CONTROL b/ports/xfont/CONTROL new file mode 100644 index 00000000000000..e3f99ca0df655a --- /dev/null +++ b/ports/xfont/CONTROL @@ -0,0 +1,5 @@ +Source: xfont +Version: 2.0.4 +Homepage: https://gitlab.freedesktop.org/xorg/lib/libxp +Description: X font handling library for server & utilities +Build-Depends: xorg-macros, bzip2, x11, xproto, xext, freetype, zlib, xtrans, fontenc \ No newline at end of file diff --git a/ports/xfont/portfile.cmake b/ports/xfont/portfile.cmake new file mode 100644 index 00000000000000..6028e93808bbd2 --- /dev/null +++ b/ports/xfont/portfile.cmake @@ -0,0 +1,38 @@ +message(STATUS "----- ${PORT} requires autoconf, libtool and pkconf from the system package manager! -----") + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxfont + REF ed8b8e9fe544ec51ab1b1dfaea6fced35470ad6c # 2.0.4 + SHA512 abea04d57a951434f1cb88005d0651b5cd67ce27c4581e9688c52bbb3a5e7771e0aa9af3a108250e137125b454dbb382b45b8b75d107e7b1eec670ac61a898f2 + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) + +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL "export ACLOCAL=\"aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/\"" + #OPTIONS + #OPTIONS_DEBUG + #OPTIONS_RELEASE + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + diff --git a/ports/xft/CONTROL b/ports/xft/CONTROL new file mode 100644 index 00000000000000..7056d80220bf8f --- /dev/null +++ b/ports/xft/CONTROL @@ -0,0 +1,5 @@ +Source: xft +Version: 2.3.3 +Homepage: https://gitlab.freedesktop.org/xorg/lib/libxft +Description: X FreeType library +Build-Depends: xorg-macros, bzip2, x11, xproto, xrender, freetype, fontconfig \ No newline at end of file diff --git a/ports/xft/portfile.cmake b/ports/xft/portfile.cmake new file mode 100644 index 00000000000000..1f06d2e1cffa7b --- /dev/null +++ b/ports/xft/portfile.cmake @@ -0,0 +1,38 @@ +message(STATUS "----- ${PORT} requires autoconf, libtool and pkconf from the system package manager! -----") + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxft + REF a266847d3c17dcdfcac719a1aa970ad54f4b545a # 2.3.3 + SHA512 48493609b53c7529faacc31ef72d8ca65020f19204f107ddb83e6808aa1a91a2af43fad8495e96c1fa53c69fe8674686555c9e6328358eda76632508551b11cd + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) + +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL "export ACLOCAL=\"aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/\"" + #OPTIONS + #OPTIONS_DEBUG + #OPTIONS_RELEASE + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + diff --git a/ports/xp/CONTROL b/ports/xp/CONTROL new file mode 100644 index 00000000000000..4f403eabc1e1c4 --- /dev/null +++ b/ports/xp/CONTROL @@ -0,0 +1,5 @@ +Source: xp +Version: 1.0.3 +Homepage: https://gitlab.freedesktop.org/xorg/lib/libxp +Description: X Print Client Library +Build-Depends: xorg-macros, bzip2, x11, xproto, xext, xau \ No newline at end of file diff --git a/ports/xp/portfile.cmake b/ports/xp/portfile.cmake new file mode 100644 index 00000000000000..2dfaa3ce171635 --- /dev/null +++ b/ports/xp/portfile.cmake @@ -0,0 +1,38 @@ +message(STATUS "----- ${PORT} requires autoconf, libtool and pkconf from the system package manager! -----") + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxp + REF 57ce065b3c4329838f82de7e791caa52345a8c6f # 1.0.3 + SHA512 112a0bbde4d5036507e2ff2484fe9f48dc4e4a9e989efac73423001fa9f6ff3ec2b7a375ddd8721224beb68b080198a7fca5f5af17d154b12bf807951cac4779 + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) + +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL "export ACLOCAL=\"aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/\"" + #OPTIONS + #OPTIONS_DEBUG + #OPTIONS_RELEASE + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + diff --git a/ports/xpm/CONTROL b/ports/xpm/CONTROL new file mode 100644 index 00000000000000..60a0d80a6459d7 --- /dev/null +++ b/ports/xpm/CONTROL @@ -0,0 +1,5 @@ +Source: xpm +Version: 3.5.13 +Homepage: https://gitlab.freedesktop.org/xorg/lib/libxpm +Description:X Pixmap (XPM) image file format library +Build-Depends: xorg-macros, bzip2, x11, xproto, xext \ No newline at end of file diff --git a/ports/xpm/portfile.cmake b/ports/xpm/portfile.cmake new file mode 100644 index 00000000000000..edd22fefae29fd --- /dev/null +++ b/ports/xpm/portfile.cmake @@ -0,0 +1,47 @@ +message(STATUS "----- ${PORT} requires autoconf, libtool and pkconf from the system package manager! -----") + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxpm + REF b0fc485495a694816d76a43978e2cfd5575c554d # 3.5.13 + SHA512 4637d7b4c1a0aa0a8f3e01eca53dffe61875fc2c1e1c9061d3cafd677cedb4b9e0f095dbb071de16f970c027cba2032d9dddb386032ae0321fa9562a42a9957e + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) + +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL "export ACLOCAL=\"aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/\"" + #OPTIONS + #OPTIONS_DEBUG + #OPTIONS_RELEASE + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +#TODO also create a binary +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}") +file(RENAME "${CURRENT_PACKAGES_DIR}/bin/cxpm${VCPKG_TARGET_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/cxpm${VCPKG_TARGET_EXECUTABLE_SUFFIX}") +file(RENAME "${CURRENT_PACKAGES_DIR}/bin/sxpm${VCPKG_TARGET_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/sxpm${VCPKG_TARGET_EXECUTABLE_SUFFIX}") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/man" "${CURRENT_PACKAGES_DIR}/share/${PORT}/man") \ No newline at end of file diff --git a/ports/xpresent/CONTROL b/ports/xpresent/CONTROL new file mode 100644 index 00000000000000..a94350aac94aa6 --- /dev/null +++ b/ports/xpresent/CONTROL @@ -0,0 +1,5 @@ +Source: xpresent +Version: 1.0.0 +Homepage: https://gitlab.freedesktop.org/xorg/lib/libxpresent +Description: Xlib-based library for the X Present Extension +Build-Depends: xorg-macros, bzip2, x11, xproto, xrandr, xext, xfixes \ No newline at end of file diff --git a/ports/xpresent/portfile.cmake b/ports/xpresent/portfile.cmake new file mode 100644 index 00000000000000..4036acfdffeb8e --- /dev/null +++ b/ports/xpresent/portfile.cmake @@ -0,0 +1,39 @@ +message(STATUS "----- ${PORT} requires autoconf, libtool and pkconf from the system package manager! -----") + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxpresent + REF ced59e4373b7ad8f89ba222b3f489fb22050b991 # 1.0.0 + SHA512 3904af03ff03a5fca84e63ed92b53668b7d3c9b8572dc829016dbdc3176f3813f7731e519c2769ae84c4c105a4f5dec8378165f02f48d89354842c4dd8062328 + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) +file(MAKE_DIRECTORY "${SOURCE_PATH}/m4/") +file(TOUCH "${SOURCE_PATH}/m4/dummy") +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL "export ACLOCAL=\"aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/\"" + #OPTIONS + #OPTIONS_DEBUG + #OPTIONS_RELEASE + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + diff --git a/ports/xrandr/CONTROL b/ports/xrandr/CONTROL new file mode 100644 index 00000000000000..89c248b137aff3 --- /dev/null +++ b/ports/xrandr/CONTROL @@ -0,0 +1,5 @@ +Source: xrandr +Version: 1.5.2 +Homepage: https://gitlab.freedesktop.org/xorg/lib/libxrandr +Description: Xlib Resize, Rotate and Reflection (RandR) extension library +Build-Depends: xorg-macros, bzip2, x11, xproto, xrender, xext \ No newline at end of file diff --git a/ports/xrandr/portfile.cmake b/ports/xrandr/portfile.cmake new file mode 100644 index 00000000000000..99095e315350a6 --- /dev/null +++ b/ports/xrandr/portfile.cmake @@ -0,0 +1,38 @@ +message(STATUS "----- ${PORT} requires autoconf, libtool and pkconf from the system package manager! -----") + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxrandr + REF 55dcda4518eda8ae03ef25ea29d3c994ad71eb0a # 1.5.2 + SHA512 63a3a7c5db8d41c73ef2f55e86a47bdae0112ac39802efa5da4fa26a8794066d6906d4a5e4e9af5abb5838a061f2583dc2b8865e38754ee3f2a8e3918de87168 + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) + +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL "export ACLOCAL=\"aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/\"" + #OPTIONS + #OPTIONS_DEBUG + #OPTIONS_RELEASE + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + diff --git a/ports/xrandrutils/CONTROL b/ports/xrandrutils/CONTROL new file mode 100644 index 00000000000000..1dc2a7f3693781 --- /dev/null +++ b/ports/xrandrutils/CONTROL @@ -0,0 +1,5 @@ +Source: xrandrutils +Version: 1 +Homepage: https://gitlab.freedesktop.org/xorg/lib/libxrandrutils +Description: High level wrapper utility library for libXrandr +Build-Depends: xorg-macros, bzip2, x11, xproto, xrandr \ No newline at end of file diff --git a/ports/xrandrutils/portfile.cmake b/ports/xrandrutils/portfile.cmake new file mode 100644 index 00000000000000..c4cfc85fa8bf50 --- /dev/null +++ b/ports/xrandrutils/portfile.cmake @@ -0,0 +1,40 @@ +message(STATUS "----- ${PORT} requires autoconf, libtool and pkconf from the system package manager! -----") + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxrandrutils + REF cd31e7fe468b7264181c41c5f62ed15de815dc7c + SHA512 39622c14e8e25c3038805874d5e6686f4464f4f8656f7b8b7fce4180c1fd4bd41018e2bfe0102662e13b037db6fd6ba3f47136424a012bebbdba0d915f5a315b + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) + +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL "export ACLOCAL=\"aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/\"" + #OPTIONS + #OPTIONS_DEBUG + #OPTIONS_RELEASE + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + + +#TODO: creates file executable xrandr diff --git a/ports/xres/CONTROL b/ports/xres/CONTROL new file mode 100644 index 00000000000000..229fd6052d3e72 --- /dev/null +++ b/ports/xres/CONTROL @@ -0,0 +1,5 @@ +Source: xres +Version: 1.2.0 +Homepage: https://gitlab.freedesktop.org/xorg/lib/libxres +Description: Xlib-based X-Resource extension client library +Build-Depends: xorg-macros, bzip2, xproto, x11, xext diff --git a/ports/xres/portfile.cmake b/ports/xres/portfile.cmake new file mode 100644 index 00000000000000..d0d01031319a27 --- /dev/null +++ b/ports/xres/portfile.cmake @@ -0,0 +1,38 @@ +message(STATUS "----- ${PORT} requires autoconf, libtool and pkconf from the system package manager! -----") #Lex and Yacc + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxres + REF 84b9156c7833dfd91c65d33542420ff4fe226948 # 1.2.0 + SHA512 3c3ba4b82fbc4856a827022b5b0a774eb39cb1bd53a7d6fdb3056c58648f2a38ea33efee9154611c29291983753dbf775ef74d1cba6aea59c5d8b98527abdecd + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) + +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL "export ACLOCAL=\"aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/\"" + #OPTIONS + #OPTIONS_DEBUG + #OPTIONS_RELEASE + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + diff --git a/ports/xscrnsaver/CONTROL b/ports/xscrnsaver/CONTROL new file mode 100644 index 00000000000000..a0e234928c1ed3 --- /dev/null +++ b/ports/xscrnsaver/CONTROL @@ -0,0 +1,5 @@ +Source: xscrnsaver +Version: 1.2.3 +Homepage: https://gitlab.freedesktop.org/xorg/lib/libxscrnsaver +Description: Xlib-based X11 Screen Saver extension client library +Build-Depends: xorg-macros, bzip2, xproto, x11, xext diff --git a/ports/xscrnsaver/portfile.cmake b/ports/xscrnsaver/portfile.cmake new file mode 100644 index 00000000000000..d5d77816f545fd --- /dev/null +++ b/ports/xscrnsaver/portfile.cmake @@ -0,0 +1,38 @@ +message(STATUS "----- ${PORT} requires autoconf, libtool and pkconf from the system package manager! -----") #Lex and Yacc + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxscrnsaver + REF 96fffcd9dcaf2ba37ec56aa798677de9ad58ae81 # 1.2.3 + SHA512 56ae74721db0c9970001b74227eadfe116d6cbfbb8dc318a4799f5034e0028572d5cc7acedbfb1b812a37bfc8cf21d35b62b264be08b17c695878c37d56bf9a2 + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) + +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL "export ACLOCAL=\"aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/\"" + #OPTIONS + #OPTIONS_DEBUG + #OPTIONS_RELEASE + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + diff --git a/ports/xv/CONTROL b/ports/xv/CONTROL new file mode 100644 index 00000000000000..edb3a70d246f23 --- /dev/null +++ b/ports/xv/CONTROL @@ -0,0 +1,5 @@ +Source: xv +Version: 1.0.11 +Homepage: https://gitlab.freedesktop.org/xorg/lib/libxv +Description: Xlib-based library for the X Video (Xv) extension to the X Window System +Build-Depends: xorg-macros, bzip2, x11, xproto \ No newline at end of file diff --git a/ports/xv/portfile.cmake b/ports/xv/portfile.cmake new file mode 100644 index 00000000000000..34717059d1615c --- /dev/null +++ b/ports/xv/portfile.cmake @@ -0,0 +1,38 @@ +message(STATUS "----- ${PORT} requires autoconf, libtool and pkconf from the system package manager! -----") + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxv + REF ef2a282876acc2316d338f8b66344ad5a2947057 # 1.0.11 + SHA512 0c97de51c22791cd6ea351f3b0ab8261b68d1283bcdc1784f9cc601fe54ef0c43f668e5bb9d8929c3ff8828f14fa48a8653566742d6a93455fe908d026517839 + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) + +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL "export ACLOCAL=\"aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/\"" + #OPTIONS + #OPTIONS_DEBUG + #OPTIONS_RELEASE + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + diff --git a/ports/xvmc/CONTROL b/ports/xvmc/CONTROL new file mode 100644 index 00000000000000..ff4921fba03b1c --- /dev/null +++ b/ports/xvmc/CONTROL @@ -0,0 +1,5 @@ +Source: xvmc +Version: 1.0.12 +Homepage: https://gitlab.freedesktop.org/xorg/lib/libxvmc +Description: Xlib-based X-Video Motion Compensation API +Build-Depends: xorg-macros, bzip2, xproto, xext, xv, x11 diff --git a/ports/xvmc/portfile.cmake b/ports/xvmc/portfile.cmake new file mode 100644 index 00000000000000..80fd0127c48768 --- /dev/null +++ b/ports/xvmc/portfile.cmake @@ -0,0 +1,38 @@ +message(STATUS "----- ${PORT} requires autoconf, libtool and pkconf from the system package manager! -----") + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxvmc + REF 36086307ba9fd1272365b964056e8a6780109478 # 1.0.12 + SHA512 1cb583e520176397855aa365ee4e75b15a3199f2f78d49e349ed2f6632cd94fe559308e93a914ea60d8067d4270ea13ebe75aa80bc95612601d15ea6e579f2ba + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) + +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL "export ACLOCAL=\"aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/\"" + #OPTIONS + #OPTIONS_DEBUG + #OPTIONS_RELEASE + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + diff --git a/ports/xxf86dga/CONTROL b/ports/xxf86dga/CONTROL new file mode 100644 index 00000000000000..b8fc2ee1e4d4e9 --- /dev/null +++ b/ports/xxf86dga/CONTROL @@ -0,0 +1,5 @@ +Source: xxf86dga +Version: 1.1.5 +Homepage: https://gitlab.freedesktop.org/xorg/lib/libxxf86dga +Description: Xlib-based library for the XFree86-DGA extension +Build-Depends: xorg-macros, bzip2, xproto, xext diff --git a/ports/xxf86dga/portfile.cmake b/ports/xxf86dga/portfile.cmake new file mode 100644 index 00000000000000..ded682c7291166 --- /dev/null +++ b/ports/xxf86dga/portfile.cmake @@ -0,0 +1,38 @@ +message(STATUS "----- ${PORT} requires autoconf, libtool and pkconf from the system package manager! -----") + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxxf86dga + REF e605c540995554af99d8b728c7d1d4e82e514199 # 1.1.5 + SHA512 910b90d3ea8f6267f90cd4c0d717a661e8181e5caecf119adbd866f8a478d9b84e24d7da41c6bd2591363909ca9421e56631cdd557a8e5043d2ee3645146db3f + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) + +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL "export ACLOCAL=\"aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/\"" + #OPTIONS + #OPTIONS_DEBUG + #OPTIONS_RELEASE + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + diff --git a/ports/xxf86vm/CONTROL b/ports/xxf86vm/CONTROL new file mode 100644 index 00000000000000..d718a5a173accb --- /dev/null +++ b/ports/xxf86vm/CONTROL @@ -0,0 +1,5 @@ +Source: xxf86vm +Version: 1.1.4 +Homepage: https://gitlab.freedesktop.org/xorg/lib/libxxf86vm +Description: Xlib-based library for the XFree86-VidMode X extension +Build-Depends: xorg-macros, bzip2, xproto, xext diff --git a/ports/xxf86vm/portfile.cmake b/ports/xxf86vm/portfile.cmake new file mode 100644 index 00000000000000..bf171a2afbdf4e --- /dev/null +++ b/ports/xxf86vm/portfile.cmake @@ -0,0 +1,38 @@ +message(STATUS "----- ${PORT} requires autoconf, libtool and pkconf from the system package manager! -----") + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxxf86vm + REF 92d18649e92566ccc3abeba244adabda249cce1b # 1.1.4 + SHA512 856158604d55954d4cba900792e865290f6c52d78bacaf35855ac64e7dfcd71d323ed1bbefe192357cdf21bcdee32311a4df6db99d074408a3a27637e8c49fa5 + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) + +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL "export ACLOCAL=\"aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/\"" + #OPTIONS + #OPTIONS_DEBUG + #OPTIONS_RELEASE + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + From aba3c54faec766333609fad491c28313b8acdbf1 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 1 Feb 2020 22:04:07 +0100 Subject: [PATCH 313/419] print the linter --- ports/xcb-proto/portfile.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/xcb-proto/portfile.cmake b/ports/xcb-proto/portfile.cmake index 8bad1027113775..952b885f17a26c 100644 --- a/ports/xcb-proto/portfile.cmake +++ b/ports/xcb-proto/portfile.cmake @@ -10,6 +10,7 @@ endif() string(REGEX REPLACE "/[^/]+$" "" XMLLINT_DIR "${XMLLINT_PATH}") file(TO_NATIVE_PATH "${XMLLINT_DIR}" XMLLINT_DIR_NATIVE) +message(STATUS "Using xmlling at: ${XMLLINT_PATH}") vcpkg_add_to_path("${XMLLINT_DIR_NATIVE}") #(also requires python2?) From 9a4fca4379c227220165931dde82eb4b5a674602 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 1 Feb 2020 23:11:17 +0100 Subject: [PATCH 314/419] add xlib patch. --- ports/qt5-base/patches/xlib.patch | 39 +++++++++++++++++++++++++++++++ ports/qt5-base/portfile.cmake | 1 + 2 files changed, 40 insertions(+) create mode 100644 ports/qt5-base/patches/xlib.patch diff --git a/ports/qt5-base/patches/xlib.patch b/ports/qt5-base/patches/xlib.patch new file mode 100644 index 00000000000000..9c572e5f0204c3 --- /dev/null +++ b/ports/qt5-base/patches/xlib.patch @@ -0,0 +1,39 @@ +diff --git a/src/gui/configure.json b/src/gui/configure.json +index 9a749516b..242f47504 100644 +--- a/src/gui/configure.json ++++ b/src/gui/configure.json +@@ -568,7 +568,9 @@ + }, + "headers": "X11/Xlib.h", + "sources": [ +- { "type": "makeSpec", "spec": "X11" } ++ { "type": "makeSpec", "spec": "X11" }, ++ { "type": "pkgConfig", "args": "x11" }, ++ { "type": "pkgConfig", "args": "x11 --static" } + ] + }, + "x11sm": { +@@ -590,6 +592,7 @@ + "headers": "xcb/xcb.h", + "sources": [ + { "type": "pkgConfig", "args": "xcb >= 1.9" }, ++ { "type": "pkgConfig", "args": "xcb >= 1.9 --static" }, + "-lxcb" + ] + }, +@@ -691,6 +694,7 @@ + "headers": "X11/Xlib-xcb.h", + "sources": [ + { "type": "pkgConfig", "args": "x11-xcb" }, ++ { "type": "pkgConfig", "args": "x11-xcb --static" }, + "-lX11-xcb" + ], + "use": "xcb xlib" +@@ -711,6 +715,7 @@ + "headers": "xcb/xkb.h", + "sources": [ + { "type": "pkgConfig", "args": "xcb-xkb >= 1.10" }, ++ { "type": "pkgConfig", "args": "xcb-xkb >= 1.10 --static" }, + "-lxcb-xkb" + ], + "use": "xcb" diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index f37a2f25b5032f..714ebfba0944c2 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -39,6 +39,7 @@ qt_download_submodule( OUT_SOURCE_PATH SOURCE_PATH patches/qt_app.patch #Moves the target location of qt5 host apps to always install into the host dir. patches/gui_configure.patch #Patches the gui configure.json to break freetype/fontconfig autodetection because it does not include its dependencies. patches/icu.patch #Help configure find static icu builds in vcpkg on windows + patches/xlib.patch #Patches Xlib check to actually use Pkgconfig instead of makeSpec only #patches/static_opengl.patch #Use this patch if you really want to statically link angle on windows (e.g. using -opengl es2 and -static). #Be carefull since it requires definining _GDI32_ for all dependent projects due to redefinition errors in the #the windows supplied gl.h header and the angle gl.h otherwise. From 3728bc6d7ade3d75f044505bb118364c214f54b8 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 1 Feb 2020 23:48:56 +0100 Subject: [PATCH 315/419] fix some failures --- ports/applewm/portfile.cmake | 2 +- ports/fs/portfile.cmake | 2 +- ports/xext/CONTROL | 2 +- ports/xlib/portfile.cmake | 5 +++++ ports/xp/portfile.cmake | 1 + ports/xpm/portfile.cmake | 11 +++++------ ports/xproto/portfile.cmake | 2 +- ports/xrandrutils/portfile.cmake | 9 +++++++-- 8 files changed, 22 insertions(+), 12 deletions(-) diff --git a/ports/applewm/portfile.cmake b/ports/applewm/portfile.cmake index b1778c4470e877..1cc1701425c065 100644 --- a/ports/applewm/portfile.cmake +++ b/ports/applewm/portfile.cmake @@ -5,7 +5,7 @@ vcpkg_from_gitlab( OUT_SOURCE_PATH SOURCE_PATH REPO lib/libapplewm REF 78e9081bd1dc88e4a86fc6e401647bdb5265fef7 # 1.4.1 - SHA512 d46d2be838b8ea7116ee0e312adafa80f6551762b5f7b5e503bd40e74fc0b43b45255e8135d03f831d5c483b98aac992fcd91a7e22119261e76778571a72ef07 + SHA512 a4afb77458e980f61b0d51d8d89f89c2b47eaca6674b7ff2473745d04b9dd59921401db74f53fe24e5b5e4221f311f69fcbfcaa0d5e0b37c53e68a6844e655bc HEAD_REF master # branch name #PATCHES example.patch #patch name ) diff --git a/ports/fs/portfile.cmake b/ports/fs/portfile.cmake index 89b9f61e7bedfa..855f8c45217ffc 100644 --- a/ports/fs/portfile.cmake +++ b/ports/fs/portfile.cmake @@ -5,7 +5,7 @@ vcpkg_from_gitlab( OUT_SOURCE_PATH SOURCE_PATH REPO lib/libfs REF 02de7390e58f00a3701f656a2b205dc6c8dafb58 # 1.0.8 - SHA512 d46d2be838b8ea7116ee0e312adafa80f6551762b5f7b5e503bd40e74fc0b43b45255e8135d03f831d5c483b98aac992fcd91a7e22119261e76778571a72ef07 + SHA512 7395434c20cebc45213122c12dc272773d100ade606d6fb2cacf94e2d102c9869124a89dbd0ddf2fa9128e8b238cf2f52b89d356b296e8d95ff352be48a4bc54 HEAD_REF master # branch name #PATCHES example.patch #patch name ) diff --git a/ports/xext/CONTROL b/ports/xext/CONTROL index 042dbe241bcbf2..d8b362e927d6be 100644 --- a/ports/xext/CONTROL +++ b/ports/xext/CONTROL @@ -2,4 +2,4 @@ Source: xext Version: 1.3.4 Homepage: https://gitlab.freedesktop.org/xorg/lib/libxext Description: Xlib-based library for common extensions to the X11 protocol -Build-Depends: xorg-macros +Build-Depends: xorg-macros, xproto, x11 diff --git a/ports/xlib/portfile.cmake b/ports/xlib/portfile.cmake index a90f5d771197de..308546dffc0193 100644 --- a/ports/xlib/portfile.cmake +++ b/ports/xlib/portfile.cmake @@ -31,6 +31,11 @@ vcpkg_configure_make( vcpkg_install_make() vcpkg_fixup_pkgconfig() +if(EXISTS "${CURRENT_INSTALLED_DIR}/include/X11/extensions/XKBgeom.h") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/X11/extensions/") #XKBgeom.h should be the only file in there +endif() +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) diff --git a/ports/xp/portfile.cmake b/ports/xp/portfile.cmake index 2dfaa3ce171635..bf4e9ae2d2b30f 100644 --- a/ports/xp/portfile.cmake +++ b/ports/xp/portfile.cmake @@ -1,3 +1,4 @@ +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) message(STATUS "----- ${PORT} requires autoconf, libtool and pkconf from the system package manager! -----") vcpkg_from_gitlab( diff --git a/ports/xpm/portfile.cmake b/ports/xpm/portfile.cmake index edd22fefae29fd..25d7ac954ae019 100644 --- a/ports/xpm/portfile.cmake +++ b/ports/xpm/portfile.cmake @@ -36,12 +36,11 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # # Handle copyright file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -#TODO also create a binary -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") -endif() -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}") file(RENAME "${CURRENT_PACKAGES_DIR}/bin/cxpm${VCPKG_TARGET_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/cxpm${VCPKG_TARGET_EXECUTABLE_SUFFIX}") file(RENAME "${CURRENT_PACKAGES_DIR}/bin/sxpm${VCPKG_TARGET_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/sxpm${VCPKG_TARGET_EXECUTABLE_SUFFIX}") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(RENAME "${CURRENT_PACKAGES_DIR}/share/man" "${CURRENT_PACKAGES_DIR}/share/${PORT}/man") \ No newline at end of file +file(RENAME "${CURRENT_PACKAGES_DIR}/share/man" "${CURRENT_PACKAGES_DIR}/share/${PORT}/man") +if(VCPKG_LIBRARY_LINKAGE STREQUAL static OR NOT VCPKG_TARGET_IS_WINDOWS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() \ No newline at end of file diff --git a/ports/xproto/portfile.cmake b/ports/xproto/portfile.cmake index ba166317ef9121..0ec95ebe10081d 100644 --- a/ports/xproto/portfile.cmake +++ b/ports/xproto/portfile.cmake @@ -21,7 +21,7 @@ vcpkg_configure_make( #AUTO_HOST #AUTO_DST #PRERUN_SHELL "export ACLOCAL=\"aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/\"" - #OPTIONS + OPTIONS --enable-legacy #OPTIONS_DEBUG #OPTIONS_RELEASE PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" diff --git a/ports/xrandrutils/portfile.cmake b/ports/xrandrutils/portfile.cmake index c4cfc85fa8bf50..2bc59ee8831973 100644 --- a/ports/xrandrutils/portfile.cmake +++ b/ports/xrandrutils/portfile.cmake @@ -36,5 +36,10 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) # # Handle copyright file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - -#TODO: creates file executable xrandr +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}") +file(RENAME "${CURRENT_PACKAGES_DIR}/bin/xrandr${VCPKG_TARGET_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/xrandr${VCPKG_TARGET_EXECUTABLE_SUFFIX}") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/man" "${CURRENT_PACKAGES_DIR}/share/${PORT}/man") +if(VCPKG_LIBRARY_LINKAGE STREQUAL static OR NOT VCPKG_TARGET_IS_WINDOWS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() \ No newline at end of file From 97fa3e2e7f94e7f460b344a74d17a4d568475306 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 1 Feb 2020 23:49:07 +0100 Subject: [PATCH 316/419] angle requires x11 on linux --- ports/angle/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/angle/CONTROL b/ports/angle/CONTROL index 26122342a0b335..54462c72b54b17 100644 --- a/ports/angle/CONTROL +++ b/ports/angle/CONTROL @@ -3,4 +3,4 @@ Version: 2019-12-31 Homepage: https://github.com/google/angle Description: A conformant OpenGL ES implementation for Windows, Mac and Linux. The goal of ANGLE is to allow users of multiple operating systems to seamlessly run WebGL and other OpenGL ES content by translating OpenGL ES API calls to one of the hardware-supported APIs available for that platform. ANGLE currently provides translation from OpenGL ES 2.0 and 3.0 to desktop OpenGL, OpenGL ES, Direct3D 9, and Direct3D 11. Support for translation from OpenGL ES to Vulkan is underway, and future plans include compute shader support (ES 3.1) and MacOS support. -Build-Depends: egl-registry +Build-Depends: egl-registry, x11 (linux) From 40c46985aea58ac08f281bf6ee44f1d1604a11a5 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sun, 2 Feb 2020 14:07:00 +0100 Subject: [PATCH 317/419] scan installed files to see if requirements are met in CI --- ports/xcb/portfile.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ports/xcb/portfile.cmake b/ports/xcb/portfile.cmake index 21a433a6bc043e..9c0500eb7c58c6 100644 --- a/ports/xcb/portfile.cmake +++ b/ports/xcb/portfile.cmake @@ -1,4 +1,7 @@ ## requires AUTOCONF, LIBTOOL and PKCONF + +file(GLOB_RECURSE _xorgfiles "${CURRENT_INSTALLED_DIR}/share/xorg/*") +message(STATUS "############# xorg files: ${_xorgfiles}") vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org/xorg OUT_SOURCE_PATH SOURCE_PATH From 1ebcaa506bf875d1ea7f488c2bdab60816a4fd61 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sun, 2 Feb 2020 18:57:06 +0100 Subject: [PATCH 318/419] retry xcb again --- ports/xcb/portfile.cmake | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/ports/xcb/portfile.cmake b/ports/xcb/portfile.cmake index 9c0500eb7c58c6..67883e44d3ad06 100644 --- a/ports/xcb/portfile.cmake +++ b/ports/xcb/portfile.cmake @@ -2,6 +2,8 @@ file(GLOB_RECURSE _xorgfiles "${CURRENT_INSTALLED_DIR}/share/xorg/*") message(STATUS "############# xorg files: ${_xorgfiles}") +file(GLOB_RECURSE _xcbfiles "${CURRENT_INSTALLED_DIR}/share/xcb/*") +message(STATUS "############# xcb files: ${_xcbfiles}") vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org/xorg OUT_SOURCE_PATH SOURCE_PATH @@ -28,19 +30,12 @@ vcpkg_configure_make( PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" ) - +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/xcb/") vcpkg_install_make() vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) - -# # Moves all .cmake files from /debug/share/Xlib/ to /share/Xlib/ -# # See /docs/maintainers/vcpkg_fixup_cmake_targets.md for more details -# vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/Xlib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # # Handle copyright file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - -# # Post-build test for cmake libraries -# vcpkg_test_cmake(PACKAGE_NAME Xlib) From 23c71a6089fd8242f57712ee1f04dfc8c2832bff Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sun, 2 Feb 2020 22:59:48 +0100 Subject: [PATCH 319/419] make make scripts respect flags correctly --- scripts/cmake/vcpkg_build_make.cmake | 61 ++++++++++++++++++------ scripts/cmake/vcpkg_configure_make.cmake | 58 ++++++++++++---------- scripts/cmake/vcpkg_install_make.cmake | 2 +- 3 files changed, 81 insertions(+), 40 deletions(-) diff --git a/scripts/cmake/vcpkg_build_make.cmake b/scripts/cmake/vcpkg_build_make.cmake index 202ef33f41c293..67a8e856c98182 100644 --- a/scripts/cmake/vcpkg_build_make.cmake +++ b/scripts/cmake/vcpkg_build_make.cmake @@ -78,6 +78,18 @@ function(vcpkg_build_make) message(FATAL_ERROR "${_VCPKG_MAKE_GENERATOR} not supported.") endif() + + set(C_FLAGS_BACKUP "$ENV{CFLAGS}") + set(CXX_FLAGS_BACKUP "$ENV{CXXFLAGS}") + set(LD_FLAGS_BACKUP "$ENV{LDFLAGS}") + set(C_FLAGS_GLOBAL "$ENV{CFLAGS} ${VCPKG_C_FLAGS}") + set(CXX_FLAGS_GLOBAL "$ENV{CXXFLAGS} ${VCPKG_CXX_FLAGS}") + set(LD_FLAGS_GLOBAL "$ENV{LDFLAGS} ${VCPKG_LINKER_FLAGS}") + if(NOT VCPKG_TARGET_IS_WINDOWS) + string(APPEND C_FLAGS_GLOBAL " -fPIC") + string(APPEND CXX_FLAGS_GLOBAL " -fPIC") + endif() + set(ENV{INCLUDE} "${CURRENT_INSTALLED_DIR}/include;$ENV{INCLUDE}") foreach(BUILDTYPE "debug" "release") @@ -88,6 +100,7 @@ function(vcpkg_build_make) continue() endif() set(SHORT_BUILDTYPE "-dbg") + set(CMAKE_BUILDTYPE "DEBUG") else() # In NO_DEBUG mode, we only use ${TARGET_TRIPLET} directory. if (_VCPKG_NO_DEBUG) @@ -95,41 +108,55 @@ function(vcpkg_build_make) else() set(SHORT_BUILDTYPE "-rel") endif() + set(CMAKE_BUILDTYPE "RELEASE") endif() if (CMAKE_HOST_WIN32) # In windows we can remotely call make - set(WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}${SHORT_BUILDTYPE}) + set(WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}${SHORT_BUILDTYPE}") else() - set(WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}${SHORT_BUILDTYPE}${_VCPKG_PROJECT_SUBPATH}) + set(WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}${SHORT_BUILDTYPE}${_VCPKG_PROJECT_SUBPATH}") endif() message(STATUS "Building ${TARGET_TRIPLET}${SHORT_BUILDTYPE}") if(_bc_ADD_BIN_TO_PATH) set(_BACKUP_ENV_PATH "$ENV{PATH}") - if(CMAKE_HOST_WIN32) - set(_PATHSEP ";") - else() - set(_PATHSEP ":") - endif() if(BUILDTYPE STREQUAL "debug") - set(ENV{PATH} "${CURRENT_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/bin${_PATHSEP}$ENV{PATH}") + vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/bin") else() - set(ENV{PATH} "${CURRENT_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin${_PATHSEP}$ENV{PATH}") + vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin") endif() endif() + if (CMAKE_HOST_WIN32) + set(TMP_CFLAGS "${C_FLAGS_GLOBAL} ${VCPKG_C_FLAGS_${CMAKE_BUILDTYPE}}") + string(REPLACE "/" "-" TMP_CFLAGS "${TMP_CFLAGS}") + set(ENV{CFLAGS} ${TMP_CFLAGS}) + + set(TMP_CXXFLAGS "${CXX_FLAGS_GLOBAL} ${VCPKG_CXX_FLAGS_${CMAKE_BUILDTYPE}}") + string(REPLACE "/" "-" TMP_CXXFLAGS "${TMP_CXXFLAGS}") + set(ENV{CXXFLAGS} ${TMP_CXXFLAGS}) + + set(TMP_LDFLAGS "${LD_FLAGS_GLOBAL} ${VCPKG_LINKER_FLAGS_${CMAKE_BUILDTYPE}}") + string(REPLACE "/" "-" TMP_LDFLAGS "${TMP_LDFLAGS}") + set(ENV{LDFLAGS} ${TMP_LDFLAGS}) + else() + set(ENV{CFLAGS} "${C_FLAGS_GLOBAL} ${VCPKG_C_FLAGS_${CMAKE_BUILDTYPE}}") + set(ENV{CXXFLAGS} "${CXX_FLAGS_GLOBAL} ${VCPKG_CXX_FLAGS_${CMAKE_BUILDTYPE}}") + set(ENV{LDFLAGS} "${LD_FLAGS_GLOBAL} ${VCPKG_LINKER_FLAGS_${CMAKE_BUILDTYPE}}") + endif() + if (CMAKE_HOST_WIN32) vcpkg_execute_build_process( COMMAND "${MAKE} ${MAKE_OPTS}" - WORKING_DIRECTORY ${WORKING_DIRECTORY} + WORKING_DIRECTORY "${WORKING_DIRECTORY}" LOGNAME "${_bc_LOGFILE_ROOT}-${TARGET_TRIPLET}${SHORT_BUILDTYPE}" ) else() vcpkg_execute_build_process( COMMAND "${MAKE};${MAKE_OPTS}" - WORKING_DIRECTORY ${WORKING_DIRECTORY} + WORKING_DIRECTORY "${WORKING_DIRECTORY}" LOGNAME "${_bc_LOGFILE_ROOT}-${TARGET_TRIPLET}${SHORT_BUILDTYPE}" ) endif() @@ -161,17 +188,17 @@ function(vcpkg_build_make) message(STATUS "Installing ${TARGET_TRIPLET}${SHORT_BUILDTYPE}") if (CMAKE_HOST_WIN32) # In windows we can remotely call make - set(WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}${SHORT_BUILDTYPE}) + set(WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}${SHORT_BUILDTYPE}") vcpkg_execute_build_process( COMMAND "${MAKE} ${INSTALL_OPTS}" - WORKING_DIRECTORY ${WORKING_DIRECTORY} + WORKING_DIRECTORY "${WORKING_DIRECTORY}" LOGNAME "install-${TARGET_TRIPLET}${SHORT_BUILDTYPE}" ) else() - set(WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}${SHORT_BUILDTYPE}${_VCPKG_PROJECT_SUBPATH}) + set(WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}${SHORT_BUILDTYPE}${_VCPKG_PROJECT_SUBPATH}") vcpkg_execute_build_process( COMMAND "${MAKE};${INSTALL_OPTS}" - WORKING_DIRECTORY ${WORKING_DIRECTORY} + WORKING_DIRECTORY "${WORKING_DIRECTORY}" LOGNAME "install-${TARGET_TRIPLET}${SHORT_BUILDTYPE}" ) endif() @@ -182,4 +209,8 @@ function(vcpkg_build_make) if (CMAKE_HOST_WIN32) set(ENV{PATH} "${PATH_GLOBAL}") endif() + + set(ENV{CFLAGS} "${C_FLAGS_BACKUP}") + set(ENV{CXXFLAGS} "${CXX_FLAGS_BACKUP}") + set(ENV{LDFLAGS} "${LD_FLAGS_BACKUP}") endfunction() diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index 90e05d167bf458..eb9a928fce60e9 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -153,7 +153,7 @@ function(vcpkg_configure_make) endif() endif() set(WIN_TARGET_COMPILER CC=cl) - set(ENV{PATH} "$ENV{PATH};${YASM_EXE_PATH};${MSYS_ROOT}/usr/bin;${PERL_EXE_PATH}") + vcpkg_add_to_path("${YASM_EXE_PATH}" "${MSYS_ROOT}/usr/bin" "${PERL_EXE_PATH}") set(BASH ${MSYS_ROOT}/usr/bin/bash.exe) elseif (_csc_AUTOCONFIG) find_program(autoreconf autoreconf REQUIRED) @@ -182,6 +182,18 @@ function(vcpkg_configure_make) endif() set(base_cmd ) + + set(C_FLAGS_BACKUP "$ENV{CFLAGS}") + set(CXX_FLAGS_BACKUP "$ENV{CXXFLAGS}") + set(LD_FLAGS_BACKUP "$ENV{LDFLAGS}") + set(C_FLAGS_GLOBAL "$ENV{CFLAGS} ${VCPKG_C_FLAGS}") + set(CXX_FLAGS_GLOBAL "$ENV{CXXFLAGS} ${VCPKG_CXX_FLAGS}") + set(LD_FLAGS_GLOBAL "$ENV{LDFLAGS} ${VCPKG_LINKER_FLAGS}") + if(NOT VCPKG_TARGET_IS_WINDOWS) + string(APPEND C_FLAGS_GLOBAL " -fPIC") + string(APPEND CXX_FLAGS_GLOBAL " -fPIC") + endif() + if(CMAKE_HOST_WIN32) set(base_cmd ${BASH} --noprofile --norc -c) @@ -198,10 +210,6 @@ function(vcpkg_configure_make) set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/windows.cmake") endif() include("${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}") - - set(C_FLAGS_GLOBAL "$ENV{CFLAGS} ${VCPKG_C_FLAGS}") - set(CXX_FLAGS_GLOBAL "$ENV{CXXFLAGS} ${VCPKG_CXX_FLAGS}") - set(LD_FLAGS_GLOBAL "$ENV{LDFLAGS}") if(VCPKG_TARGET_IS_UWP) set(ENV{LIBPATH} "$ENV{LIBPATH};$ENV{_WKITS10}references\\windows.foundation.foundationcontract\\2.0.0.0\\;$ENV{_WKITS10}references\\windows.foundation.universalapicontract\\3.0.0.0\\") @@ -245,18 +253,21 @@ function(vcpkg_configure_make) endif() if (CMAKE_HOST_WIN32) - unset(ENV{CFLAGS}) - unset(ENV{CXXFLAGS}) - unset(ENV{LDFLAGS}) - set(TMP_CFLAGS "${C_FLAGS_GLOBAL} ${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_DEBUG}") + set(TMP_CFLAGS "${C_FLAGS_GLOBAL} ${VCPKG_C_FLAGS_DEBUG}") string(REPLACE "/" "-" TMP_CFLAGS "${TMP_CFLAGS}") set(ENV{CFLAGS} ${TMP_CFLAGS}) - set(TMP_CXXFLAGS "${CXX_FLAGS_GLOBAL} ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}") + + set(TMP_CXXFLAGS "${CXX_FLAGS_GLOBAL} ${VCPKG_CXX_FLAGS_DEBUG}") string(REPLACE "/" "-" TMP_CXXFLAGS "${TMP_CXXFLAGS}") set(ENV{CXXFLAGS} ${TMP_CXXFLAGS}) - set(TMP_LDFLAGS "${LD_FLAGS_GLOBAL}") + + set(TMP_LDFLAGS "${LD_FLAGS_GLOBAL} ${VCPKG_LINKER_FLAGS_DEBUG}") string(REPLACE "/" "-" TMP_LDFLAGS "${TMP_LDFLAGS}") set(ENV{LDFLAGS} ${TMP_LDFLAGS}) + else() + set(ENV{CFLAGS} "${C_FLAGS_GLOBAL} ${VCPKG_C_FLAGS_DEBUG}") + set(ENV{CXXFLAGS} "${CXX_FLAGS_GLOBAL} ${VCPKG_CXX_FLAGS_DEBUG}") + set(ENV{LDFLAGS} "${LD_FLAGS_GLOBAL} ${VCPKG_LINKER_FLAGS_DEBUG}") endif() set(OBJ_DIR ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) @@ -323,20 +334,21 @@ function(vcpkg_configure_make) endif() if (CMAKE_HOST_WIN32) - unset(ENV{CFLAGS}) - unset(ENV{CXXFLAGS}) - unset(ENV{LDFLAGS}) - set(TMP_CFLAGS "${C_FLAGS_GLOBAL} ${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_RELEASE}") + set(TMP_CFLAGS "${C_FLAGS_GLOBAL} ${VCPKG_C_FLAGS_RELEASE}") string(REPLACE "/" "-" TMP_CFLAGS "${TMP_CFLAGS}") set(ENV{CFLAGS} ${TMP_CFLAGS}) - set(TMP_CXXFLAGS "${CXX_FLAGS_GLOBAL} ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}") + set(TMP_CXXFLAGS "${CXX_FLAGS_GLOBAL} ${VCPKG_CXX_FLAGS_RELEASE}") string(REPLACE "/" "-" TMP_CXXFLAGS "${TMP_CXXFLAGS}") set(ENV{CXXFLAGS} ${TMP_CXXFLAGS}) - set(TMP_LDFLAGS "${LD_FLAGS_GLOBAL} ${CMAKE_SHARED_LINKER_FLAGS_RELEASE}") + set(TMP_LDFLAGS "${LD_FLAGS_GLOBAL} ${VCPKG_LINKER_FLAGS_RELEASE}") string(REPLACE "/" "-" TMP_LDFLAGS "${TMP_LDFLAGS}") set(ENV{LDFLAGS} ${TMP_LDFLAGS}) + else() + set(ENV{CFLAGS} "${C_FLAGS_GLOBAL} ${VCPKG_C_FLAGS_RELEASE}") + set(ENV{CXXFLAGS} "${CXX_FLAGS_GLOBAL} ${VCPKG_CXX_FLAGS_RELEASE}") + set(ENV{LDFLAGS} "${LD_FLAGS_GLOBAL} ${VCPKG_LINKER_FLAGS_RELEASE}") endif() if (_csc_NO_DEBUG) @@ -374,13 +386,13 @@ function(vcpkg_configure_make) vcpkg_execute_required_process( COMMAND ${base_cmd} autoreconf -vfi WORKING_DIRECTORY ${_csc_SOURCE_PATH}/${_csc_PROJECT_SUBPATH} - LOGNAME prerun-${TAR_TRIPLET_DIR} + LOGNAME prerun-2-${TAR_TRIPLET_DIR} ) else() vcpkg_execute_required_process( COMMAND autoreconf -vfi WORKING_DIRECTORY ${PRJ_DIR} - LOGNAME prerun-${TAR_TRIPLET_DIR} + LOGNAME prerun-2-${TAR_TRIPLET_DIR} ) endif() endif() @@ -400,11 +412,9 @@ function(vcpkg_configure_make) endif() # Restore envs - if (CMAKE_HOST_WIN32) - set(ENV{CFLAGS} "${C_FLAGS_GLOBAL}") - set(ENV{CXXFLAGS} "${CXX_FLAGS_GLOBAL}") - set(ENV{LDFLAGS} "${LD_FLAGS_GLOBAL}") - endif() + set(ENV{CFLAGS} "${C_FLAGS_BACKUP}") + set(ENV{CXXFLAGS} "${CXX_FLAGS_BACKUP}") + set(ENV{LDFLAGS} "${LD_FLAGS_BACKUP}") if(_csc_PKG_CONFIG_PATHS) set(ENV{PKG_CONFIG_PATH} "${BACKUP_ENV_PKG_CONFIG_PATH}") diff --git a/scripts/cmake/vcpkg_install_make.cmake b/scripts/cmake/vcpkg_install_make.cmake index 1672d7c5a51249..c973d3733ff9c1 100644 --- a/scripts/cmake/vcpkg_install_make.cmake +++ b/scripts/cmake/vcpkg_install_make.cmake @@ -21,5 +21,5 @@ ## * [libosip2](https://github.com/Microsoft/vcpkg/blob/master/ports/libosip2/portfile.cmake) function(vcpkg_install_make) - vcpkg_build_make(LOGFILE_ROOT ENABLE_INSTALL) + vcpkg_build_make(LOGFILE_ROOT ENABLE_INSTALL ${ARGN}) endfunction() From 33d2c5844fe5574c984d71236c3feb270b70ef3e Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sun, 2 Feb 2020 23:00:27 +0100 Subject: [PATCH 320/419] more ports! --- ports/drm/CONTROL | 5 +++ ports/drm/portfile.cmake | 28 ++++++++++++++ ports/elfutils/CONTROL | 5 +++ ports/elfutils/portfile.cmake | 52 ++++++++++++++++++++++++++ ports/mesa/CONTROL | 5 +++ ports/mesa/portfile.cmake | 30 +++++++++++++++ ports/wayland-protocols/CONTROL | 5 +++ ports/wayland-protocols/portfile.cmake | 49 ++++++++++++++++++++++++ ports/wayland/CONTROL | 5 +++ ports/wayland/portfile.cmake | 47 +++++++++++++++++++++++ 10 files changed, 231 insertions(+) create mode 100644 ports/drm/CONTROL create mode 100644 ports/drm/portfile.cmake create mode 100644 ports/elfutils/CONTROL create mode 100644 ports/elfutils/portfile.cmake create mode 100644 ports/mesa/CONTROL create mode 100644 ports/mesa/portfile.cmake create mode 100644 ports/wayland-protocols/CONTROL create mode 100644 ports/wayland-protocols/portfile.cmake create mode 100644 ports/wayland/CONTROL create mode 100644 ports/wayland/portfile.cmake diff --git a/ports/drm/CONTROL b/ports/drm/CONTROL new file mode 100644 index 00000000000000..4e9e72624e27f2 --- /dev/null +++ b/ports/drm/CONTROL @@ -0,0 +1,5 @@ +Source: drm +Version: 2.4.100 +Homepage: https://gitlab.freedesktop.org/mesa/drm +Description: Direct Rendering Manager library and headers +Build-Depends: pciaccess diff --git a/ports/drm/portfile.cmake b/ports/drm/portfile.cmake new file mode 100644 index 00000000000000..a67b4561fab540 --- /dev/null +++ b/ports/drm/portfile.cmake @@ -0,0 +1,28 @@ + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org + OUT_SOURCE_PATH SOURCE_PATH + REPO mesa/drm + REF 0190f49a139e7069d7cad6a6890832831da1aa8b #v2.4.100 + SHA512 2d1d372e3f5007a6286f5e95f455af32dd678f04fa47629b7ddc461423120ae424e783985fa33c72bfd4ffc7d1c079a84f2f44bb3888b3d5e9eea458bb36c925 + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) + +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) +vcpkg_install_meson() + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Handle copyright +#file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) No license in source? +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/") +file(TOUCH "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") #already installed by xproto diff --git a/ports/elfutils/CONTROL b/ports/elfutils/CONTROL new file mode 100644 index 00000000000000..a96261c2734daa --- /dev/null +++ b/ports/elfutils/CONTROL @@ -0,0 +1,5 @@ +Source: elfutils +Version: 0.178 +Homepage: https://sourceware.org/elfutils/ +Description: elfutils is a collection of utilities and libraries to read, create and modify ELF binary files, find and handle DWARF debug data, symbols, thread state and stacktraces for processes and core files on GNU/Linux. +Build-Depends: diff --git a/ports/elfutils/portfile.cmake b/ports/elfutils/portfile.cmake new file mode 100644 index 00000000000000..9456250060d144 --- /dev/null +++ b/ports/elfutils/portfile.cmake @@ -0,0 +1,52 @@ +## vcpkg_from_git( +## OUT_SOURCE_PATH +## URL +## REF <59f7335e4d...> +## [PATCHES ...] +vcpkg_download_distfile(ARCHIVE + URLS "ftp://sourceware.org/pub/elfutils/0.178/elfutils-0.178.tar.bz2" + FILENAME "elfutils.tar.bz2" + SHA512 356656ad0db8f6877b461de1a11280de16a9cc5d8dde4381a938a212e828e32755135e5e3171d311c4c9297b728fbd98123048e2e8fbf7fe7de68976a2daabe5 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${ARCHIVE}" +) + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL ${SHELL_PATH} + OPTIONS --disable-debuginfod + #OPTIONS_DEBUG + #OPTIONS_RELEASE + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) +vcpkg_install_make() + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}") +set(TOOL_PREFIX eu) +set(TOOLS addr2line ar elfclassify elfcmp elfcompress elflint findtextrel make-debug-archive nm objdump ranlib readelf size stack strings strip unstrip) +foreach(_tool ${TOOLS}) + file(RENAME "${CURRENT_PACKAGES_DIR}/bin/${TOOL_PREFIX}-${_tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/${TOOL_PREFIX}-${_tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}") +endforeach() +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/man" "${CURRENT_PACKAGES_DIR}/share/${PORT}/man") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/locale" "${CURRENT_PACKAGES_DIR}/share/${PORT}/locale") +if(VCPKG_LIBRARY_LINKAGE STREQUAL static OR NOT VCPKG_TARGET_IS_WINDOWS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() diff --git a/ports/mesa/CONTROL b/ports/mesa/CONTROL new file mode 100644 index 00000000000000..b689d903b41aa2 --- /dev/null +++ b/ports/mesa/CONTROL @@ -0,0 +1,5 @@ +Source: mesa +Version: 19.3.3 +Homepage: https://www.mesa3d.org/ +Description: Mesa - The 3D Graphics Library +Build-Depends: drm, elfutils, wayland, wayland-protocols, xdamage, xshmfence, x11, xcb, xfixes, xext, xxf86vm, xrandr diff --git a/ports/mesa/portfile.cmake b/ports/mesa/portfile.cmake new file mode 100644 index 00000000000000..96b9731bf77b95 --- /dev/null +++ b/ports/mesa/portfile.cmake @@ -0,0 +1,30 @@ + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org + OUT_SOURCE_PATH SOURCE_PATH + REPO mesa/mesa + REF 352037317b36c7ffd13aa3be8dc12e23a38a5bf2 #v19.3.3 + SHA512 9813c98b6b04186e510e16b76b29d0ec1be75bcc0eca758a115ab93c289c72d9103c69c8e4025f3c48d0350b7432aba42167b3768bbbc5877720c036681f1fec + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) + +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -D gles1=false + -D gles2=true + -D shared-glapi=true + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) +vcpkg_install_meson() + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + diff --git a/ports/wayland-protocols/CONTROL b/ports/wayland-protocols/CONTROL new file mode 100644 index 00000000000000..1e07563acde23d --- /dev/null +++ b/ports/wayland-protocols/CONTROL @@ -0,0 +1,5 @@ +Source: wayland-protocols +Version: 1.18 +Homepage: https://wayland.freedesktop.org +Description: wayland-protocols contains Wayland protocols that add functionality not available in the Wayland core protocol. +Build-Depends: wayland diff --git a/ports/wayland-protocols/portfile.cmake b/ports/wayland-protocols/portfile.cmake new file mode 100644 index 00000000000000..536b0ac9f6986c --- /dev/null +++ b/ports/wayland-protocols/portfile.cmake @@ -0,0 +1,49 @@ +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org + OUT_SOURCE_PATH SOURCE_PATH + REPO wayland/wayland-protocols + REF 630fb089103a1d0eab1a684b853ab5c4d2b252aa #1.18 + SHA512 b9132ebe4a85556cdbf03bab2f874949b004f361c654c115b8a70ce25e582b153fbad7ff4b1b2206d456d5f8222f08129c002c7b80ae56495a5417d7b8bda0b1 + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) + +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/wayland/aclocal/") + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL ${SHELL_PATH} + #OPTIONS + #OPTIONS_DEBUG + #OPTIONS_RELEASE + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) + +vcpkg_install_make() + +vcpkg_fixup_pkgconfig() + +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") +endif() +if(EXISTS "${CURRENT_PACKAGES_DIR}/share/pkgconfig") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/share/pkgconfig" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + + diff --git a/ports/wayland/CONTROL b/ports/wayland/CONTROL new file mode 100644 index 00000000000000..6d18c03cff59cd --- /dev/null +++ b/ports/wayland/CONTROL @@ -0,0 +1,5 @@ +Source: wayland +Version: 1.17.92 +Homepage: https://wayland.freedesktop.org +Description: Core Wayland window system code and protocol +Build-Depends: libffi, expat, libxml2 diff --git a/ports/wayland/portfile.cmake b/ports/wayland/portfile.cmake new file mode 100644 index 00000000000000..47d8dd5935da8e --- /dev/null +++ b/ports/wayland/portfile.cmake @@ -0,0 +1,47 @@ + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org + OUT_SOURCE_PATH SOURCE_PATH + REPO wayland/wayland + REF 367d2985f3242d12c16a4f9074254584a8739d1f #1.17.92 + SHA512 1244d81bd07d7a4608b5546971b4182070b8caa52278ca6a5ac0f7cdf51f94000ff8015dc9f23ce9f686592d97e9a8b5c1daf64778c0ad05e99af19b3968240e + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) + +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS -Dcmake_prefix_path="${CURRENT_INSTALLED_DIR}" + -Ddtd_validation=false + -Ddocumentation=false + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) +vcpkg_install_meson() + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}") +file(RENAME "${CURRENT_PACKAGES_DIR}/bin/wayland-scanner${VCPKG_TARGET_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/wayland-scanner${VCPKG_TARGET_EXECUTABLE_SUFFIX}") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/aclocal" "${CURRENT_PACKAGES_DIR}/share/${PORT}/aclocal") +if(VCPKG_LIBRARY_LINKAGE STREQUAL static OR NOT VCPKG_TARGET_IS_WINDOWS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +set(_file "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/wayland-scanner.pc") +file(READ "${_file}" _contents) +string(REPLACE "bindir=\${prefix}/bin" "bindir=\${prefix}/tools/${PORT}" _contents "${_contents}") +file(WRITE "${_file}" "${_contents}") + +set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/wayland-scanner.pc") +file(READ "${_file}" _contents) +string(REPLACE "bindir=\${prefix}/bin" "bindir=\${prefix}/../tools/${PORT}" _contents "${_contents}") +file(WRITE "${_file}" "${_contents}") + From 1674403ae216bd82a7eb7f8e457f6267aaa56521 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sun, 2 Feb 2020 23:00:34 +0100 Subject: [PATCH 321/419] angle needs x11 --- ports/angle/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ports/angle/CMakeLists.txt b/ports/angle/CMakeLists.txt index e64b9aaa39e3f5..01933b617007d4 100644 --- a/ports/angle/CMakeLists.txt +++ b/ports/angle/CMakeLists.txt @@ -19,6 +19,9 @@ else() set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_POSITION_INDEPENDENT_CODE ON) + find_package(X11) + link_libraries(${X11_LIBRARIES}) + include_directories(${X11_INCLUDE_DIR}) endif() if (APPLE) From 98dc16967508d92cf806e3be7ce65d63d87ea255 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 3 Feb 2020 00:11:38 +0100 Subject: [PATCH 322/419] more fixes. mainly angle static build --- ports/angle/CMakeLists.txt | 90 +++++++++++++++++++++++-------- ports/angle/CONTROL | 4 +- ports/angle/portfile.cmake | 2 +- ports/egl-registry/CONTROL | 2 +- ports/egl-registry/portfile.cmake | 4 +- ports/mesa/meson.build.patch | 36 +++++++++++++ ports/mesa/portfile.cmake | 21 +++++++- 7 files changed, 130 insertions(+), 29 deletions(-) create mode 100644 ports/mesa/meson.build.patch diff --git a/ports/angle/CMakeLists.txt b/ports/angle/CMakeLists.txt index 01933b617007d4..d6234d5b6a41b0 100644 --- a/ports/angle/CMakeLists.txt +++ b/ports/angle/CMakeLists.txt @@ -19,9 +19,6 @@ else() set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_POSITION_INDEPENDENT_CODE ON) - find_package(X11) - link_libraries(${X11_LIBRARIES}) - include_directories(${X11_INCLUDE_DIR}) endif() if (APPLE) @@ -47,8 +44,8 @@ add_definitions( ) configure_file(commit.h include/id/commit.h COPYONLY) -include_directories(include src ${CMAKE_CURRENT_BINARY_DIR}/include) - +#include_directories(include src ${CMAKE_CURRENT_BINARY_DIR}/include) +include_directories(libEGL PUBLIC "$" "$" "$" "$") ########## # angle::common if(WINDOWS_DESKTOP) @@ -75,7 +72,7 @@ file(GLOB ANGLE_COMMON_SOURCES "src/common/third_party/smhasher/src/*.cpp") list(FILTER ANGLE_COMMON_SOURCES EXCLUDE REGEX "_unittest|event_tracer|${ANGLE_COMMON_PLATFORM_FILTER}") add_library(angle_common STATIC ${ANGLE_COMMON_SOURCES}) -target_include_directories(angle_common PUBLIC src/common/third_party/base) +target_include_directories(angle_common PUBLIC "$") add_library(angle::common ALIAS angle_common) ########## @@ -154,7 +151,7 @@ if(WINDOWS_DESKTOP OR LINUX OR APPLE) ) list(FILTER LIBANGLE_GL_SOURCES EXCLUDE REGEX "_unittest") add_library(angle_renderer_opengl INTERFACE) - target_sources(angle_renderer_opengl INTERFACE ${LIBANGLE_GL_SOURCES}) + target_sources(angle_renderer_opengl INTERFACE "$") target_compile_definitions(angle_renderer_opengl INTERFACE -DANGLE_ENABLE_OPENGL) add_library(angle::renderer::opengl ALIAS angle_renderer_opengl) endif() @@ -174,7 +171,7 @@ if(WIN32) set(LIBANGLE_D3D_WINRT_SOURCES ${LIBANGLE_D3D_SOURCES}) list(FILTER LIBANGLE_D3D_WINRT_SOURCES INCLUDE REGEX "winrt") add_library(angle_renderer_winrt INTERFACE) - target_sources(angle_renderer_winrt INTERFACE ${LIBANGLE_D3D_WINRT_SOURCES}) + target_sources(angle_renderer_winrt INTERFACE "$") add_library(angle::renderer::winrt ALIAS angle_renderer_winrt) endif() @@ -184,7 +181,7 @@ if(WIN32) list(FILTER LIBANGLE_D3D_DESKTOP_SOURCES INCLUDE REGEX "d3d9|win32|converged") find_library(D3D9_LIB NAMES d3d9) add_library(angle_renderer_win32 INTERFACE) - target_sources(angle_renderer_win32 INTERFACE ${LIBANGLE_D3D_DESKTOP_SOURCES}) + target_sources(angle_renderer_win32 INTERFACE "$") target_compile_definitions(angle_renderer_win32 INTERFACE -DANGLE_ENABLE_D3D9) target_link_libraries(angle_renderer_win32 INTERFACE ${D3D9_LIB}) add_library(angle::renderer::win32 ALIAS angle_renderer_win32) @@ -195,7 +192,7 @@ if(WIN32) find_library(DXGUID_LIB NAMES dxguid) find_library(D3D11_LIB NAMES d3d11) add_library(angle_renderer_d3d INTERFACE) - target_sources(angle_renderer_d3d INTERFACE ${LIBANGLE_D3D_SOURCES}) + target_sources(angle_renderer_d3d INTERFACE "$") target_compile_definitions(libANGLE PRIVATE -DANGLE_ENABLE_NULL PUBLIC -DLIBANGLE_IMPLEMENTATION - ${LIBANGLE_RENDERER_COMPILEDEF} + ${LIBANGLE_RENDERER_COMPILEDEF} + -DANGLE_EXPORT= + -DANGLE_UTIL_EXPORT= + -DEGLAPI= + -DGL_APICALL= + -DGL_API= ) add_library(angle::libANGLE ALIAS libANGLE) +if(BUILD_SHARED_LIBS) + target_compile_definitions(libANGLE + PRIVATE -DLIBANGLE_UTIL_IMPLEMENTATION + ) +endif() ########## # libGLESv2 @@ -347,12 +357,28 @@ target_link_libraries(libGLESv2 PRIVATE angle::common angle::libANGLE) target_compile_definitions(libGLESv2 PRIVATE -DLIBGLESV2_IMPLEMENTATION PUBLIC - -DGL_GLEXT_PROTOTYPES - -DGL_API= - -DGL_APICALL= - -DEGLAPI= - -DGL_API= + "-DGL_GLES_PROTOTYPES=1" + "-DGL_GLEXT_PROTOTYPES" + "-DEGL_EGL_PROTOTYPES=1" + "-DEGL_EGLEXT_PROTOTYPES" ) +if(BUILD_SHARED_LIBS) +else() + if(WIN32) + target_compile_definitions(libGLESv2 PRIVATE + "-DGL_API=" + "-DGL_APICALL=" + "-DEGLAPI=" + ) + else() + target_compile_definitions(libGLESv2 PRIVATE + "-DGL_API=__attribute__((visibility(\"default\")))" + "-DGL_APICALL=__attribute__((visibility(\"default\")))" + "-DEGLAPI=__attribute__((visibility(\"default\")))" + ) + endif() +endif() + target_include_directories(libGLESv2 PUBLIC "$") ########## @@ -364,15 +390,37 @@ add_library(libEGL "src/libEGL/resource.h" ) target_link_libraries(libEGL PRIVATE angle::common angle::libANGLE libGLESv2) -target_include_directories(libEGL PUBLIC "$") -target_include_directories(libEGL PUBLIC "$") - +target_include_directories(libEGL PUBLIC "$" "$") +target_compile_definitions(libEGL + PRIVATE -DLIBGLESV2_IMPLEMENTATION + PUBLIC + "-DGL_GLES_PROTOTYPES=1" + "-DGL_GLEXT_PROTOTYPES" + "-DEGL_EGL_PROTOTYPES=1" + "-DEGL_EGLEXT_PROTOTYPES" +) +if(BUILD_SHARED_LIBS) +else() + if(WIN32) + target_compile_definitions(libEGL PRIVATE + "-DGL_API=" + "-DGL_APICALL=" + "-DEGLAPI=" + ) + else() + target_compile_definitions(libEGL PRIVATE + "-DGL_API=__attribute__((visibility(\"default\")))" + "-DGL_APICALL=__attribute__((visibility(\"default\")))" + "-DEGLAPI=__attribute__((visibility(\"default\")))" + ) + endif() +endif() SET_TARGET_PROPERTIES(libANGLE PROPERTIES PREFIX "") SET_TARGET_PROPERTIES(libGLESv2 PROPERTIES PREFIX "") SET_TARGET_PROPERTIES(libEGL PROPERTIES PREFIX "") -install(TARGETS libEGL libGLESv2 EXPORT ANGLEExport +install(TARGETS libEGL libGLESv2 libANGLE angle_common angle_image_util angle_gpu_info_util angle_translator angle_preprocessor angle_renderer_opengl EXPORT ANGLEExport RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib diff --git a/ports/angle/CONTROL b/ports/angle/CONTROL index 54462c72b54b17..c7eedf1ac8a947 100644 --- a/ports/angle/CONTROL +++ b/ports/angle/CONTROL @@ -1,6 +1,6 @@ Source: angle -Version: 2019-12-31 +Version: 2019-12-31-1 Homepage: https://github.com/google/angle Description: A conformant OpenGL ES implementation for Windows, Mac and Linux. The goal of ANGLE is to allow users of multiple operating systems to seamlessly run WebGL and other OpenGL ES content by translating OpenGL ES API calls to one of the hardware-supported APIs available for that platform. ANGLE currently provides translation from OpenGL ES 2.0 and 3.0 to desktop OpenGL, OpenGL ES, Direct3D 9, and Direct3D 11. Support for translation from OpenGL ES to Vulkan is underway, and future plans include compute shader support (ES 3.1) and MacOS support. -Build-Depends: egl-registry, x11 (linux) +Build-Depends: egl-registry, x11 (linux), mesa (linux) diff --git a/ports/angle/portfile.cmake b/ports/angle/portfile.cmake index d5c091e6b45d72..55d3814e8b2d90 100644 --- a/ports/angle/portfile.cmake +++ b/ports/angle/portfile.cmake @@ -1,4 +1,4 @@ -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) +#vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) if (VCPKG_TARGET_IS_LINUX) message(WARNING "Building with a gcc version less than 6.1 is not supported.") diff --git a/ports/egl-registry/CONTROL b/ports/egl-registry/CONTROL index 64b4745a4490dd..dad0d9d20c11eb 100644 --- a/ports/egl-registry/CONTROL +++ b/ports/egl-registry/CONTROL @@ -1,3 +1,3 @@ Source: egl-registry -Version: 2019-08-08 +Version: 2020-02-03 Description: the EGL API and Extension Registry diff --git a/ports/egl-registry/portfile.cmake b/ports/egl-registry/portfile.cmake index 9c7265d6b9f6d4..68f6a2ee8f2e7d 100644 --- a/ports/egl-registry/portfile.cmake +++ b/ports/egl-registry/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/EGL-Registry - REF 598f20e3b7b7eec3e8d8a83e64b9592a21c55bb6 - SHA512 360aa2399fec12ad23c5e4bce7e9287a9b1b1d98ba6c326dde2b1bc1c32735bc6933ca8e5c626ba421cda5aac216bc7c268e064cf0dd67605a23151e29ba1f36 + REF aa9b63f3ab18aee92c95786a2478156430f809e4 + SHA512 5ee7143c2cb46defbe1b2ecb0fabfb52fac2d9529b98c638dd4c04a312a62e7f7b3aee27d9749c92174ab967d533136b5881ce37ae9f2bee6685f52ffa8c8db6 HEAD_REF master ) diff --git a/ports/mesa/meson.build.patch b/ports/mesa/meson.build.patch new file mode 100644 index 00000000000000..2c4f1ab57cef65 --- /dev/null +++ b/ports/mesa/meson.build.patch @@ -0,0 +1,36 @@ +diff --git a/meson.build b/meson.build +index 7e2295b59..8dabf2054 100644 +--- a/meson.build ++++ b/meson.build +@@ -1577,21 +1577,21 @@ dep_xcb_xrandr = null_dep + dep_xlib_xrandr = null_dep + if with_platform_x11 + if with_glx == 'xlib' or with_glx == 'gallium-xlib' +- dep_x11 = dependency('x11') +- dep_xext = dependency('xext') +- dep_xcb = dependency('xcb') ++ dep_x11 = dependency('x11', static: true) ++ dep_xext = dependency('xext', static: true) ++ dep_xcb = dependency('xcb', static: true) + elif with_glx == 'dri' +- dep_x11 = dependency('x11') +- dep_xext = dependency('xext') +- dep_xdamage = dependency('xdamage', version : '>= 1.1') +- dep_xfixes = dependency('xfixes') +- dep_xcb_glx = dependency('xcb-glx', version : '>= 1.8.1') ++ dep_x11 = dependency('x11', static: true) ++ dep_xext = dependency('xext', static: true) ++ dep_xdamage = dependency('xdamage', version : '>= 1.1', static: true) ++ dep_xfixes = dependency('xfixes', static: true) ++ dep_xcb_glx = dependency('xcb-glx', version : '>= 1.8.1', static: true) + endif + if (with_any_vk or with_glx == 'dri' or with_egl or + (with_gallium_vdpau or with_gallium_xvmc or with_gallium_va or + with_gallium_omx != 'disabled')) +- dep_xcb = dependency('xcb') +- dep_x11_xcb = dependency('x11-xcb') ++ dep_xcb = dependency('xcb', static: true) ++ dep_x11_xcb = dependency('x11-xcb', static: true) + if with_dri_platform == 'drm' and not dep_libdrm.found() + error('libdrm required for gallium video statetrackers when using x11') + endif diff --git a/ports/mesa/portfile.cmake b/ports/mesa/portfile.cmake index 96b9731bf77b95..d82b015d16928a 100644 --- a/ports/mesa/portfile.cmake +++ b/ports/mesa/portfile.cmake @@ -1,4 +1,11 @@ +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + set(PATCHES meson.build.patch) + # this patch is not 100% correct since xcb and xcb-xkb can be build dynamically in a custom triplet + # However, VCPKG currently is limited by the possibilities of meson and they have to fix their lib dependency detection + list(APPEND MESA_OPTIONS -Dshared-llvm=false) # add llvm to CONTROL? +endif() + vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org OUT_SOURCE_PATH SOURCE_PATH @@ -12,9 +19,12 @@ vcpkg_from_gitlab( vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -D gles1=false + -D gles1=true -D gles2=true -D shared-glapi=true + -D gles-lib-suffix=MESA + -D egl-lib-suffix=MESA + "${MESA_OPTIONS}" PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" ) @@ -25,6 +35,13 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE ${CURRENT_PACKAGES_DIR}/include/KHR/khrplatform.h) +file(REMOVE ${CURRENT_PACKAGES_DIR}/include/EGL/egl.h) +file(REMOVE ${CURRENT_PACKAGES_DIR}/include/EGL/eglext.h) +file(REMOVE ${CURRENT_PACKAGES_DIR}/include/EGL/eglplatform.h) + # # Handle copyright -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(TOUCH "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") + From 92ffaba82bbe6631972e16eabdd89ac53ef52807 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 3 Feb 2020 00:26:03 +0100 Subject: [PATCH 323/419] fix conflict with egl-registry --- ports/mesa/CONTROL | 2 +- ports/mesa/portfile.cmake | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ports/mesa/CONTROL b/ports/mesa/CONTROL index b689d903b41aa2..153dd89c476392 100644 --- a/ports/mesa/CONTROL +++ b/ports/mesa/CONTROL @@ -2,4 +2,4 @@ Source: mesa Version: 19.3.3 Homepage: https://www.mesa3d.org/ Description: Mesa - The 3D Graphics Library -Build-Depends: drm, elfutils, wayland, wayland-protocols, xdamage, xshmfence, x11, xcb, xfixes, xext, xxf86vm, xrandr +Build-Depends: drm, elfutils, wayland, wayland-protocols, xdamage, xshmfence, x11, xcb, xfixes, xext, xxf86vm, xrandr, egl-registry diff --git a/ports/mesa/portfile.cmake b/ports/mesa/portfile.cmake index d82b015d16928a..747200807f125a 100644 --- a/ports/mesa/portfile.cmake +++ b/ports/mesa/portfile.cmake @@ -35,7 +35,8 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE ${CURRENT_PACKAGES_DIR}/include/KHR/khrplatform.h) +#installed by egl-registry +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/KHR) file(REMOVE ${CURRENT_PACKAGES_DIR}/include/EGL/egl.h) file(REMOVE ${CURRENT_PACKAGES_DIR}/include/EGL/eglext.h) file(REMOVE ${CURRENT_PACKAGES_DIR}/include/EGL/eglplatform.h) From 40ef522bcff1244a2a3a1e3a7d245198974914b4 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 3 Feb 2020 00:34:15 +0100 Subject: [PATCH 324/419] improve angle. create object libs instead of static libs. --- ports/angle/CMakeLists.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ports/angle/CMakeLists.txt b/ports/angle/CMakeLists.txt index d6234d5b6a41b0..96ee6030e285ce 100644 --- a/ports/angle/CMakeLists.txt +++ b/ports/angle/CMakeLists.txt @@ -71,14 +71,14 @@ file(GLOB ANGLE_COMMON_SOURCES "src/common/third_party/smhasher/src/*.h" "src/common/third_party/smhasher/src/*.cpp") list(FILTER ANGLE_COMMON_SOURCES EXCLUDE REGEX "_unittest|event_tracer|${ANGLE_COMMON_PLATFORM_FILTER}") -add_library(angle_common STATIC ${ANGLE_COMMON_SOURCES}) +add_library(angle_common OBJECT ${ANGLE_COMMON_SOURCES}) target_include_directories(angle_common PUBLIC "$") add_library(angle::common ALIAS angle_common) ########## # angle::image_util file(GLOB ANGLE_IMAGE_UTIL_SOURCES "src/image_util/*.h" "src/image_util/*.inl" "src/image_util/*.cpp") -add_library(angle_image_util STATIC ${ANGLE_IMAGE_UTIL_SOURCES}) +add_library(angle_image_util OBJECT ${ANGLE_IMAGE_UTIL_SOURCES}) target_link_libraries(angle_image_util PRIVATE angle::common) add_library(angle::image_util ALIAS angle_image_util) @@ -96,7 +96,7 @@ file(GLOB TRANSLATOR_SOURCES "src/third_party/compiler/ArrayBoundsClamper.cpp" ) list(FILTER TRANSLATOR_SOURCES EXCLUDE REGEX "_unittest") -add_library(angle_translator STATIC ${TRANSLATOR_SOURCES}) +add_library(angle_translator OBJECT ${TRANSLATOR_SOURCES}) target_compile_definitions(angle_translator PUBLIC -DANGLE_ENABLE_ESSL -DANGLE_ENABLE_GLSL @@ -111,7 +111,7 @@ file(GLOB PREPROCESSOR_SOURCES "src/compiler/preprocessor/*.h" "src/compiler/preprocessor/*.cpp" ) -add_library(angle_preprocessor STATIC ${PREPROCESSOR_SOURCES}) +add_library(angle_preprocessor OBJECT ${PREPROCESSOR_SOURCES}) target_link_libraries(angle_preprocessor PRIVATE angle::common) add_library(angle::preprocessor ALIAS angle_preprocessor) @@ -207,7 +207,7 @@ file(GLOB ANGLE_GPU_INFO_UTIL_SOURCES "src/gpu_info_util/SystemInfo_internal.h" "src/gpu_info_util/SystemInfo.cpp" ) -add_library(angle_gpu_info_util STATIC ${ANGLE_GPU_INFO_UTIL_SOURCES}) +add_library(angle_gpu_info_util OBJECT ${ANGLE_GPU_INFO_UTIL_SOURCES}) if(WIN32) target_sources(angle_gpu_info_util PRIVATE "src/gpu_info_util/SystemInfo_win.cpp") target_link_libraries(angle_gpu_info_util PRIVATE setupapi.lib dxgi.lib) @@ -216,7 +216,7 @@ elseif(APPLE) find_library(IOKit IOKit) find_library(CoreFoundation CoreFoundation) find_library(CoreGraphics CoreGraphics) - target_link_libraries(angle_gpu_info_util PRIVATE ${IOKit} ${CoreFoundation} ${CoreGraphics}) + target_link_libraries(angle_gpu_info_util OBJECT ${IOKit} ${CoreFoundation} ${CoreGraphics}) elseif(LINUX) target_sources(angle_gpu_info_util PRIVATE "src/gpu_info_util/SystemInfo_linux.cpp" "src/gpu_info_util/SystemInfo_x11.cpp") target_compile_definitions(angle_gpu_info_util PRIVATE GPU_INFO_USE_X11) From ecd02a3454b8dc4d3a9561c709df559017d58e8c Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 3 Feb 2020 00:44:08 +0100 Subject: [PATCH 325/419] add todo --- ports/angle/portfile.cmake | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/ports/angle/portfile.cmake b/ports/angle/portfile.cmake index 55d3814e8b2d90..9811565df35395 100644 --- a/ports/angle/portfile.cmake +++ b/ports/angle/portfile.cmake @@ -44,3 +44,16 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-angle TARGET_PATH share/u vcpkg_copy_pdbs() file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +#TODO: conflict with mesa! + # include/GLES/egl.h + # include/GLES/gl.h + # include/GLES/glext.h + # include/GLES/glplatform.h + # include/GLES2/gl2.h + # include/GLES2/gl2ext.h + # include/GLES2/gl2platform.h + # include/GLES3/gl3.h + # include/GLES3/gl31.h + # include/GLES3/gl32.h + # include/GLES3/gl3platform.h From 854f5168d94397bf5fa1e6dbb76a0d2cb2a0b8d9 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 3 Feb 2020 00:44:16 +0100 Subject: [PATCH 326/419] some scripts improvements --- scripts/cmake/vcpkg_configure_meson.cmake | 14 ++++++++------ scripts/cmake/vcpkg_fixup_pkgconfig.cmake | 1 + 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index cd453c4d697c98..1d67e6ef482e18 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -6,8 +6,10 @@ function(vcpkg_configure_meson) # use the same compiler options as in vcpkg_configure_cmake if(NOT VCPKG_CHAINLOAD_TOOLCHAIN_FILE) + set(_MESON_FLAG_SUFFIX "_INIT") if(NOT DEFINED VCPKG_CMAKE_SYSTEM_NAME OR _TARGETTING_UWP) set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/windows.cmake") + set(_MESON_FLAG_SUFFIX "") elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/linux.cmake") elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Android") @@ -30,14 +32,14 @@ function(vcpkg_configure_meson) endforeach() endif() - set(MESON_COMMON_CFLAGS "${MESON_COMMON_CFLAGS} ${CMAKE_C_FLAGS}") - set(MESON_COMMON_CXXFLAGS "${MESON_COMMON_CXXFLAGS} ${CMAKE_CXX_FLAGS}") + set(MESON_COMMON_CFLAGS "${MESON_COMMON_CFLAGS} ${CMAKE_C_FLAGS${_MESON_FLAG_SUFFIX}}") + set(MESON_COMMON_CXXFLAGS "${MESON_COMMON_CXXFLAGS} ${CMAKE_CXX_FLAGS${_MESON_FLAG_SUFFIX}}") - set(MESON_DEBUG_CFLAGS "${MESON_DEBUG_CFLAGS} ${CMAKE_C_FLAGS_DEBUG}") - set(MESON_DEBUG_CXXFLAGS "${MESON_DEBUG_CXXFLAGS} ${CMAKE_CXX_FLAGS_DEBUG}") + set(MESON_DEBUG_CFLAGS "${MESON_DEBUG_CFLAGS} ${CMAKE_C_FLAGS_DEBUG${_MESON_FLAG_SUFFIX}}") + set(MESON_DEBUG_CXXFLAGS "${MESON_DEBUG_CXXFLAGS} ${CMAKE_CXX_FLAGS_DEBUG${_MESON_FLAG_SUFFIX}}") - set(MESON_RELEASE_CFLAGS "${MESON_RELEASE_CFLAGS} ${CMAKE_C_FLAGS_RELEASE}") - set(MESON_RELEASE_CXXFLAGS "${MESON_RELEASE_CXXFLAGS} ${CMAKE_CXX_FLAGS_RELEASE}") + set(MESON_RELEASE_CFLAGS "${MESON_RELEASE_CFLAGS} ${CMAKE_C_FLAGS_RELEASE${_MESON_FLAG_SUFFIX}}") + set(MESON_RELEASE_CXXFLAGS "${MESON_RELEASE_CXXFLAGS} ${CMAKE_CXX_FLAGS_RELEASE${_MESON_FLAG_SUFFIX}}") if(VCPKG_TARGET_IS_WINDOWS) set(MESON_COMMON_LDFLAGS "${MESON_COMMON_LDFLAGS} /DEBUG") diff --git a/scripts/cmake/vcpkg_fixup_pkgconfig.cmake b/scripts/cmake/vcpkg_fixup_pkgconfig.cmake index 2653ac026eb28a..93b13288766338 100644 --- a/scripts/cmake/vcpkg_fixup_pkgconfig.cmake +++ b/scripts/cmake/vcpkg_fixup_pkgconfig.cmake @@ -39,6 +39,7 @@ function(vcpkg_fixup_pkgconfig) string(REPLACE "${CURRENT_INSTALLED_DIR}" "\${prefix}" _contents "${_contents}") string(REPLACE "debug/include" "../include" _contents "${_contents}") string(REPLACE "debug/share" "../share" _contents "${_contents}") + string(REPLACE "\${prefix}/share" "\${prefix}/../share" _contents "${_contents}") string(REPLACE "debug/lib" "lib" _contents "${_contents}") # the prefix will contain the debug keyword string(REGEX REPLACE "^prefix=\\\${prefix}" "prefix=${CURRENT_INSTALLED_DIR}" _contents "${_contents}") file(WRITE "${_file}" "${_contents}") From fb7c5b86e88d05b6ff29d7e03f4978c99c20254b Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 3 Feb 2020 09:39:30 +0100 Subject: [PATCH 327/419] install zlib pkgconfig to avoid picking about system pkgconfig on linux --- ports/zlib/CONTROL | 2 +- ports/zlib/pkgconfig.patch | 22 ++++++++++++++++++++++ ports/zlib/portfile.cmake | 3 ++- 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 ports/zlib/pkgconfig.patch diff --git a/ports/zlib/CONTROL b/ports/zlib/CONTROL index aa7c7b6e92b665..601fb1bc0eda06 100644 --- a/ports/zlib/CONTROL +++ b/ports/zlib/CONTROL @@ -1,4 +1,4 @@ Source: zlib -Version: 1.2.11-5 +Version: 1.2.11-6 Homepage: https://www.zlib.net/ Description: A compression library diff --git a/ports/zlib/pkgconfig.patch b/ports/zlib/pkgconfig.patch new file mode 100644 index 00000000000000..ca2e5dcb0b8d0e --- /dev/null +++ b/ports/zlib/pkgconfig.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8d2f5f15c..8f60286c8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -13,7 +13,7 @@ set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation direc + set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries") + set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers") + set(INSTALL_MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE PATH "Installation directory for manual pages") +-set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/share/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files") ++set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files") + + include(CheckTypeSize) + include(CheckFunctionExists) +@@ -231,7 +231,7 @@ endif() + if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL ) + install(FILES zlib.3 DESTINATION "${INSTALL_MAN_DIR}/man3") + endif() +-if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL ) ++if(NOT SKIP_INSTALL_PKGCONFIG AND NOT SKIP_INSTALL_ALL ) + install(FILES ${ZLIB_PC} DESTINATION "${INSTALL_PKGCONFIG_DIR}") + endif() + diff --git a/ports/zlib/portfile.cmake b/ports/zlib/portfile.cmake index 78030309b1b2a3..79bd6e93760881 100644 --- a/ports/zlib/portfile.cmake +++ b/ports/zlib/portfile.cmake @@ -14,6 +14,7 @@ vcpkg_extract_source_archive_ex( REF ${VERSION} PATCHES "cmake_dont_build_more_than_needed.patch" + "pkgconfig.patch" ) # This is generated during the cmake build @@ -30,7 +31,7 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() - +vcpkg_fixup_pkgconfig() # Both dynamic and static are built, so keep only the one needed if(VCPKG_LIBRARY_LINKAGE STREQUAL static) if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/zlibstatic.lib) From a01122e2d6cb04472fde1db77062cc37018d9777 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 3 Feb 2020 11:49:39 +0100 Subject: [PATCH 328/419] let expat install pkgconfig --- ports/expat/CONTROL | 2 +- ports/expat/portfile.cmake | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ports/expat/CONTROL b/ports/expat/CONTROL index 68629eb2d49004..ede9c8aab04b3c 100644 --- a/ports/expat/CONTROL +++ b/ports/expat/CONTROL @@ -1,4 +1,4 @@ Source: expat -Version: 2.2.7 +Version: 2.2.7-1 Homepage: https://github.com/libexpat/libexpat Description: XML parser library written in C diff --git a/ports/expat/portfile.cmake b/ports/expat/portfile.cmake index 7b97fb3de8f244..aedad3c2b7ccfe 100644 --- a/ports/expat/portfile.cmake +++ b/ports/expat/portfile.cmake @@ -27,8 +27,9 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() +vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig ${CURRENT_PACKAGES_DIR}/lib/pkgconfig) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(INSTALL ${SOURCE_PATH}/expat/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/expat RENAME copyright) vcpkg_copy_pdbs() From e6c3f0866df979b06fa615258119b46093fd3467 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 3 Feb 2020 11:50:13 +0100 Subject: [PATCH 329/419] let fontconfig install pkgconf --- ports/fontconfig/CMakeLists.txt | 26 ++++++++++++++++++++++++++ ports/fontconfig/CONTROL | 2 +- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/ports/fontconfig/CMakeLists.txt b/ports/fontconfig/CMakeLists.txt index 1692e7856a724f..a2bc9952e4fd06 100644 --- a/ports/fontconfig/CMakeLists.txt +++ b/ports/fontconfig/CMakeLists.txt @@ -94,3 +94,29 @@ find_dependency(EXPAT) include(\${CMAKE_CURRENT_LIST_DIR}/unofficial-fontconfig-targets.cmake) ") install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-fontconfig-config.cmake DESTINATION share/unofficial-fontconfig) + + +set(prefix ${CMAKE_INSTALL_PREFIX}) +set(exec_prefix ${CMAKE_INSTALL_PREFIX}) +set(libdir "\${prefix}/lib") +set(includedir "\${prefix}/include") +set(sysconfdir "\${prefix}/etc") +set(localstatedir "\${prefix}/var") +set(PACKAGE "fontconfig") +set(VERSION 3.11) +#TODO +set(confdir "\${sysconfdir}/fonts") +set(cachedir "\${localstatedir}/cache/\${PACKAGE}") + +set(PKGCONFIG_REQUIRES freetype2) +set(PKGCONFIG_REQUIRES_PRIVATELY expat) +set(EXPAT_LIBS) +set(FREETYPE_LIBS) +set(ICONV_LIBS) +set(LIBXML2_LIBS) +set(EXPAT_CFLAGS) +set(FREETYPE_CFLAGS) +set(ICONV_CFLAGS) +set(LIBXML2_CFLAGS) +configure_file ("fontconfig.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/fontconfig.pc" @ONLY) +install (FILES "${CMAKE_CURRENT_BINARY_DIR}/fontconfig.pc" DESTINATION "lib/pkgconfig") diff --git a/ports/fontconfig/CONTROL b/ports/fontconfig/CONTROL index d350c7fc4a25b2..3943b16cb93b46 100644 --- a/ports/fontconfig/CONTROL +++ b/ports/fontconfig/CONTROL @@ -1,5 +1,5 @@ Source: fontconfig -Version: 2.12.4-10 +Version: 2.12.4-11 Homepage: https://www.freedesktop.org/software/fontconfig/front.html Description: Library for configuring and customizing font access. Build-Depends: freetype, expat, libiconv, dirent From 96363ee2749c7cc0bcd727a69f5890f5e348c2ee Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 3 Feb 2020 11:50:33 +0100 Subject: [PATCH 330/419] let freetype install pkgconf --- ports/freetype/CONTROL | 2 +- ports/freetype/portfile.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/freetype/CONTROL b/ports/freetype/CONTROL index b5f5d0ef80bea5..ef3f711041c67e 100644 --- a/ports/freetype/CONTROL +++ b/ports/freetype/CONTROL @@ -1,5 +1,5 @@ Source: freetype -Version: 2.10.1-3 +Version: 2.10.1-4 Build-Depends: zlib Homepage: https://www.freetype.org/ Description: A library to render fonts. diff --git a/ports/freetype/portfile.cmake b/ports/freetype/portfile.cmake index 1b8756a7506b55..e888a24e793213 100644 --- a/ports/freetype/portfile.cmake +++ b/ports/freetype/portfile.cmake @@ -44,7 +44,7 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() - +vcpkg_fixup_pkgconfig() file(RENAME ${CURRENT_PACKAGES_DIR}/include/freetype2/freetype ${CURRENT_PACKAGES_DIR}/include/freetype) file(RENAME ${CURRENT_PACKAGES_DIR}/include/freetype2/ft2build.h ${CURRENT_PACKAGES_DIR}/include/ft2build.h) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/freetype2) From f5990bd4c80258e2d9572fa51e3a74dc813d85f0 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 3 Feb 2020 11:50:42 +0100 Subject: [PATCH 331/419] change mesa lib suffix --- ports/mesa/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/mesa/portfile.cmake b/ports/mesa/portfile.cmake index 747200807f125a..15b8f1925b7e32 100644 --- a/ports/mesa/portfile.cmake +++ b/ports/mesa/portfile.cmake @@ -22,8 +22,8 @@ vcpkg_configure_meson( -D gles1=true -D gles2=true -D shared-glapi=true - -D gles-lib-suffix=MESA - -D egl-lib-suffix=MESA + -D gles-lib-suffix=_mesa + -D egl-lib-suffix=_mesa "${MESA_OPTIONS}" PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" From 0fd7e5b3e7e51489b4e278dfa2aa82e7f54a708c Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 3 Feb 2020 12:33:18 +0100 Subject: [PATCH 332/419] add bzip2 pkgconfig --- ports/bzip2/bzip2.pc.in | 11 +++++++++++ ports/bzip2/portfile.cmake | 6 ++++++ 2 files changed, 17 insertions(+) create mode 100644 ports/bzip2/bzip2.pc.in diff --git a/ports/bzip2/bzip2.pc.in b/ports/bzip2/bzip2.pc.in new file mode 100644 index 00000000000000..ff37aacb0a97a0 --- /dev/null +++ b/ports/bzip2/bzip2.pc.in @@ -0,0 +1,11 @@ +prefix=@BZIP2_PREFIX@ +exec_prefix=${prefix} +libdir=${prefix}/lib +includedir=${prefix}/include + +Name: bzip2 +Description: bzip2 +Version: 3.0 +Requires: +Libs: -L${libdir} -lbz2 +Cflags: -I${includedir} \ No newline at end of file diff --git a/ports/bzip2/portfile.cmake b/ports/bzip2/portfile.cmake index 25e3df10f11ecb..682fba56cb9b61 100644 --- a/ports/bzip2/portfile.cmake +++ b/ports/bzip2/portfile.cmake @@ -40,3 +40,9 @@ file(RENAME ${CURRENT_PACKAGES_DIR}/share/bzip2/LICENSE ${CURRENT_PACKAGES_DIR}/ file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) vcpkg_test_cmake(PACKAGE_NAME BZip2 MODULE) + +set(BZIP2_PREFIX "${CURRENT_INSTALLED_DIR}") +configure_file("${CMAKE_CURRENT_LIST_DIR}/bzip2.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/bzip2.pc" DESTINATION @ONLY) +set(BZIP2_PREFIX "${CURRENT_INSTALLED_DIR}/debug") +configure_file("${CMAKE_CURRENT_LIST_DIR}/bzip2.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/bzip2.pc" DESTINATION @ONLY) +vcpkg_fixup_pkgconfig() \ No newline at end of file From 0aaeed3722c80550f01f87c5e8e71937ee5ae8ff Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 3 Feb 2020 12:33:29 +0100 Subject: [PATCH 333/419] fix fontconfigs pkgconfig --- ports/fontconfig/CMakeLists.txt | 6 +++--- ports/fontconfig/portfile.cmake | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/fontconfig/CMakeLists.txt b/ports/fontconfig/CMakeLists.txt index a2bc9952e4fd06..db1ede4e479379 100644 --- a/ports/fontconfig/CMakeLists.txt +++ b/ports/fontconfig/CMakeLists.txt @@ -105,8 +105,8 @@ set(localstatedir "\${prefix}/var") set(PACKAGE "fontconfig") set(VERSION 3.11) #TODO -set(confdir "\${sysconfdir}/fonts") -set(cachedir "\${localstatedir}/cache/\${PACKAGE}") +set(BASECONFIGDIR "\${sysconfdir}/fonts") +set(fc_cachedir "\${localstatedir}/cache/\${PACKAGE}") set(PKGCONFIG_REQUIRES freetype2) set(PKGCONFIG_REQUIRES_PRIVATELY expat) @@ -119,4 +119,4 @@ set(FREETYPE_CFLAGS) set(ICONV_CFLAGS) set(LIBXML2_CFLAGS) configure_file ("fontconfig.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/fontconfig.pc" @ONLY) -install (FILES "${CMAKE_CURRENT_BINARY_DIR}/fontconfig.pc" DESTINATION "lib/pkgconfig") +install (FILES "${CMAKE_CURRENT_BINARY_DIR}/fontconfig.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") diff --git a/ports/fontconfig/portfile.cmake b/ports/fontconfig/portfile.cmake index db7692779ab379..66873becfa69f7 100644 --- a/ports/fontconfig/portfile.cmake +++ b/ports/fontconfig/portfile.cmake @@ -30,7 +30,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-fontconfig TARGET_PATH share/unofficial-fontconfig) - +vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) From 3e6049e0e6b2a718c5c74661e2eb117c64f07260 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 3 Feb 2020 12:33:41 +0100 Subject: [PATCH 334/419] make libpng install a pkgconfig --- ports/libpng/pkgconfig.patch | 24 ++++++++++++++++++++++++ ports/libpng/portfile.cmake | 7 +++++-- 2 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 ports/libpng/pkgconfig.patch diff --git a/ports/libpng/pkgconfig.patch b/ports/libpng/pkgconfig.patch new file mode 100644 index 00000000000000..5640f3834ca44c --- /dev/null +++ b/ports/libpng/pkgconfig.patch @@ -0,0 +1,24 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6599e1d7d..c0bb2fad2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -894,13 +894,13 @@ if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL) + install(FILES libpng.3 libpngpf.3 DESTINATION ${PNG_MAN_DIR}/man3) + install(FILES png.5 DESTINATION ${PNG_MAN_DIR}/man5) + # Install pkg-config files ++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng.pc ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) ++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + if(NOT CMAKE_HOST_WIN32 OR CYGWIN OR MINGW) +- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng.pc +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/libpng-config +- DESTINATION bin) ++ DESTINATION tools/libpng) +- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config +- DESTINATION bin) ++ DESTINATION tools/libpng) + endif() diff --git a/ports/libpng/portfile.cmake b/ports/libpng/portfile.cmake index e9a2004554799f..b9e6c696aa7e26 100644 --- a/ports/libpng/portfile.cmake +++ b/ports/libpng/portfile.cmake @@ -36,6 +36,7 @@ vcpkg_from_github( PATCHES use_abort.patch cmake.patch + pkgconfig.patch ${APNG_EXTRA_PATCH} ) @@ -51,13 +52,14 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS + -DPNG_MAN_DIR=share/${PORT}/man ${LIBPNG_APNG_OPTION} -DPNG_STATIC=${PNG_STATIC_LIBS} -DPNG_SHARED=${PNG_SHARED_LIBS} -DPNG_TESTS=OFF -DSKIP_INSTALL_PROGRAMS=ON -DSKIP_INSTALL_EXECUTABLES=ON - -DSKIP_INSTALL_FILES=ON + -DSKIP_INSTALL_FILES=OFF OPTIONS_DEBUG -DSKIP_INSTALL_HEADERS=ON ) @@ -65,7 +67,8 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/libpng) +vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() - +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) From 570da4ace1b582d80a87af931e750d6760235297 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 3 Feb 2020 15:28:46 +0100 Subject: [PATCH 335/419] update opengl-registry --- ports/opengl-registry/CONTROL | 2 +- ports/opengl-registry/portfile.cmake | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ports/opengl-registry/CONTROL b/ports/opengl-registry/CONTROL index 3ff6c6e698bb3c..fd8b7d5e44a90c 100644 --- a/ports/opengl-registry/CONTROL +++ b/ports/opengl-registry/CONTROL @@ -1,4 +1,4 @@ Source: opengl-registry -Version: 2019-08-22 +Version: 2019-02-03 Build-Depends: egl-registry Description: the API and Extension registries for the OpenGL family APIs diff --git a/ports/opengl-registry/portfile.cmake b/ports/opengl-registry/portfile.cmake index 406ca1c3f3600d..776e7f6c896289 100644 --- a/ports/opengl-registry/portfile.cmake +++ b/ports/opengl-registry/portfile.cmake @@ -1,10 +1,8 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/OpenGL-Registry - REF 3c9ab309994c2baeb5572aa0befd5f405166a275 - SHA512 f53018fe6dfb926dd6c1ce64ffde19b650a9071a1f6fa0c7a1596237e4ff84c3ff0092fb80811c4fea9b533c4b8607ed51f328d683d8f4aac18f0616f58b56a4 + REF 2223f5bebde4aa6b170fb32cdaaf580703fddb67 + SHA512 4e9b570f242942bd45a6601a6b0fcf1dc265c6ba03acaf782a639e7399842dd7350c2d4876236df80a070b2bd9ce7cee88cf2d85f2c50cfba7878d1f9379bbe9 HEAD_REF master ) From a96cceeb7e4bab8b9a6f7058cf04cd3048712f89 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 3 Feb 2020 15:29:00 +0100 Subject: [PATCH 336/419] patch wayland to use static libraries --- ports/wayland/meson.build.patch | 26 ++++++++++++++++++++++++++ ports/wayland/portfile.cmake | 7 ++++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 ports/wayland/meson.build.patch diff --git a/ports/wayland/meson.build.patch b/ports/wayland/meson.build.patch new file mode 100644 index 00000000000000..a86fb41033f441 --- /dev/null +++ b/ports/wayland/meson.build.patch @@ -0,0 +1,26 @@ +diff --git a/meson.build b/meson.build +index ea01708f9..ef453b8f4 100644 +--- a/meson.build ++++ b/meson.build +@@ -43,7 +43,7 @@ foreach f: have_funcs + endforeach + + if get_option('libraries') +- ffi_dep = dependency('libffi') ++ ffi_dep = dependency('libffi', static: true) + + decls = [ + { 'header': 'sys/signalfd.h', 'symbol': 'SFD_CLOEXEC' }, +@@ -58,10 +58,10 @@ if get_option('libraries') + endforeach + endif + +-scanner_deps = [ dependency('expat') ] ++scanner_deps = [ dependency('expat', static: true) ] + + if get_option('dtd_validation') +- scanner_deps += dependency('libxml-2.0') ++ scanner_deps += dependency('libxml-2.0', static: true) + config_h.set('HAVE_LIBXML', 1) + endif + diff --git a/ports/wayland/portfile.cmake b/ports/wayland/portfile.cmake index 47d8dd5935da8e..65382cf16a6785 100644 --- a/ports/wayland/portfile.cmake +++ b/ports/wayland/portfile.cmake @@ -1,3 +1,8 @@ +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + set(PATCHES meson.build.patch) + # this patch is not 100% correct since xcb and xcb-xkb can be build dynamically in a custom triplet + # However, VCPKG currently is limited by the possibilities of meson and they have to fix their lib dependency detection +endif() vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org @@ -6,7 +11,7 @@ vcpkg_from_gitlab( REF 367d2985f3242d12c16a4f9074254584a8739d1f #1.17.92 SHA512 1244d81bd07d7a4608b5546971b4182070b8caa52278ca6a5ac0f7cdf51f94000ff8015dc9f23ce9f686592d97e9a8b5c1daf64778c0ad05e99af19b3968240e HEAD_REF master # branch name - #PATCHES example.patch #patch name + PATCHES ${PATCHES} ) vcpkg_configure_meson( From bb995d1c88019ad55b9d38e2cfacc0c2a3b2d502 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 3 Feb 2020 15:29:27 +0100 Subject: [PATCH 337/419] correct configure enviromnent --- scripts/cmake/vcpkg_configure_make.cmake | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index eb9a928fce60e9..9603f8055ec3fb 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -186,14 +186,22 @@ function(vcpkg_configure_make) set(C_FLAGS_BACKUP "$ENV{CFLAGS}") set(CXX_FLAGS_BACKUP "$ENV{CXXFLAGS}") set(LD_FLAGS_BACKUP "$ENV{LDFLAGS}") - set(C_FLAGS_GLOBAL "$ENV{CFLAGS} ${VCPKG_C_FLAGS}") - set(CXX_FLAGS_GLOBAL "$ENV{CXXFLAGS} ${VCPKG_CXX_FLAGS}") + set(C_INCLUDE_PATH_BACKUP "$ENV{C_INCLUDE_PATH}") + set(CPLUS_INCLUDE_PATH_BACKUP "$ENV{CPLUS_INCLUDE_PATH}") + set(LD_LIBRARY_PATH_BACKUP "$ENV{LD_LIBRARY_PATH}") + + #set(ENV{C_INCLUDE_PATH} "${C_INCLUDE_PATH_BACKUP}${VCPKG_HOST_PATH_SEPARATOR}${CURRENT_INSTALLED_DIR}/include") + #set(ENV{CPLUS_INCLUDE_PATH} "${C_INCLUDE_PATH_BACKUP}${VCPKG_HOST_PATH_SEPARATOR}${CURRENT_INSTALLED_DIR}/include") + + set(C_FLAGS_GLOBAL "$ENV{CFLAGS} -I${CURRENT_INSTALLED_DIR}/include ${VCPKG_C_FLAGS}") + set(CXX_FLAGS_GLOBAL "$ENV{CXXFLAGS} -I${CURRENT_INSTALLED_DIR}/include ${VCPKG_CXX_FLAGS}") set(LD_FLAGS_GLOBAL "$ENV{LDFLAGS} ${VCPKG_LINKER_FLAGS}") if(NOT VCPKG_TARGET_IS_WINDOWS) string(APPEND C_FLAGS_GLOBAL " -fPIC") string(APPEND CXX_FLAGS_GLOBAL " -fPIC") endif() - + set(ENV{LD_LIBRARY_PATH} "${LD_LIBRARY_PATH_BACKUP}${VCPKG_HOST_PATH_SEPARATOR}${CURRENT_INSTALLED_DIR}/lib${VCPKG_HOST_PATH_SEPARATOR}${CURRENT_INSTALLED_DIR}/lib/manual-link") + if(CMAKE_HOST_WIN32) set(base_cmd ${BASH} --noprofile --norc -c) @@ -267,8 +275,9 @@ function(vcpkg_configure_make) else() set(ENV{CFLAGS} "${C_FLAGS_GLOBAL} ${VCPKG_C_FLAGS_DEBUG}") set(ENV{CXXFLAGS} "${CXX_FLAGS_GLOBAL} ${VCPKG_CXX_FLAGS_DEBUG}") - set(ENV{LDFLAGS} "${LD_FLAGS_GLOBAL} ${VCPKG_LINKER_FLAGS_DEBUG}") + set(ENV{LDFLAGS} "${LD_FLAGS_GLOBAL} -L${CURRENT_INSTALLED_DIR}/debug/lib -L${CURRENT_INSTALLED_DIR}/debug/lib/manual-link ${VCPKG_LINKER_FLAGS_DEBUG}") endif() + set(ENV{LD_LIBRARY_PATH} "${LD_LIBRARY_PATH_BACKUP}${VCPKG_HOST_PATH_SEPARATOR}${CURRENT_INSTALLED_DIR}/debug/lib${VCPKG_HOST_PATH_SEPARATOR}${CURRENT_INSTALLED_DIR}/debug/lib/manual-link") set(OBJ_DIR ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) set(PRJ_DIR ${OBJ_DIR}/${_csc_PROJECT_SUBPATH}) @@ -348,7 +357,7 @@ function(vcpkg_configure_make) else() set(ENV{CFLAGS} "${C_FLAGS_GLOBAL} ${VCPKG_C_FLAGS_RELEASE}") set(ENV{CXXFLAGS} "${CXX_FLAGS_GLOBAL} ${VCPKG_CXX_FLAGS_RELEASE}") - set(ENV{LDFLAGS} "${LD_FLAGS_GLOBAL} ${VCPKG_LINKER_FLAGS_RELEASE}") + set(ENV{LDFLAGS} "${LD_FLAGS_GLOBAL} -L${CURRENT_INSTALLED_DIR}/lib -L${CURRENT_INSTALLED_DIR}/lib/manual-link ${VCPKG_LINKER_FLAGS_RELEASE}") endif() if (_csc_NO_DEBUG) @@ -416,6 +425,10 @@ function(vcpkg_configure_make) set(ENV{CXXFLAGS} "${CXX_FLAGS_BACKUP}") set(ENV{LDFLAGS} "${LD_FLAGS_BACKUP}") + set(ENV{C_INCLUDE_PATH} "${C_INCLUDE_PATH_BACKUP}") + set(ENV{CPLUS_INCLUDE_PATH} "${CPLUS_INCLUDE_PATH_BACKUP}") + set(ENV{LD_LIBRARY_PATH} "${LD_LIBRARY_PATH_BACKUP}") + if(_csc_PKG_CONFIG_PATHS) set(ENV{PKG_CONFIG_PATH} "${BACKUP_ENV_PKG_CONFIG_PATH}") endif() From aa972793de9f6dd5bc64afe752711db66e7a8afc Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 3 Feb 2020 15:29:34 +0100 Subject: [PATCH 338/419] add another fix --- scripts/cmake/vcpkg_fixup_pkgconfig.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/cmake/vcpkg_fixup_pkgconfig.cmake b/scripts/cmake/vcpkg_fixup_pkgconfig.cmake index 93b13288766338..7acbdef8d5ec3f 100644 --- a/scripts/cmake/vcpkg_fixup_pkgconfig.cmake +++ b/scripts/cmake/vcpkg_fixup_pkgconfig.cmake @@ -37,9 +37,13 @@ function(vcpkg_fixup_pkgconfig) file(READ "${_file}" _contents) string(REPLACE "${CURRENT_PACKAGES_DIR}" "\${prefix}" _contents "${_contents}") string(REPLACE "${CURRENT_INSTALLED_DIR}" "\${prefix}" _contents "${_contents}") + string(REPLACE "debug/include" "../include" _contents "${_contents}") + string(REPLACE "\${prefix}/include" "\${prefix}/../include" _contents "${_contents}") + string(REPLACE "debug/share" "../share" _contents "${_contents}") string(REPLACE "\${prefix}/share" "\${prefix}/../share" _contents "${_contents}") + string(REPLACE "debug/lib" "lib" _contents "${_contents}") # the prefix will contain the debug keyword string(REGEX REPLACE "^prefix=\\\${prefix}" "prefix=${CURRENT_INSTALLED_DIR}" _contents "${_contents}") file(WRITE "${_file}" "${_contents}") From 06b491dd6d3f078119be5bc803e41c18f1246120 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 3 Feb 2020 15:29:50 +0100 Subject: [PATCH 339/419] make mesa depend on opengl-regestry --- ports/mesa/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/mesa/CONTROL b/ports/mesa/CONTROL index 153dd89c476392..8951dae5ea69f9 100644 --- a/ports/mesa/CONTROL +++ b/ports/mesa/CONTROL @@ -2,4 +2,4 @@ Source: mesa Version: 19.3.3 Homepage: https://www.mesa3d.org/ Description: Mesa - The 3D Graphics Library -Build-Depends: drm, elfutils, wayland, wayland-protocols, xdamage, xshmfence, x11, xcb, xfixes, xext, xxf86vm, xrandr, egl-registry +Build-Depends: drm, elfutils, wayland, wayland-protocols, xdamage, xshmfence, x11, xcb, xfixes, xext, xxf86vm, xrandr, egl-registry, opengl-registry From 71da0927aa1f7b4f94eb9935c066b1c7c05f2b46 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 3 Feb 2020 15:30:31 +0100 Subject: [PATCH 340/419] make libffi install a pkgconfig --- ports/libffi/CONTROL | 2 +- ports/libffi/portfile.cmake | 19 +++++++++++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/ports/libffi/CONTROL b/ports/libffi/CONTROL index 4492dbce16f475..067d4c09ba5a0a 100644 --- a/ports/libffi/CONTROL +++ b/ports/libffi/CONTROL @@ -1,4 +1,4 @@ Source: libffi -Version: 3.1-7 +Version: 3.1-8 Homepage: https://github.com/libffi/libffi Description: Portable, high level programming interface to various calling conventions diff --git a/ports/libffi/portfile.cmake b/ports/libffi/portfile.cmake index f023521c85aa9a..9fc10057aa2c5b 100644 --- a/ports/libffi/portfile.cmake +++ b/ports/libffi/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL x86 AND NOT VCPKG_TARGET_ARCHITECTURE STREQUAL x64) message(FATAL_ERROR "Architecture not supported") endif() @@ -43,3 +41,20 @@ file(WRITE ${CURRENT_PACKAGES_DIR}/include/ffi.h "${FFI_H}") file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libffi) file(RENAME ${CURRENT_PACKAGES_DIR}/share/libffi/LICENSE ${CURRENT_PACKAGES_DIR}/share/libffi/copyright) + +set(_file "${SOURCE_PATH}/libffi.pc.in") +file(READ "${_file}" _contents) +string(REPLACE "includedir=\${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include" "includedir=@includedir@" _contents "${_contents}") +file(WRITE "${_file}" "${_contents}") + +set(prefix "${CURRENT_INSTALLED_DIR}") +set(exec_prefix "\${prefix}") +set(libdir "\${prefix}/lib") +set(toolexeclibdir "\${prefix}/lib") +set(includedir "\${prefix}/include") +set(PACKAGE_NAME ffi) +set(PACKAGE_VERSION 3.1) +configure_file("${SOURCE_PATH}/libffi.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libffi.pc" @ONLY) +set(prefix "${CURRENT_INSTALLED_DIR}/debug") +configure_file("${SOURCE_PATH}/libffi.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libffi.pc" @ONLY) +vcpkg_fixup_pkgconfig() From e602905539b3c5892818a15f0f14443a35d0ef58 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 3 Feb 2020 15:30:58 +0100 Subject: [PATCH 341/419] make angle depend on opengl-registry --- ports/angle/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/angle/CONTROL b/ports/angle/CONTROL index c7eedf1ac8a947..e4375a1aab957b 100644 --- a/ports/angle/CONTROL +++ b/ports/angle/CONTROL @@ -3,4 +3,4 @@ Version: 2019-12-31-1 Homepage: https://github.com/google/angle Description: A conformant OpenGL ES implementation for Windows, Mac and Linux. The goal of ANGLE is to allow users of multiple operating systems to seamlessly run WebGL and other OpenGL ES content by translating OpenGL ES API calls to one of the hardware-supported APIs available for that platform. ANGLE currently provides translation from OpenGL ES 2.0 and 3.0 to desktop OpenGL, OpenGL ES, Direct3D 9, and Direct3D 11. Support for translation from OpenGL ES to Vulkan is underway, and future plans include compute shader support (ES 3.1) and MacOS support. -Build-Depends: egl-registry, x11 (linux), mesa (linux) +Build-Depends: egl-registry, opengl-registry, x11 (linux) From bf85ed54a40aa6f5ff89d808c0c0658b8c8df2f6 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 3 Feb 2020 16:36:02 +0100 Subject: [PATCH 342/419] install all opengl definitions --- ports/opengl-registry/portfile.cmake | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ports/opengl-registry/portfile.cmake b/ports/opengl-registry/portfile.cmake index 776e7f6c896289..a9e3be246ec78d 100644 --- a/ports/opengl-registry/portfile.cmake +++ b/ports/opengl-registry/portfile.cmake @@ -7,6 +7,11 @@ vcpkg_from_github( ) file(COPY ${SOURCE_PATH}/api/GL DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(COPY ${SOURCE_PATH}/api/GLES DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(COPY ${SOURCE_PATH}/api/GLES2 DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(COPY ${SOURCE_PATH}/api/GLES3 DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(COPY ${SOURCE_PATH}/api/GLSC DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(COPY ${SOURCE_PATH}/api/GLSC2 DESTINATION ${CURRENT_PACKAGES_DIR}/include) file(COPY ${SOURCE_PATH}/xml/gl.xml ${SOURCE_PATH}/xml/glx.xml From 1646e666b460d68b81243f6488e0d782e019a29f Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 3 Feb 2020 16:36:13 +0100 Subject: [PATCH 343/419] apply patch --- ports/mesa/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/mesa/portfile.cmake b/ports/mesa/portfile.cmake index 15b8f1925b7e32..1d493da5ba0120 100644 --- a/ports/mesa/portfile.cmake +++ b/ports/mesa/portfile.cmake @@ -13,7 +13,7 @@ vcpkg_from_gitlab( REF 352037317b36c7ffd13aa3be8dc12e23a38a5bf2 #v19.3.3 SHA512 9813c98b6b04186e510e16b76b29d0ec1be75bcc0eca758a115ab93c289c72d9103c69c8e4025f3c48d0350b7432aba42167b3768bbbc5877720c036681f1fec HEAD_REF master # branch name - #PATCHES example.patch #patch name + PATCHES ${PATCHES} #patch name ) vcpkg_configure_meson( From 3d9324e75dd3020dd33357057ac18fd36c7ffea8 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 3 Feb 2020 16:36:27 +0100 Subject: [PATCH 344/419] configure meson set flags correctly. --- scripts/cmake/vcpkg_configure_meson.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index 1d67e6ef482e18..b935d089213dbf 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -32,8 +32,8 @@ function(vcpkg_configure_meson) endforeach() endif() - set(MESON_COMMON_CFLAGS "${MESON_COMMON_CFLAGS} ${CMAKE_C_FLAGS${_MESON_FLAG_SUFFIX}}") - set(MESON_COMMON_CXXFLAGS "${MESON_COMMON_CXXFLAGS} ${CMAKE_CXX_FLAGS${_MESON_FLAG_SUFFIX}}") + set(MESON_COMMON_CFLAGS "${MESON_COMMON_CFLAGS} -I${CURRENT_INSTALLED_DIR}/include ${CMAKE_C_FLAGS${_MESON_FLAG_SUFFIX}}") + set(MESON_COMMON_CXXFLAGS "${MESON_COMMON_CXXFLAGS} -I${CURRENT_INSTALLED_DIR}/include ${CMAKE_CXX_FLAGS${_MESON_FLAG_SUFFIX}}") set(MESON_DEBUG_CFLAGS "${MESON_DEBUG_CFLAGS} ${CMAKE_C_FLAGS_DEBUG${_MESON_FLAG_SUFFIX}}") set(MESON_DEBUG_CXXFLAGS "${MESON_DEBUG_CXXFLAGS} ${CMAKE_CXX_FLAGS_DEBUG${_MESON_FLAG_SUFFIX}}") @@ -78,8 +78,8 @@ function(vcpkg_configure_meson) file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel) set(ENV{CFLAGS} "${MESON_COMMON_CFLAGS} ${MESON_RELEASE_CFLAGS}") set(ENV{CXXFLAGS} "${MESON_COMMON_CXXFLAGS} ${MESON_RELEASE_CXXFLAGS}") - set(ENV{LDFLAGS} "${MESON_COMMON_LDFLAGS} ${MESON_RELEASE_LDFLAGS}") - set(ENV{CPPFLAGS} "${MESON_COMMON_CPPFLAGS} ${MESON_RELEASE_CPPFLAGS}") + set(ENV{LDFLAGS} "${MESON_COMMON_LDFLAGS} -L${CURRENT_INSTALLED_DIR}/lib -L${CURRENT_INSTALLED_DIR}/lib/manual-link ${MESON_RELEASE_LDFLAGS}") + #set(ENV{CPPFLAGS} "${MESON_COMMON_CPPFLAGS} ${MESON_RELEASE_CPPFLAGS}") vcpkg_execute_required_process( COMMAND ${MESON} ${_vcm_OPTIONS} ${_vcm_OPTIONS_RELEASE} ${_vcm_SOURCE_PATH} WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel @@ -105,7 +105,7 @@ function(vcpkg_configure_meson) file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) set(ENV{CFLAGS} "${MESON_COMMON_CFLAGS} ${MESON_DEBUG_CFLAGS}") set(ENV{CXXFLAGS} "${MESON_COMMON_CXXFLAGS} ${MESON_DEBUG_CXXFLAGS}") - set(ENV{LDFLAGS} "${MESON_COMMON_LDFLAGS} ${MESON_DEBUG_LDFLAGS}") + set(ENV{LDFLAGS} "${MESON_COMMON_LDFLAGS} -L${CURRENT_INSTALLED_DIR}/debug/lib -L${CURRENT_INSTALLED_DIR}/debug/lib/manual-link ${MESON_DEBUG_LDFLAGS}") set(ENV{CPPFLAGS} "${MESON_COMMON_CPPFLAGS} ${MESON_DEBUG_CPPFLAGS}") vcpkg_execute_required_process( COMMAND ${MESON} ${_vcm_OPTIONS} ${_vcm_OPTIONS_DEBUG} ${_vcm_SOURCE_PATH} From e6a8c3b137d4f9e6c746e3715b4913ac1725aa2f Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 3 Feb 2020 21:29:32 +0100 Subject: [PATCH 345/419] fix angle/mesa file conflict --- ports/angle/portfile.cmake | 20 ++++++++++++++++++++ ports/mesa/portfile.cmake | 12 ++++++++++++ 2 files changed, 32 insertions(+) diff --git a/ports/angle/portfile.cmake b/ports/angle/portfile.cmake index 9811565df35395..d463d00baa3447 100644 --- a/ports/angle/portfile.cmake +++ b/ports/angle/portfile.cmake @@ -21,6 +21,7 @@ vcpkg_from_github( REPO google/angle REF 1fdf6ca5141d8e349e875eab6e51d93d929a7f0e SHA512 2553307f3d10b5c32166b9ed610b4b15310dccba00c644cd35026de86d87ea2e221c2e528f33b02f01c1ded2f08150e429de1fa300b73d655f8944f6f5047a82 + # On update check headers against opengl-registry PATCHES 001-fix-uwp.patch 002-fix-builder-error.patch @@ -45,6 +46,25 @@ vcpkg_copy_pdbs() file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +# File conflict with opengl-registry! Make sure headers are similar on Update! +set(_double_files + include/GLES/egl.h + include/GLES/gl.h + include/GLES/glext.h + include/GLES/glplatform.h + include/GLES2/gl2.h + include/GLES2/gl2ext.h + include/GLES2/gl2platform.h + include/GLES3/gl3.h + include/GLES3/gl31.h + include/GLES3/gl32.h + include/GLES3/gl3platform.h +foreach(_file ${_double_files}) + if(EXISTS "${CURRENT_PACKAGES_DIR}/${_file}") + file(REMOVE "${CURRENT_PACKAGES_DIR}/${_file}") + endif() +endforeach() + #TODO: conflict with mesa! # include/GLES/egl.h # include/GLES/gl.h diff --git a/ports/mesa/portfile.cmake b/ports/mesa/portfile.cmake index 1d493da5ba0120..05fb4263295d36 100644 --- a/ports/mesa/portfile.cmake +++ b/ports/mesa/portfile.cmake @@ -41,6 +41,18 @@ file(REMOVE ${CURRENT_PACKAGES_DIR}/include/EGL/egl.h) file(REMOVE ${CURRENT_PACKAGES_DIR}/include/EGL/eglext.h) file(REMOVE ${CURRENT_PACKAGES_DIR}/include/EGL/eglplatform.h) +#installed by opengl-registry +set(_double_files include/GL/glcorearb.h include/GL/glext.h include/GL/glxext.h + include/GLES/egl.h include/GLES/gl.h include/GLES/glext.h include/GLES/glplatform.h + include/GLES2/gl2.h include/GLES2/gl2ext.h include/GLES2/gl2platform.h + include/GLES3/gl3.h include/GLES3/gl31.h include/GLES3/gl32.h include/GLES3/gl3platform.h) +foreach(_file ${_double_files}) + if(EXISTS "${CURRENT_PACKAGES_DIR}/${_file}") + file(REMOVE "${CURRENT_PACKAGES_DIR}/${_file}") + endif() +endforeach() +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/GLES) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/GLES2) # # Handle copyright file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(TOUCH "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") From 0b8ec58f660f5bfb4c161648a6da2d9fd1031dd9 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 3 Feb 2020 21:29:49 +0100 Subject: [PATCH 346/419] make xorg macros build on windows via autoconf --- ports/xorg-macros/portfile.cmake | 31 ++++++++----- scripts/cmake/vcpkg_configure_make.cmake | 40 ++++++++--------- .../vcpkg_execute_required_process.cmake | 45 +++++++++++++++++++ 3 files changed, 84 insertions(+), 32 deletions(-) diff --git a/ports/xorg-macros/portfile.cmake b/ports/xorg-macros/portfile.cmake index 59dd0efa39ca1a..a559101df2a59d 100644 --- a/ports/xorg-macros/portfile.cmake +++ b/ports/xorg-macros/portfile.cmake @@ -30,9 +30,12 @@ vcpkg_configure_make( vcpkg_install_make() -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/xorg/") -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/xorg/aclocal/") -file(RENAME "${CURRENT_PACKAGES_DIR}/share/aclocal/" "${CURRENT_PACKAGES_DIR}/share/xorg/aclocal/") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/xorg/") +if(NOT WIN32) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/xorg/aclocal/") +endif() + +file(RENAME "${CURRENT_PACKAGES_DIR}/share/aclocal/" "${CURRENT_PACKAGES_DIR}/share/xorg/aclocal") file(RENAME "${CURRENT_PACKAGES_DIR}/share/util-macros/" "${CURRENT_PACKAGES_DIR}/share/xorg/util-macros") file(READ "${CURRENT_PACKAGES_DIR}/share/pkgconfig/xorg-macros.pc" _contents) @@ -43,15 +46,19 @@ file(WRITE "${CURRENT_PACKAGES_DIR}/share/pkgconfig/xorg-macros.pc" "${_contents file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/") file(RENAME "${CURRENT_PACKAGES_DIR}/share/pkgconfig/" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") -file(READ "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig/xorg-macros.pc" _contents) -string(REPLACE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_INSTALLED_DIR}/debug" _contents "${_contents}") -string(REPLACE "datarootdir=\${prefix}/share}" "datarootdir=\${prefix}/share/xorg/debug}" _contents "${_contents}") -string(REPLACE "includedir=${CURRENT_INSTALLED_DIR}/debug/include" "includedir=\${prefix}/../include" _contents "${_contents}") -file(WRITE "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig/xorg-macros.pc" "${_contents}") -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/xorg/debug/") -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib") -file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig/" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") -file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/" "${CURRENT_PACKAGES_DIR}/share/xorg/debug/") +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig/xorg-macros.pc") + file(READ "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig/xorg-macros.pc" _contents) + string(REPLACE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_INSTALLED_DIR}/debug" _contents "${_contents}") + string(REPLACE "datarootdir=\${prefix}/share}" "datarootdir=\${prefix}/share/xorg/debug}" _contents "${_contents}") + string(REPLACE "includedir=${CURRENT_INSTALLED_DIR}/debug/include" "includedir=\${prefix}/../include" _contents "${_contents}") + file(WRITE "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig/xorg-macros.pc" "${_contents}") + if(NOT WIN32) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/xorg/debug/") + endif() + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig/" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/" "${CURRENT_PACKAGES_DIR}/share/xorg/debug/") +endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share/) diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index 9603f8055ec3fb..990c7b3890f3c6 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -137,7 +137,7 @@ function(vcpkg_configure_make) vcpkg_find_acquire_program(PERL) set(MSYS_REQUIRE_PACKAGES diffutils) if (_csc_AUTOCONFIG) - set(MSYS_REQUIRE_PACKAGES ${MSYS_REQUIRE_PACKAGES} autoconf automake m4 libtool perl) + set(MSYS_REQUIRE_PACKAGES ${MSYS_REQUIRE_PACKAGES} autoconf automake m4 libtool perl pkg-config) endif() vcpkg_acquire_msys(MSYS_ROOT PACKAGES ${MSYS_REQUIRE_PACKAGES}) get_filename_component(YASM_EXE_PATH ${YASM} DIRECTORY) @@ -153,8 +153,10 @@ function(vcpkg_configure_make) endif() endif() set(WIN_TARGET_COMPILER CC=cl) - vcpkg_add_to_path("${YASM_EXE_PATH}" "${MSYS_ROOT}/usr/bin" "${PERL_EXE_PATH}") - set(BASH ${MSYS_ROOT}/usr/bin/bash.exe) + vcpkg_add_to_path("${YASM_EXE_PATH}") + vcpkg_add_to_path("${MSYS_ROOT}/usr/bin") + vcpkg_add_to_path("${PERL_EXE_PATH}") + set(BASH "${MSYS_ROOT}/usr/bin/bash.exe") elseif (_csc_AUTOCONFIG) find_program(autoreconf autoreconf REQUIRED) endif() @@ -203,7 +205,7 @@ function(vcpkg_configure_make) set(ENV{LD_LIBRARY_PATH} "${LD_LIBRARY_PATH_BACKUP}${VCPKG_HOST_PATH_SEPARATOR}${CURRENT_INSTALLED_DIR}/lib${VCPKG_HOST_PATH_SEPARATOR}${CURRENT_INSTALLED_DIR}/lib/manual-link") if(CMAKE_HOST_WIN32) - set(base_cmd ${BASH} --noprofile --norc -c) + set(base_cmd ${BASH} --noprofile --norc) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) set(_csc_OPTIONS ${_csc_OPTIONS} --enable-shared) @@ -229,11 +231,9 @@ function(vcpkg_configure_make) list(JOIN _csc_OPTIONS_DEBUG " " _csc_OPTIONS_DEBUG) set(rel_command - ${base_cmd} "${WIN_TARGET_COMPILER} ${_csc_SOURCE_PATH}/configure ${WIN_TARGET_ARCH} ${_csc_OPTIONS} ${_csc_OPTIONS_RELEASE}" - ) + ${base_cmd} -c "${WIN_TARGET_COMPILER} ${_csc_SOURCE_PATH}/configure ${WIN_TARGET_ARCH} ${_csc_OPTIONS} ${_csc_OPTIONS_RELEASE}") set(dbg_command - ${base_cmd} "${WIN_TARGET_COMPILER} ${_csc_SOURCE_PATH}/configure ${WIN_TARGET_ARCH} ${_csc_OPTIONS} ${_csc_OPTIONS_DEBUG}" - ) + ${base_cmd} -c "${WIN_TARGET_COMPILER} ${_csc_SOURCE_PATH}/configure ${WIN_TARGET_ARCH} ${_csc_OPTIONS} ${_csc_OPTIONS_DEBUG}") else() set(base_cmd ./) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) @@ -242,11 +242,11 @@ function(vcpkg_configure_make) set(_csc_OPTIONS ${_csc_OPTIONS} --enable-static --disable-shared) endif() set(rel_command - ${base_cmd}configure "${_csc_OPTIONS}" "${_csc_OPTIONS_RELEASE}" + "${base_cmd}configure;${_csc_OPTIONS};${_csc_OPTIONS_RELEASE}" ) set(dbg_command - ${base_cmd}configure "${_csc_OPTIONS}" "${_csc_OPTIONS_DEBUG}" - ) + "${base_cmd}configure;${_csc_OPTIONS};${_csc_OPTIONS_DEBUG}") + endif() # Configure debug @@ -295,8 +295,8 @@ function(vcpkg_configure_make) if (_csc_PRERUN_SHELL) message(STATUS "Prerun shell with ${TARGET_TRIPLET}-dbg") - vcpkg_execute_required_process( - COMMAND ${base_cmd}${_csc_PRERUN_SHELL} + vcpkg_execute_required_process2( + COMMAND ${base_cmd} -c "\"${_csc_PRERUN_SHELL}\"" WORKING_DIRECTORY ${PRJ_DIR} LOGNAME prerun-${TARGET_TRIPLET}-dbg ) @@ -306,15 +306,15 @@ function(vcpkg_configure_make) message(STATUS "Generating configure with ${TARGET_TRIPLET}-dbg") if (CMAKE_HOST_WIN32) vcpkg_execute_required_process( - COMMAND ${base_cmd} autoreconf -vfi - WORKING_DIRECTORY ${_csc_SOURCE_PATH}/${_csc_PROJECT_SUBPATH} - LOGNAME prerun-2-${TARGET_TRIPLET}-dbg + COMMAND ${base_cmd} -c "autoreconf -vfi" + WORKING_DIRECTORY "${_csc_SOURCE_PATH}/${_csc_PROJECT_SUBPATH}" + LOGNAME autoconf-${TARGET_TRIPLET}-dbg ) else() vcpkg_execute_required_process( COMMAND autoreconf -vfi - WORKING_DIRECTORY ${PRJ_DIR} - LOGNAME prerun-2-${TARGET_TRIPLET}-dbg + WORKING_DIRECTORY "${PRJ_DIR}" + LOGNAME autoconf-${TARGET_TRIPLET}-dbg ) endif() endif() @@ -395,13 +395,13 @@ function(vcpkg_configure_make) vcpkg_execute_required_process( COMMAND ${base_cmd} autoreconf -vfi WORKING_DIRECTORY ${_csc_SOURCE_PATH}/${_csc_PROJECT_SUBPATH} - LOGNAME prerun-2-${TAR_TRIPLET_DIR} + LOGNAME autoconf-${TAR_TRIPLET_DIR} ) else() vcpkg_execute_required_process( COMMAND autoreconf -vfi WORKING_DIRECTORY ${PRJ_DIR} - LOGNAME prerun-2-${TAR_TRIPLET_DIR} + LOGNAME autoconf-${TAR_TRIPLET_DIR} ) endif() endif() diff --git a/scripts/cmake/vcpkg_execute_required_process.cmake b/scripts/cmake/vcpkg_execute_required_process.cmake index f25a5b55e3e44a..d1ac1b5305cc01 100644 --- a/scripts/cmake/vcpkg_execute_required_process.cmake +++ b/scripts/cmake/vcpkg_execute_required_process.cmake @@ -78,3 +78,48 @@ Halting portfile execution. ) endif() endfunction() +function(vcpkg_execute_required_process2) + cmake_parse_arguments(PARSE_ARGV 0 vcpkg_execute_required_process "ALLOW_IN_DOWNLOAD_MODE" "WORKING_DIRECTORY;LOGNAME" "COMMAND") + set(LOG_OUT "${CURRENT_BUILDTREES_DIR}/${vcpkg_execute_required_process_LOGNAME}-out.log") + set(LOG_ERR "${CURRENT_BUILDTREES_DIR}/${vcpkg_execute_required_process_LOGNAME}-err.log") + + set(execute_process_function execute_process) + if (DEFINED VCPKG_DOWNLOAD_MODE AND NOT vcpkg_execute_required_process_ALLOW_IN_DOWNLOAD_MODE) + message(FATAL_ERROR +[[ +This command cannot be executed in Download Mode. +Halting portfile execution. +]]) + endif() + + _execute_process( + COMMAND "${vcpkg_execute_required_process_COMMAND}" + OUTPUT_FILE "${LOG_OUT}" + ERROR_FILE "${LOG_ERR}" + RESULT_VARIABLE error_code + WORKING_DIRECTORY "${vcpkg_execute_required_process_WORKING_DIRECTORY}") + if(error_code) + set(LOGS) + file(READ "${LOG_OUT}" out_contents) + file(READ "${LOG_ERR}" err_contents) + if(out_contents) + list(APPEND LOGS "${LOG_OUT}") + endif() + if(err_contents) + list(APPEND LOGS "${LOG_ERR}") + endif() + set(STRINGIFIED_LOGS) + foreach(LOG ${LOGS}) + file(TO_NATIVE_PATH "${LOG}" NATIVE_LOG) + list(APPEND STRINGIFIED_LOGS " ${NATIVE_LOG}\n") + endforeach() + vcpkg_prettify_command(vcpkg_execute_required_process_COMMAND vcpkg_execute_required_process_COMMAND_PRETTY) + message(FATAL_ERROR + " Command failed: ${vcpkg_execute_required_process_COMMAND_PRETTY}\n" + " Working Directory: ${vcpkg_execute_required_process_WORKING_DIRECTORY}\n" + " Error code: ${error_code}\n" + " See logs for more information:\n" + ${STRINGIFIED_LOGS} + ) + endif() +endfunction() \ No newline at end of file From de60c2f0a5e22bb92b40e7ebc76bfc3c4904b4d2 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 3 Feb 2020 22:56:10 +0100 Subject: [PATCH 347/419] stil needs mesa driver on linux --- ports/angle/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/angle/CONTROL b/ports/angle/CONTROL index e4375a1aab957b..b9e6ef36413503 100644 --- a/ports/angle/CONTROL +++ b/ports/angle/CONTROL @@ -3,4 +3,4 @@ Version: 2019-12-31-1 Homepage: https://github.com/google/angle Description: A conformant OpenGL ES implementation for Windows, Mac and Linux. The goal of ANGLE is to allow users of multiple operating systems to seamlessly run WebGL and other OpenGL ES content by translating OpenGL ES API calls to one of the hardware-supported APIs available for that platform. ANGLE currently provides translation from OpenGL ES 2.0 and 3.0 to desktop OpenGL, OpenGL ES, Direct3D 9, and Direct3D 11. Support for translation from OpenGL ES to Vulkan is underway, and future plans include compute shader support (ES 3.1) and MacOS support. -Build-Depends: egl-registry, opengl-registry, x11 (linux) +Build-Depends: egl-registry, opengl-registry, x11 (linux), mesa (linux) From a0bcd8b9d50960476c3b7f17f5cc8a449ec5e31c Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 3 Feb 2020 22:56:45 +0100 Subject: [PATCH 348/419] get configure/build make work on windows --- scripts/cmake/vcpkg_build_make.cmake | 12 ++++++++++-- scripts/cmake/vcpkg_configure_make.cmake | 9 +++++++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/scripts/cmake/vcpkg_build_make.cmake b/scripts/cmake/vcpkg_build_make.cmake index 67a8e856c98182..be6979683b03ec 100644 --- a/scripts/cmake/vcpkg_build_make.cmake +++ b/scripts/cmake/vcpkg_build_make.cmake @@ -44,12 +44,14 @@ function(vcpkg_build_make) # Compiler requriements vcpkg_find_acquire_program(YASM) vcpkg_find_acquire_program(PERL) - vcpkg_acquire_msys(MSYS_ROOT PACKAGES make) + vcpkg_acquire_msys(MSYS_ROOT PACKAGES make gcc) get_filename_component(YASM_EXE_PATH ${YASM} DIRECTORY) get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY) set(PATH_GLOBAL "$ENV{PATH}") - set(ENV{PATH} "$ENV{PATH};${YASM_EXE_PATH};${MSYS_ROOT}/usr/bin;${PERL_EXE_PATH}") + vcpkg_add_to_path("${YASM_EXE_PATH}") + vcpkg_add_to_path("${MSYS_ROOT}/usr/bin") + vcpkg_add_to_path("${PERL_EXE_PATH}") set(BASH ${MSYS_ROOT}/usr/bin/bash.exe) # Set make command and install command set(MAKE ${BASH} --noprofile --norc -c "${_VCPKG_PROJECT_SUBPATH}make") @@ -91,6 +93,12 @@ function(vcpkg_build_make) endif() set(ENV{INCLUDE} "${CURRENT_INSTALLED_DIR}/include;$ENV{INCLUDE}") + if(VCPKG_TARGET_IS_WINDOWS) + string(APPEND C_FLAGS_GLOBAL " -I\"${MSYS_ROOT}/usr/include\"") + string(APPEND CXX_FLAGS_GLOBAL " -I\"${MSYS_ROOT}/usr/include\"") + set(ENV{INCLUDE} "${CURRENT_INSTALLED_DIR}/include;${MSYS_ROOT}/usr/include;$ENV{INCLUDE}") + endif() + foreach(BUILDTYPE "debug" "release") if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL BUILDTYPE) diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index 990c7b3890f3c6..bf463d5e564ea2 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -137,7 +137,8 @@ function(vcpkg_configure_make) vcpkg_find_acquire_program(PERL) set(MSYS_REQUIRE_PACKAGES diffutils) if (_csc_AUTOCONFIG) - set(MSYS_REQUIRE_PACKAGES ${MSYS_REQUIRE_PACKAGES} autoconf automake m4 libtool perl pkg-config) + set(MSYS_REQUIRE_PACKAGES ${MSYS_REQUIRE_PACKAGES} autoconf automake m4 libtool perl pkg-config gcc) + #set(MSYS_REQUIRE_PACKAGES ${MSYS_REQUIRE_PACKAGES} base-devel) endif() vcpkg_acquire_msys(MSYS_ROOT PACKAGES ${MSYS_REQUIRE_PACKAGES}) get_filename_component(YASM_EXE_PATH ${YASM} DIRECTORY) @@ -152,7 +153,7 @@ function(vcpkg_configure_make) set(WIN_TARGET_ARCH --host=arm-pc-mingw32) endif() endif() - set(WIN_TARGET_COMPILER CC=cl) + set(WIN_TARGET_COMPILER CC=gcc) vcpkg_add_to_path("${YASM_EXE_PATH}") vcpkg_add_to_path("${MSYS_ROOT}/usr/bin") vcpkg_add_to_path("${PERL_EXE_PATH}") @@ -201,7 +202,11 @@ function(vcpkg_configure_make) if(NOT VCPKG_TARGET_IS_WINDOWS) string(APPEND C_FLAGS_GLOBAL " -fPIC") string(APPEND CXX_FLAGS_GLOBAL " -fPIC") + else() + string(APPEND C_FLAGS_GLOBAL " -I\"${MSYS_ROOT}/usr/include\"") + string(APPEND CXX_FLAGS_GLOBAL " -I\"${MSYS_ROOT}/usr/include\"") endif() + set(ENV{LD_LIBRARY_PATH} "${LD_LIBRARY_PATH_BACKUP}${VCPKG_HOST_PATH_SEPARATOR}${CURRENT_INSTALLED_DIR}/lib${VCPKG_HOST_PATH_SEPARATOR}${CURRENT_INSTALLED_DIR}/lib/manual-link") if(CMAKE_HOST_WIN32) From 1088ce6b9d595dcf8635b290a75b7c9cf1afa761 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 3 Feb 2020 22:57:03 +0100 Subject: [PATCH 349/419] make a few x ports work --- ports/xau/portfile.cmake | 8 +++++++- ports/xcb-proto/portfile.cmake | 5 +++++ ports/xproto/portfile.cmake | 6 +++++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/ports/xau/portfile.cmake b/ports/xau/portfile.cmake index e91808801a96b2..d47e2c44f06cac 100644 --- a/ports/xau/portfile.cmake +++ b/ports/xau/portfile.cmake @@ -12,6 +12,12 @@ vcpkg_from_gitlab( set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +if(WIN32) + SET(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled) # dumpbin will fail on GCC + set(OPTIONS --disable-dependency-tracking) + #string(APPEND VCPKG_C_FLAGS "/DX_NOT_POSIX") +endif() + vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} AUTOCONFIG @@ -20,7 +26,7 @@ vcpkg_configure_make( #AUTO_HOST #AUTO_DST #PRERUN_SHELL "export ACLOCAL=\"aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/\"" - #OPTIONS + OPTIONS ${OPTIONS} #OPTIONS_DEBUG #OPTIONS_RELEASE PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" diff --git a/ports/xcb-proto/portfile.cmake b/ports/xcb-proto/portfile.cmake index 952b885f17a26c..9c1c81eb6cd76a 100644 --- a/ports/xcb-proto/portfile.cmake +++ b/ports/xcb-proto/portfile.cmake @@ -14,6 +14,11 @@ message(STATUS "Using xmlling at: ${XMLLINT_PATH}") vcpkg_add_to_path("${XMLLINT_DIR_NATIVE}") #(also requires python2?) +vcpkg_find_acquire_program(PYTHON3) +get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) +file(TO_NATIVE_PATH "${PYTHON3_DIR}" PYTHON3_DIR_NATIVE) +vcpkg_add_to_path("${PYTHON3_DIR}") + vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org/xorg OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/xproto/portfile.cmake b/ports/xproto/portfile.cmake index 0ec95ebe10081d..f24d8bb381ffa8 100644 --- a/ports/xproto/portfile.cmake +++ b/ports/xproto/portfile.cmake @@ -13,6 +13,10 @@ vcpkg_from_gitlab( set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +if(NOT VCPKG_TARGET_IS_WINDOWS) + set(OPTIONS --enable-legacy) # has an build error on windows so I assume it is unsupported. +endif() + vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} AUTOCONFIG @@ -21,7 +25,7 @@ vcpkg_configure_make( #AUTO_HOST #AUTO_DST #PRERUN_SHELL "export ACLOCAL=\"aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/\"" - OPTIONS --enable-legacy + OPTIONS ${OPTIONS} #OPTIONS_DEBUG #OPTIONS_RELEASE PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" From 379d79f7c880ec9431f33d5ea916f7e0d5bbbae7 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 3 Feb 2020 23:07:45 +0100 Subject: [PATCH 350/419] build only static/shared library on windows --- scripts/cmake/vcpkg_configure_make.cmake | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index bf463d5e564ea2..4da2b41af0d221 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -79,6 +79,7 @@ ## * [tcl](https://github.com/Microsoft/vcpkg/blob/master/ports/tcl/portfile.cmake) ## * [freexl](https://github.com/Microsoft/vcpkg/blob/master/ports/freexl/portfile.cmake) ## * [libosip2](https://github.com/Microsoft/vcpkg/blob/master/ports/libosip2/portfile.cmake) + function(vcpkg_configure_make) cmake_parse_arguments(_csc "AUTOCONFIG;DISABLE_AUTO_HOST;DISABLE_AUTO_DST;NO_DEBUG;SKIP_CONFIGURE" @@ -133,11 +134,13 @@ function(vcpkg_configure_make) endif() # Pre-processing windows configure requirements if (CMAKE_HOST_WIN32) + ## Please read https://github.com/orlp/dev-on-windows/wiki/Installing-GCC--&-MSYS2 vcpkg_find_acquire_program(YASM) vcpkg_find_acquire_program(PERL) set(MSYS_REQUIRE_PACKAGES diffutils) if (_csc_AUTOCONFIG) set(MSYS_REQUIRE_PACKAGES ${MSYS_REQUIRE_PACKAGES} autoconf automake m4 libtool perl pkg-config gcc) + # #set(MSYS_REQUIRE_PACKAGES ${MSYS_REQUIRE_PACKAGES} base-devel) endif() vcpkg_acquire_msys(MSYS_ROOT PACKAGES ${MSYS_REQUIRE_PACKAGES}) @@ -209,6 +212,12 @@ function(vcpkg_configure_make) set(ENV{LD_LIBRARY_PATH} "${LD_LIBRARY_PATH_BACKUP}${VCPKG_HOST_PATH_SEPARATOR}${CURRENT_INSTALLED_DIR}/lib${VCPKG_HOST_PATH_SEPARATOR}${CURRENT_INSTALLED_DIR}/lib/manual-link") + if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(_csc_OPTIONS ${_csc_OPTIONS} --enable-shared --disable-static) + else() + set(_csc_OPTIONS ${_csc_OPTIONS} --enable-static --disable-shared) + endif() + if(CMAKE_HOST_WIN32) set(base_cmd ${BASH} --noprofile --norc) @@ -241,11 +250,6 @@ function(vcpkg_configure_make) ${base_cmd} -c "${WIN_TARGET_COMPILER} ${_csc_SOURCE_PATH}/configure ${WIN_TARGET_ARCH} ${_csc_OPTIONS} ${_csc_OPTIONS_DEBUG}") else() set(base_cmd ./) - if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set(_csc_OPTIONS ${_csc_OPTIONS} --enable-shared --disable-static) - else() - set(_csc_OPTIONS ${_csc_OPTIONS} --enable-static --disable-shared) - endif() set(rel_command "${base_cmd}configure;${_csc_OPTIONS};${_csc_OPTIONS_RELEASE}" ) From 2161527cc975ea1d4cb13a93f877032ad723b1d3 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 3 Feb 2020 23:38:05 +0100 Subject: [PATCH 351/419] fix pkgconfig on windows --- ports/bzip2/bzip2.pc.in | 2 +- ports/bzip2/portfile.cmake | 4 ++++ ports/zlib/portfile.cmake | 15 +++++++++++++-- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/ports/bzip2/bzip2.pc.in b/ports/bzip2/bzip2.pc.in index ff37aacb0a97a0..d9214f2ce2a60e 100644 --- a/ports/bzip2/bzip2.pc.in +++ b/ports/bzip2/bzip2.pc.in @@ -7,5 +7,5 @@ Name: bzip2 Description: bzip2 Version: 3.0 Requires: -Libs: -L${libdir} -lbz2 +Libs: -L${libdir} -l@bzname@ Cflags: -I${includedir} \ No newline at end of file diff --git a/ports/bzip2/portfile.cmake b/ports/bzip2/portfile.cmake index 682fba56cb9b61..f439737496bf9d 100644 --- a/ports/bzip2/portfile.cmake +++ b/ports/bzip2/portfile.cmake @@ -42,7 +42,11 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/sh vcpkg_test_cmake(PACKAGE_NAME BZip2 MODULE) set(BZIP2_PREFIX "${CURRENT_INSTALLED_DIR}") +set(bzname bz2) configure_file("${CMAKE_CURRENT_LIST_DIR}/bzip2.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/bzip2.pc" DESTINATION @ONLY) set(BZIP2_PREFIX "${CURRENT_INSTALLED_DIR}/debug") +if(VCPKG_TARGET_IS_WINDOWS) + set(bzname bz2d) +endif() configure_file("${CMAKE_CURRENT_LIST_DIR}/bzip2.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/bzip2.pc" DESTINATION @ONLY) vcpkg_fixup_pkgconfig() \ No newline at end of file diff --git a/ports/zlib/portfile.cmake b/ports/zlib/portfile.cmake index 79bd6e93760881..a24687955c77cb 100644 --- a/ports/zlib/portfile.cmake +++ b/ports/zlib/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - set(VERSION 1.2.11) vcpkg_download_distfile(ARCHIVE_FILE @@ -32,6 +30,19 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_fixup_pkgconfig() +if(VCPKG_TARGET_IS_WINDOWS) + set(_file "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/zlib.pc") + file(READ "${_file}" _contents) + file(REPLACE " -lz" " -lzlib" _contents "${_contents}") + file(WRITE "${_file}" "${_contents}") + + set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/zlib.pc") + if(EXISTS "${_file}") + file(READ "${_file}" _contents) + file(REPLACE " -lz" " -lzlibd" _contents "${_contents}") + file(WRITE "${_file}" "${_contents}") + endif() +endif() # Both dynamic and static are built, so keep only the one needed if(VCPKG_LIBRARY_LINKAGE STREQUAL static) if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/zlibstatic.lib) From c73ab50a82da481ba80cca23053fb81d5952ed57 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 3 Feb 2020 23:38:18 +0100 Subject: [PATCH 352/419] xcb requires python --- ports/xcb/portfile.cmake | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ports/xcb/portfile.cmake b/ports/xcb/portfile.cmake index 67883e44d3ad06..4f453089a7dc1e 100644 --- a/ports/xcb/portfile.cmake +++ b/ports/xcb/portfile.cmake @@ -16,6 +16,11 @@ vcpkg_from_gitlab( set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +vcpkg_find_acquire_program(PYTHON3) +get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) +file(TO_NATIVE_PATH "${PYTHON3_DIR}" PYTHON3_DIR_NATIVE) +vcpkg_add_to_path("${PYTHON3_DIR}") + vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} AUTOCONFIG From e3b3e1dea418daf05f9768f4318f70b54423d0da Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 3 Feb 2020 23:38:30 +0100 Subject: [PATCH 353/419] small patch --- ports/elfutils/configure.patch | 22 ++++++++++++++++++++++ ports/elfutils/portfile.cmake | 1 + 2 files changed, 23 insertions(+) create mode 100644 ports/elfutils/configure.patch diff --git a/ports/elfutils/configure.patch b/ports/elfutils/configure.patch new file mode 100644 index 00000000000000..b0c18166f551df --- /dev/null +++ b/ports/elfutils/configure.patch @@ -0,0 +1,22 @@ +diff --git a/configure.ac b/configure.ac +index 07d371c31..15552315c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -383,7 +383,7 @@ AM_CONDITIONAL(TESTS_RPATH, test "$tests_use_rpath" = yes) + dnl zlib is mandatory. + save_LIBS="$LIBS" + LIBS= +-eu_ZIPLIB(zlib,ZLIB,gzdirect,gzip) ++eu_ZIPLIB(zlib,ZLIB,zlibd,gzdirect,gzip) + AS_IF([test "x$with_zlib" = xno], [AC_MSG_ERROR([zlib not found but is required])]) + LIBS="$save_LIBS" + +@@ -391,7 +391,7 @@ dnl Test for bzlib and xz/lzma, gives BZLIB/LZMALIB .am + dnl conditional and config.h USE_BZLIB/USE_LZMALIB #define. + save_LIBS="$LIBS" + LIBS= +-eu_ZIPLIB(bzlib,BZLIB,bz2,BZ2_bzdopen,bzip2) ++eu_ZIPLIB(bzlib,BZLIB,bz2,bz2d,BZ2_bzdopen,bzip2) + # We need this since bzip2 doesn't have a pkgconfig file. + BZ2_LIB="$LIBS" + AC_SUBST([BZ2_LIB]) diff --git a/ports/elfutils/portfile.cmake b/ports/elfutils/portfile.cmake index 9456250060d144..45ab403537b48d 100644 --- a/ports/elfutils/portfile.cmake +++ b/ports/elfutils/portfile.cmake @@ -12,6 +12,7 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE "${ARCHIVE}" + PATCHES configure.patch ) vcpkg_configure_make( From 97f0a55747e749ec7d78a556084d320503c6b899 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 3 Feb 2020 23:58:58 +0100 Subject: [PATCH 354/419] fix missing ) --- ports/angle/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/angle/portfile.cmake b/ports/angle/portfile.cmake index d463d00baa3447..fd7fc51fa93c11 100644 --- a/ports/angle/portfile.cmake +++ b/ports/angle/portfile.cmake @@ -58,7 +58,7 @@ set(_double_files include/GLES3/gl3.h include/GLES3/gl31.h include/GLES3/gl32.h - include/GLES3/gl3platform.h + include/GLES3/gl3platform.h) foreach(_file ${_double_files}) if(EXISTS "${CURRENT_PACKAGES_DIR}/${_file}") file(REMOVE "${CURRENT_PACKAGES_DIR}/${_file}") From 721fdd55241777489870d7de7a14da28899770ea Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 4 Feb 2020 00:04:43 +0100 Subject: [PATCH 355/419] update mesa not needing drm on windows --- ports/mesa/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/mesa/CONTROL b/ports/mesa/CONTROL index 8951dae5ea69f9..ed93e7776a04bb 100644 --- a/ports/mesa/CONTROL +++ b/ports/mesa/CONTROL @@ -2,4 +2,4 @@ Source: mesa Version: 19.3.3 Homepage: https://www.mesa3d.org/ Description: Mesa - The 3D Graphics Library -Build-Depends: drm, elfutils, wayland, wayland-protocols, xdamage, xshmfence, x11, xcb, xfixes, xext, xxf86vm, xrandr, egl-registry, opengl-registry +Build-Depends: drm (!windows), elfutils, wayland, wayland-protocols, xdamage, xshmfence, x11, xcb, xfixes, xext, xxf86vm, xrandr, egl-registry, opengl-registry From 1acc24b89d706023dd4a121bbb1737c654816e0e Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 4 Feb 2020 00:12:47 +0100 Subject: [PATCH 356/419] add initial xserver port --- ports/xserver/CONTROL | 5 +++++ ports/xserver/portfile.cmake | 29 +++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 ports/xserver/CONTROL create mode 100644 ports/xserver/portfile.cmake diff --git a/ports/xserver/CONTROL b/ports/xserver/CONTROL new file mode 100644 index 00000000000000..2cdd8c70c1af77 --- /dev/null +++ b/ports/xserver/CONTROL @@ -0,0 +1,5 @@ +Source: xserver +Version: 1.20.7 +Homepage: https://gitlab.freedesktop.org/xorg/xserver +Description: C interface to the X Window System protocol, which replaces the traditional Xlib interface. +Build-Depends: xcb-proto, xcb-util-m4, xorg-macros, xproto, xtrans, x11 diff --git a/ports/xserver/portfile.cmake b/ports/xserver/portfile.cmake new file mode 100644 index 00000000000000..2f38beb36dff17 --- /dev/null +++ b/ports/xserver/portfile.cmake @@ -0,0 +1,29 @@ + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org + OUT_SOURCE_PATH SOURCE_PATH + REPO xorg/xserver + REF 489f4191f3c881c6c8acce97ec612167a4ae0f33 #v1.20.7 + SHA512 30c15c0f7bfca635118dd9b4ca615b6d79d005880108415dc46b561c7f08b648c231b7f5c498c74ecaa1815cfa81c23f7ba39f6d0c0cdfddaf00104df8741b27 + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) + +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +vcpkg_acquire_msys(MSYS_ROOT PACKAGES pkg-config) +vcpkg_add_to_path("${MSYS_ROOT}/usr/bin") + +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" +) +vcpkg_install_meson() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) From a06b95ceb4aca84a49a27b5c5ba93cb8867472a0 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 4 Feb 2020 00:13:07 +0100 Subject: [PATCH 357/419] trying to fix windows builds of xtrans without luck --- ports/xtrans/portfile.cmake | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/ports/xtrans/portfile.cmake b/ports/xtrans/portfile.cmake index 5596f2e55fd2f0..57c8c7c14180a6 100644 --- a/ports/xtrans/portfile.cmake +++ b/ports/xtrans/portfile.cmake @@ -32,17 +32,22 @@ vcpkg_install_make() vcpkg_fixup_pkgconfig() file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/xorg/") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/") #file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/xorg/aclocal/") -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/include") +if(WIN32) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/include") +endif() file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib") -file(RENAME "${CURRENT_PACKAGES_DIR}/include/" "${CURRENT_PACKAGES_DIR}/share/${PORT}/include") +file(RENAME "${CURRENT_PACKAGES_DIR}/include/" "${CURRENT_PACKAGES_DIR}/share/${PORT}/include/") # the include folder is moved since it contains source files. It is not meant as a traditional include folder but as a shared files folder for different x libraries. file(RENAME "${CURRENT_PACKAGES_DIR}/share/pkgconfig/" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") file(RENAME "${CURRENT_PACKAGES_DIR}/share/aclocal/" "${CURRENT_PACKAGES_DIR}/share/xorg/aclocal") file(RENAME "${CURRENT_PACKAGES_DIR}/share/doc/" "${CURRENT_PACKAGES_DIR}/share/xorg/doc") -file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") -file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/" "${CURRENT_PACKAGES_DIR}/share/xorg/debug") +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/" "${CURRENT_PACKAGES_DIR}/share/xorg/debug") +endif() set(_file "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/xtrans.pc" ) file(READ "${_file}" _contents) @@ -50,9 +55,11 @@ string(REPLACE "includedir=\${prefix}/include" "includedir=\${prefix}/share/xtra file(WRITE "${_file}" "${_contents}") set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/xtrans.pc" ) -file(READ "${_file}" _contents) -string(REPLACE "includedir=\${prefix}/../include" "includedir=\${prefix}/../share/xtrans/include" _contents "${_contents}") -file(WRITE "${_file}" "${_contents}") +if(EXISTS "${_file}") + file(READ "${_file}" _contents) + string(REPLACE "includedir=\${prefix}/../include" "includedir=\${prefix}/../share/xtrans/include" _contents "${_contents}") + file(WRITE "${_file}" "${_contents}") +endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") From d0a257ae30d94bdbdadc5eb6c1695b61098c9677 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 4 Feb 2020 00:26:06 +0100 Subject: [PATCH 358/419] make xtrans work on windows --- ports/xtrans/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/xtrans/portfile.cmake b/ports/xtrans/portfile.cmake index 57c8c7c14180a6..8f8051d99c2372 100644 --- a/ports/xtrans/portfile.cmake +++ b/ports/xtrans/portfile.cmake @@ -34,7 +34,7 @@ vcpkg_fixup_pkgconfig() file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/xorg/") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/") #file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/xorg/aclocal/") -if(WIN32) +if(NOT WIN32) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/include") endif() file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib") From ca8a1518a72bab108ca8ee9dd1191229ed80bdd1 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 4 Feb 2020 09:10:34 +0100 Subject: [PATCH 359/419] workign commit before merge --- ports/xorg-macros/portfile.cmake | 2 +- ports/zlib/portfile.cmake | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ports/xorg-macros/portfile.cmake b/ports/xorg-macros/portfile.cmake index 59dd0efa39ca1a..5af66ebb16cb5b 100644 --- a/ports/xorg-macros/portfile.cmake +++ b/ports/xorg-macros/portfile.cmake @@ -1,7 +1,7 @@ set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) ## requires AUTOCONF, LIBTOOL and PKCONF -message(STATUS "----- ${PORT} requires autoconf, libtool and pkconf from the system package manager! -----") +message(STATUS "----- ${PORT} requires autoconf, libtool and pkconf from the system package manager! \n ----- sudo apt-get install autogen autoconf libtool-----") vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org/xorg diff --git a/ports/zlib/portfile.cmake b/ports/zlib/portfile.cmake index 79bd6e93760881..f407b576aae2b4 100644 --- a/ports/zlib/portfile.cmake +++ b/ports/zlib/portfile.cmake @@ -43,7 +43,6 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static) endif() file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/zlib RENAME copyright) - vcpkg_copy_pdbs() file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) From 339d42132fc2c9b45a35f9a5e64ba122ceaa3cd9 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 4 Feb 2020 09:10:45 +0100 Subject: [PATCH 360/419] remove empty line --- ports/xkbcommon/portfile.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/xkbcommon/portfile.cmake b/ports/xkbcommon/portfile.cmake index fa05e5c2d80e2c..83285b80872b22 100644 --- a/ports/xkbcommon/portfile.cmake +++ b/ports/xkbcommon/portfile.cmake @@ -1,4 +1,3 @@ - if(VCPKG_LIBRARY_LINKAGE STREQUAL static) set(PATCHES meson.build.patch) # this patch is not 100% correct since xcb and xcb-xkb can be build dynamically in a custom triplet From 274e53f75f049e8763e08c73c4f3058a5ed937b4 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 4 Feb 2020 09:50:47 +0100 Subject: [PATCH 361/419] add supports field. --- ports/vtk-m/CONTROL | 1 + ports/xorg-macros/CONTROL | 1 + 2 files changed, 2 insertions(+) diff --git a/ports/vtk-m/CONTROL b/ports/vtk-m/CONTROL index 4deffb93343da0..d13cc601566fac 100644 --- a/ports/vtk-m/CONTROL +++ b/ports/vtk-m/CONTROL @@ -2,6 +2,7 @@ Source: vtk-m Version: 1.3.0 Homepage: https://gitlab.kitware.com/vtk/vtk-m/ Description: VTK-m is a toolkit of scientific visualization algorithms for emerging processor architectures. +Supports: x64 Feature: cuda Description: Use the NVIDIA CUDA device adapter. diff --git a/ports/xorg-macros/CONTROL b/ports/xorg-macros/CONTROL index 9d4ef3258062b0..00365db599614e 100644 --- a/ports/xorg-macros/CONTROL +++ b/ports/xorg-macros/CONTROL @@ -2,3 +2,4 @@ Source: xorg-macros Version: 1.19.2-1 Homepage: https://xcb.freedesktop.org/ Description: X.org macros utilities. +Supports: !uwp \ No newline at end of file From b2763de1063764da15cd0a49de34c7b7fe294666 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 4 Feb 2020 10:12:51 +0100 Subject: [PATCH 362/419] add new policy to skip dumpbin checks and add some quotes to the cmake advices to handle paths ith spaces correctly. --- scripts/ports.cmake | 3 +++ toolsrc/include/vcpkg/build.h | 2 ++ toolsrc/src/vcpkg/build.cpp | 1 + toolsrc/src/vcpkg/postbuildlint.cpp | 18 +++++++++--------- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/scripts/ports.cmake b/scripts/ports.cmake index 20e59a18470c33..9681427d76e23a 100644 --- a/scripts/ports.cmake +++ b/scripts/ports.cmake @@ -114,6 +114,9 @@ if(CMD MATCHES "^BUILD$") if (DEFINED VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS) file(APPEND ${BUILD_INFO_FILE_PATH} "PolicyAllowRestrictedHeaders: ${VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS}\n") endif() + if (DEFINED VCPKG_POLICY_SKIP_DUMPBIN_CHECKS) + file(APPEND ${BUILD_INFO_FILE_PATH} "PolicySkipDumpbinChecks: ${VCPKG_POLICY_SKIP_DUMPBIN_CHECKS}\n") + endif() if (DEFINED VCPKG_HEAD_VERSION) file(APPEND ${BUILD_INFO_FILE_PATH} "Version: ${VCPKG_HEAD_VERSION}\n") endif() diff --git a/toolsrc/include/vcpkg/build.h b/toolsrc/include/vcpkg/build.h index 57663ebe59c7ee..b7b7475efdeede 100644 --- a/toolsrc/include/vcpkg/build.h +++ b/toolsrc/include/vcpkg/build.h @@ -240,6 +240,7 @@ namespace vcpkg::Build EMPTY_INCLUDE_FOLDER, ALLOW_OBSOLETE_MSVCRT, ALLOW_RESTRICTED_HEADERS, + SKIP_DUMPBIN_CHECKS, // Must be last COUNT, }; @@ -252,6 +253,7 @@ namespace vcpkg::Build BuildPolicy::EMPTY_INCLUDE_FOLDER, BuildPolicy::ALLOW_OBSOLETE_MSVCRT, BuildPolicy::ALLOW_RESTRICTED_HEADERS, + BuildPolicy::SKIP_DUMPBIN_CHECKS }; const std::string& to_string(BuildPolicy policy); diff --git a/toolsrc/src/vcpkg/build.cpp b/toolsrc/src/vcpkg/build.cpp index bcacb331a68dc8..230fb2aebf37f5 100644 --- a/toolsrc/src/vcpkg/build.cpp +++ b/toolsrc/src/vcpkg/build.cpp @@ -200,6 +200,7 @@ namespace vcpkg::Build case BuildPolicy::EMPTY_INCLUDE_FOLDER: return "VCPKG_POLICY_EMPTY_INCLUDE_FOLDER"; case BuildPolicy::ALLOW_OBSOLETE_MSVCRT: return "VCPKG_POLICY_ALLOW_OBSOLETE_MSVCRT"; case BuildPolicy::ALLOW_RESTRICTED_HEADERS: return "VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS"; + case BuildPolicy::SKIP_DUMPBIN_CHECKS: return "VCPKG_POLICY_SKIP_DUMPBIN_CHECKS"; default: Checks::unreachable(VCPKG_LINE_INFO); } } diff --git a/toolsrc/src/vcpkg/postbuildlint.cpp b/toolsrc/src/vcpkg/postbuildlint.cpp index b346e1721bbbf5..c61f7d2d9d4e00 100644 --- a/toolsrc/src/vcpkg/postbuildlint.cpp +++ b/toolsrc/src/vcpkg/postbuildlint.cpp @@ -200,7 +200,7 @@ namespace vcpkg::PostBuildLint System::print2(System::Color::warning, "Include files should not be duplicated into the /debug/include directory. If this cannot " "be disabled in the project cmake, use\n" - " file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)\n"); + " file(REMOVE_RECURSE \"${CURRENT_PACKAGES_DIR}/debug/include)\"\n"); return LintStatus::ERROR_DETECTED; } @@ -215,7 +215,7 @@ namespace vcpkg::PostBuildLint { System::print2(System::Color::warning, "/debug/share should not exist. Please reorganize any important files, then use\n" - " file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)\n"); + " file(REMOVE_RECURSE \"${CURRENT_PACKAGES_DIR}/debug/share)\"\n"); return LintStatus::ERROR_DETECTED; } @@ -349,8 +349,8 @@ namespace vcpkg::PostBuildLint const fs::path relative_path = found_file.string().erase( 0, current_buildtrees_dir.string().size() + 1); // The +1 is needed to remove the "/" System::printf( - "\n file(COPY ${CURRENT_BUILDTREES_DIR}/%s DESTINATION ${CURRENT_PACKAGES_DIR}/share/%s)\n" - " file(RENAME ${CURRENT_PACKAGES_DIR}/share/%s/%s ${CURRENT_PACKAGES_DIR}/share/%s/copyright)\n", + "\n file(COPY \"${CURRENT_BUILDTREES_DIR}/%s\" DESTINATION \"${CURRENT_PACKAGES_DIR}/share/%s\")\n" + " file(RENAME \"${CURRENT_PACKAGES_DIR}/share/%s/%s\" \"${CURRENT_PACKAGES_DIR}/share/%s/copyright\")\n", relative_path.generic_string(), spec.name(), spec.name(), @@ -662,7 +662,7 @@ namespace vcpkg::PostBuildLint "\n" R"###( if(VCPKG_LIBRARY_LINKAGE STREQUAL "static"))###" "\n" - R"###( file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin))###" + R"###( file(REMOVE_RECURSE \"${CURRENT_PACKAGES_DIR}/bin\" \"${CURRENT_PACKAGES_DIR}/debug/bin\"))###" "\n" R"###( endif())###" "\n\n"); @@ -689,7 +689,7 @@ namespace vcpkg::PostBuildLint "If the directories are not needed and their creation cannot be disabled, use something like this in " "the portfile to remove them:\n" "\n" - R"###( file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/a/dir ${CURRENT_PACKAGES_DIR}/some/other/dir))###" + R"###( file(REMOVE_RECURSE \"${CURRENT_PACKAGES_DIR}/a/dir\" \"${CURRENT_PACKAGES_DIR}/some/other/dir\"))###" "\n" "\n" "\n"); @@ -902,8 +902,8 @@ namespace vcpkg::PostBuildLint std::vector dlls; dlls.insert(dlls.cend(), debug_dlls.cbegin(), debug_dlls.cend()); dlls.insert(dlls.cend(), release_dlls.cbegin(), release_dlls.cend()); - - if (!toolset.dumpbin.empty()) + + if (!toolset.dumpbin.empty() && !build_info.policies.is_enabled(BuildPolicy::SKIP_DUMPBIN_CHECKS)) { error_count += check_exports_of_dlls(build_info.policies, dlls, toolset.dumpbin); error_count += check_uwp_bit_of_dlls(pre_build_info.cmake_system_name, dlls, toolset.dumpbin); @@ -924,7 +924,7 @@ namespace vcpkg::PostBuildLint error_count += check_bin_folders_are_not_present_in_static_build(fs, package_dir); - if (!toolset.dumpbin.empty()) + if (!toolset.dumpbin.empty() && !build_info.policies.is_enabled(BuildPolicy::SKIP_DUMPBIN_CHECKS)) { if (!build_info.policies.is_enabled(BuildPolicy::ONLY_RELEASE_CRT)) { From 08ba1c867840aa3c43b185c74020e72919d87ba5 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 4 Feb 2020 10:20:15 +0100 Subject: [PATCH 363/419] add the skip to configure make --- scripts/cmake/vcpkg_configure_make.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index 4da2b41af0d221..964c614caa19f4 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -135,6 +135,7 @@ function(vcpkg_configure_make) # Pre-processing windows configure requirements if (CMAKE_HOST_WIN32) ## Please read https://github.com/orlp/dev-on-windows/wiki/Installing-GCC--&-MSYS2 + set(VCPKG_POLICY_SKIP_DUMPBIN_CHECKS enabled) # since we cannot use dumpbin on the generated dll'ds vcpkg_find_acquire_program(YASM) vcpkg_find_acquire_program(PERL) set(MSYS_REQUIRE_PACKAGES diffutils) From 16a7529157be691b6dc622a0bbd89337a401b0b3 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 4 Feb 2020 10:48:32 +0100 Subject: [PATCH 364/419] forgot to save/commit remaining changes for skip dumpbin checks --- toolsrc/src/vcpkg/build.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/toolsrc/src/vcpkg/build.cpp b/toolsrc/src/vcpkg/build.cpp index 230fb2aebf37f5..e79d3e816b3132 100644 --- a/toolsrc/src/vcpkg/build.cpp +++ b/toolsrc/src/vcpkg/build.cpp @@ -173,7 +173,8 @@ namespace vcpkg::Build static const std::string NAME_EMPTY_INCLUDE_FOLDER = "PolicyEmptyIncludeFolder"; static const std::string NAME_ALLOW_OBSOLETE_MSVCRT = "PolicyAllowObsoleteMsvcrt"; static const std::string NAME_ALLOW_RESTRICTED_HEADERS = "PolicyAllowRestrictedHeaders"; - + static const std::string SKIP_DUMPBIN_CHECKS = "PolicySkipDumpbinChecks"; + const std::string& to_string(BuildPolicy policy) { switch (policy) @@ -185,6 +186,7 @@ namespace vcpkg::Build case BuildPolicy::EMPTY_INCLUDE_FOLDER: return NAME_EMPTY_INCLUDE_FOLDER; case BuildPolicy::ALLOW_OBSOLETE_MSVCRT: return NAME_ALLOW_OBSOLETE_MSVCRT; case BuildPolicy::ALLOW_RESTRICTED_HEADERS: return NAME_ALLOW_RESTRICTED_HEADERS; + case BuildPolicy::SKIP_DUMPBIN_CHECKS: return SKIP_DUMPBIN_CHECKS; default: Checks::unreachable(VCPKG_LINE_INFO); } } From f5af3e17c23a7b6bdb0aaff090eca2fce5e9461a Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 4 Feb 2020 11:09:02 +0100 Subject: [PATCH 365/419] push the policy into the parent scope --- scripts/cmake/vcpkg_configure_make.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index 964c614caa19f4..1d6a596dd74a34 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -135,7 +135,7 @@ function(vcpkg_configure_make) # Pre-processing windows configure requirements if (CMAKE_HOST_WIN32) ## Please read https://github.com/orlp/dev-on-windows/wiki/Installing-GCC--&-MSYS2 - set(VCPKG_POLICY_SKIP_DUMPBIN_CHECKS enabled) # since we cannot use dumpbin on the generated dll'ds + set(VCPKG_POLICY_SKIP_DUMPBIN_CHECKS enabled PARENT_SCOPE) # since we cannot use dumpbin on the generated dll'ds vcpkg_find_acquire_program(YASM) vcpkg_find_acquire_program(PERL) set(MSYS_REQUIRE_PACKAGES diffutils) From fdaeae0f3e32e80cf085bdec075764bb8c6bbbeb Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 4 Feb 2020 16:49:22 +0100 Subject: [PATCH 366/419] update msys --- scripts/cmake/vcpkg_acquire_msys.cmake | 48 +++++++++++++------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/scripts/cmake/vcpkg_acquire_msys.cmake b/scripts/cmake/vcpkg_acquire_msys.cmake index f1f09dc7efb814..0e45b33c788f62 100644 --- a/scripts/cmake/vcpkg_acquire_msys.cmake +++ b/scripts/cmake/vcpkg_acquire_msys.cmake @@ -36,7 +36,7 @@ ## * [libvpx](https://github.com/Microsoft/vcpkg/blob/master/ports/libvpx/portfile.cmake) function(vcpkg_acquire_msys PATH_TO_ROOT_OUT) - set(TOOLPATH ${DOWNLOADS}/tools/msys2) + set(TOOLPATH "${DOWNLOADS}/tools/msys2") cmake_parse_arguments(_am "" "" "PACKAGES" ${ARGN}) if(NOT CMAKE_HOST_WIN32) @@ -53,45 +53,45 @@ function(vcpkg_acquire_msys PATH_TO_ROOT_OUT) if(_vam_HOST_ARCHITECTURE STREQUAL "AMD64") set(TOOLSUBPATH msys64) set(URLS - "http://repo.msys2.org/distrib/x86_64/msys2-base-x86_64-20181211.tar.xz" + "http://repo.msys2.org/distrib/x86_64/msys2-base-x86_64-20190524.tar.xz " ) - set(ARCHIVE "msys2-base-x86_64-20181211.tar.xz") - set(HASH 1efb9a7ff1daa2d3147ac0fda8e9a645696dbd19a33c986b844bc037d946dddb3353db5a52794ac668718812854400d918e4db13b4a2d0e6f5a9dfe716b48056) + set(ARCHIVE "msys2-base-x86_64-20190524.tar.xz") + set(HASH 50796072d01d30cc4a02df0f9dafb70e2584462e1341ef0eff94e2542d3f5173f20f81e8f743e9641b7528ea1492edff20ce83cb40c6e292904905abe2a91ccc) set(STAMP "initialized-msys2_64.stamp") else() set(TOOLSUBPATH msys32) set(URLS - "http://repo.msys2.org/distrib/i686/msys2-base-i686-20181211.tar.xz" + "http://repo.msys2.org/distrib/" ) - set(ARCHIVE "msys2-base-i686-20181211.tar.xz") - set(HASH a9b9680a511bb205b87811b303eb29d62e2fd851000304f8b087c5893a3891c2aa2d46217ae989e31b5d52a6ba34ac5e6a5e624d9c917df00a752ade4debc20f) + set(ARCHIVE "msys2-base-i686-20190524.tar.xz ") + set(HASH cb7e75569777d39e30dba813ba2934ef74d269a963cb9485b22f2434b3e0eea51f132a876c193bb352f9e8dd16bdf5c754791a71de2455d0b78f14fe02bbb19e) set(STAMP "initialized-msys2_32.stamp") endif() - set(PATH_TO_ROOT ${TOOLPATH}/${TOOLSUBPATH}) + set(PATH_TO_ROOT "${TOOLPATH}/${TOOLSUBPATH}") if(NOT EXISTS "${TOOLPATH}/${STAMP}") message(STATUS "Acquiring MSYS2...") vcpkg_download_distfile(ARCHIVE_PATH - URLS ${URLS} - FILENAME ${ARCHIVE} - SHA512 ${HASH} + URLS "${URLS}" + FILENAME "${ARCHIVE}" + SHA512 "${HASH}" ) - file(REMOVE_RECURSE ${TOOLPATH}/${TOOLSUBPATH}) - file(MAKE_DIRECTORY ${TOOLPATH}) + file(REMOVE_RECURSE "${TOOLPATH}/${TOOLSUBPATH}") + file(MAKE_DIRECTORY "${TOOLPATH}") _execute_process( - COMMAND ${CMAKE_COMMAND} -E tar xzf ${ARCHIVE_PATH} - WORKING_DIRECTORY ${TOOLPATH} + COMMAND "${CMAKE_COMMAND}" -E tar xzf "${ARCHIVE_PATH}" + WORKING_DIRECTORY "${TOOLPATH}" ) _execute_process( - COMMAND ${PATH_TO_ROOT}/usr/bin/bash.exe --noprofile --norc -c "PATH=/usr/bin;pacman-key --init;pacman-key --populate" - WORKING_DIRECTORY ${TOOLPATH} + COMMAND "${PATH_TO_ROOT}/usr/bin/bash.exe" --noprofile --norc -c "PATH=/usr/bin;pacman-key --init;pacman-key --populate" + WORKING_DIRECTORY "${TOOLPATH}" ) _execute_process( - COMMAND ${PATH_TO_ROOT}/usr/bin/bash.exe --noprofile --norc -c "PATH=/usr/bin;pacman -Syu --noconfirm" - WORKING_DIRECTORY ${TOOLPATH} + COMMAND "${PATH_TO_ROOT}/usr/bin/bash.exe" --noprofile --norc -c "PATH=/usr/bin;pacman -Syu --noconfirm" + WORKING_DIRECTORY "${TOOLPATH}" ) file(WRITE "${TOOLPATH}/${STAMP}" "0") message(STATUS "Acquiring MSYS2... OK") @@ -102,11 +102,11 @@ function(vcpkg_acquire_msys PATH_TO_ROOT_OUT) string(REPLACE ";" " " _am_PACKAGES "${_am_PACKAGES}") set(_ENV_ORIGINAL $ENV{PATH}) - set(ENV{PATH} ${PATH_TO_ROOT}/usr/bin) + set(ENV{PATH} "${PATH_TO_ROOT}/usr/bin") vcpkg_execute_required_process( ALLOW_IN_DOWNLOAD_MODE - COMMAND ${PATH_TO_ROOT}/usr/bin/bash.exe --noprofile --norc -c "pacman -Sy --noconfirm --needed ${_am_PACKAGES}" - WORKING_DIRECTORY ${TOOLPATH} + COMMAND "${PATH_TO_ROOT}/usr/bin/bash.exe" --noprofile --norc -c "pacman -Sy --noconfirm --needed ${_am_PACKAGES}" + WORKING_DIRECTORY "${TOOLPATH}" LOGNAME msys-pacman-${TARGET_TRIPLET} ) set(ENV{PATH} "${_ENV_ORIGINAL}") @@ -119,9 +119,9 @@ function(vcpkg_acquire_msys PATH_TO_ROOT_OUT) vcpkg_execute_required_process( ALLOW_IN_DOWNLOAD_MODE COMMAND TASKKILL /F /IM gpg-agent.exe /fi "memusage gt 2" - WORKING_DIRECTORY ${SOURCE_PATH} + WORKING_DIRECTORY "${SOURCE_PATH}" ) endif() - set(${PATH_TO_ROOT_OUT} ${PATH_TO_ROOT} PARENT_SCOPE) + set(${PATH_TO_ROOT_OUT} "${PATH_TO_ROOT}" PARENT_SCOPE) endfunction() From 95ebdfd677f1a38c41fdb8b21527e64b53b7c6bc Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 4 Feb 2020 17:14:04 +0100 Subject: [PATCH 367/419] playing around with configure make --- scripts/cmake/vcpkg_configure_make.cmake | 151 ++++++++++++++++------- 1 file changed, 109 insertions(+), 42 deletions(-) diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index 1d6a596dd74a34..697d58ed32c0be 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -79,6 +79,63 @@ ## * [tcl](https://github.com/Microsoft/vcpkg/blob/master/ports/tcl/portfile.cmake) ## * [freexl](https://github.com/Microsoft/vcpkg/blob/master/ports/freexl/portfile.cmake) ## * [libosip2](https://github.com/Microsoft/vcpkg/blob/master/ports/libosip2/portfile.cmake) +macro(_vcpkg_get_mingw_vars) + set(HOST_ARCH $ENV{PROCESSOR_ARCHITECTURE}) + set(MINGW_W w64) + set(MINGW_PACKAGES) + #message(STATUS "${HOST_ARCH}") + if(HOST_ARCH MATCHES "(amd|AMD)64") + set(HOST_ARCH x64) + set(BITS 64) + elseif(HOST_ARCH MATCHES "(x|X)86") + set(HOST_ARCH x86) + set(BITS 32) + elseif(HOST_ARCH MATCHES "^(ARM|arm)64$") + set(HOST_ARCH x86) + set(BITS 32) + elseif(HOST_ARCH MATCHES "^(ARM|arm)$") + set(HOST_ARCH x86) + set(BITS 32) + message(FATAL_ERROR "Unsupported host architecture ${HOST_ARCH} in _vcpkg_get_msys_toolchain!" ) + else() + message(FATAL_ERROR "Unsupported host architecture ${HOST_ARCH} in _vcpkg_get_msys_toolchain!" ) + endif() + set(TARGET_ARCH ${VCPKG_TARGET_ARCHITECTURE}) + + if(NOT "${HOST_ARCH}" STREQUAL "${TARGET_ARCH}") + list(APPEND MINGW_PACKAGES mingw-w64-cross-gcc) + if(${HOST_ARCH} MATCHES "x64" AND ${TARGET_ARCH} MATCHES "x86") + set(MINGW_HOST i686) + set(MINGW_TOOLCHAIN i686) + set(MINGW_NAME mingw64) + elseif(${HOST_ARCH} MATCHES "x86|ARM64" AND ${TARGET_ARCH} MATCHES "x64") + set(MINGW_HOST i686) + set(MINGW_TOOLCHAIN x86_64) + set(MINGW_NAME mingw32) + else() + message(FATAL_ERROR "Unsupported host/target architecture combination ${HOST_ARCH}/${TARGET_ARCH} in _vcpkg_get_msys_toolchain!" ) + endif() + else() + if(${TARGET_ARCH} MATCHES "x64") + set(MINGW_HOST i686) + set(MINGW_TOOLCHAIN x86_64) + set(MINGW_NAME mingw64) + elseif(${TARGET_ARCH} MATCHES "x86|ARM64") + set(MINGW_HOST i686) + set(MINGW_TOOLCHAIN i686) + set(MINGW_NAME mingw32) + endif() + endif() + + set(MINGW_TOOLCHAIN mingw-${MINGW_W}-${MINGW_TOOLCHAIN}) + set(MINGW_PACKAGES_LIST gcc make pkg-config) + + foreach(_pack ${MINGW_PACKAGES_LIST}) + list(APPEND MINGW_PACKAGES ${MINGW_TOOLCHAIN}-${_pack}) + endforeach() + message(STATUS "MINGW_PACKAGES:${MINGW_PACKAGES}") +endmacro() + function(vcpkg_configure_make) cmake_parse_arguments(_csc @@ -132,6 +189,7 @@ function(vcpkg_configure_make) else() message(FATAL_ERROR "${GENERATOR} not supported.") endif() + # Pre-processing windows configure requirements if (CMAKE_HOST_WIN32) ## Please read https://github.com/orlp/dev-on-windows/wiki/Installing-GCC--&-MSYS2 @@ -139,10 +197,12 @@ function(vcpkg_configure_make) vcpkg_find_acquire_program(YASM) vcpkg_find_acquire_program(PERL) set(MSYS_REQUIRE_PACKAGES diffutils) + _vcpkg_get_mingw_vars() if (_csc_AUTOCONFIG) - set(MSYS_REQUIRE_PACKAGES ${MSYS_REQUIRE_PACKAGES} autoconf automake m4 libtool perl pkg-config gcc) - # - #set(MSYS_REQUIRE_PACKAGES ${MSYS_REQUIRE_PACKAGES} base-devel) + list(APPEND MSYS_REQUIRE_PACKAGES autoconf automake m4 libtool perl pkg-config gcc) + if(NOT VCPKG_USE_POSIX_TOOLCHAIN) + list(APPEND MSYS_REQUIRE_PACKAGES ${MINGW_PACKAGES}) + endif() endif() vcpkg_acquire_msys(MSYS_ROOT PACKAGES ${MSYS_REQUIRE_PACKAGES}) get_filename_component(YASM_EXE_PATH ${YASM} DIRECTORY) @@ -150,35 +210,48 @@ function(vcpkg_configure_make) if (NOT _csc_DISABLE_AUTO_HOST) if(VCPKG_TARGET_ARCHITECTURE STREQUAL x86) - set(WIN_TARGET_ARCH --host=i686-pc-mingw32) + set(BUILD_TARGET i686-w64-mingw32) + #set(HOST_TYPE --host=i686-w64-mingw32) elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL x64) - set(WIN_TARGET_ARCH --host=i686-pc-mingw64) + set(BUILD_TARGET x86_64-w64-mingw64) + #set(HOST_TYPE --host=x86_64-w64-mingw64) elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL arm) - set(WIN_TARGET_ARCH --host=arm-pc-mingw32) + set(BUILD_TARGET --target=arm-pc-mingw32) + set(HOST_TYPE --host=i686-w64-mingw32) endif() endif() - set(WIN_TARGET_COMPILER CC=gcc) + + set(COMPILER_CC CC=gcc) vcpkg_add_to_path("${YASM_EXE_PATH}") + if(NOT VCPKG_USE_POSIX_TOOLCHAIN) + if(HOST_ARCH MATCHES "x86|arm") + vcpkg_add_to_path("${MSYS_ROOT}/mingw32/bin") + vcpkg_add_to_path("${MSYS_ROOT}/i686-w64-mingw32/bin") + elseif(HOST_ARCH STREQUAL x64) + vcpkg_add_to_path("${MSYS_ROOT}/mingw64/bin") + vcpkg_add_to_path("${MSYS_ROOT}/x86_64-w64-mingw32/bin") + vcpkg_add_to_path("${MSYS_ROOT}/mingw32/bin") + endif() + endif() vcpkg_add_to_path("${MSYS_ROOT}/usr/bin") vcpkg_add_to_path("${PERL_EXE_PATH}") set(BASH "${MSYS_ROOT}/usr/bin/bash.exe") elseif (_csc_AUTOCONFIG) - find_program(autoreconf autoreconf REQUIRED) - endif() - - if (NOT _csc_NO_DEBUG) - file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") - else() - file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}") + find_program(AUTORECONF autoreconf REQUIRED) endif() + file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}") + if (NOT _csc_DISABLE_AUTO_DST) set(_csc_OPTIONS_RELEASE ${_csc_OPTIONS_RELEASE} --prefix=${CURRENT_PACKAGES_DIR} --bindir=${CURRENT_PACKAGES_DIR}/bin --sbindir=${CURRENT_PACKAGES_DIR}/bin --libdir=${CURRENT_PACKAGES_DIR}/lib - --includedir=${CURRENT_PACKAGES_DIR}/include) + --includedir=${CURRENT_PACKAGES_DIR}/include + --mandir=${CURRENT_PACKAGES_DIR}/share/${PORT} + --docdir=${CURRENT_PACKAGES_DIR}/share/${PORT}) set(_csc_OPTIONS_DEBUG ${_csc_OPTIONS_DEBUG} --prefix=${CURRENT_PACKAGES_DIR}/debug @@ -188,8 +261,6 @@ function(vcpkg_configure_make) --includedir=${CURRENT_PACKAGES_DIR}/debug/include) endif() - set(base_cmd ) - set(C_FLAGS_BACKUP "$ENV{CFLAGS}") set(CXX_FLAGS_BACKUP "$ENV{CXXFLAGS}") set(LD_FLAGS_BACKUP "$ENV{LDFLAGS}") @@ -206,13 +277,11 @@ function(vcpkg_configure_make) if(NOT VCPKG_TARGET_IS_WINDOWS) string(APPEND C_FLAGS_GLOBAL " -fPIC") string(APPEND CXX_FLAGS_GLOBAL " -fPIC") - else() - string(APPEND C_FLAGS_GLOBAL " -I\"${MSYS_ROOT}/usr/include\"") - string(APPEND CXX_FLAGS_GLOBAL " -I\"${MSYS_ROOT}/usr/include\"") endif() set(ENV{LD_LIBRARY_PATH} "${LD_LIBRARY_PATH_BACKUP}${VCPKG_HOST_PATH_SEPARATOR}${CURRENT_INSTALLED_DIR}/lib${VCPKG_HOST_PATH_SEPARATOR}${CURRENT_INSTALLED_DIR}/lib/manual-link") + set(base_cmd) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) set(_csc_OPTIONS ${_csc_OPTIONS} --enable-shared --disable-static) else() @@ -223,12 +292,9 @@ function(vcpkg_configure_make) set(base_cmd ${BASH} --noprofile --norc) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set(_csc_OPTIONS ${_csc_OPTIONS} --enable-shared) if (VCPKG_TARGET_IS_UWP) set(_csc_OPTIONS ${_csc_OPTIONS} --extra-ldflags=-APPCONTAINER --extra-ldflags=WindowsApp.lib) endif() - else() - set(_csc_OPTIONS ${_csc_OPTIONS} --enable-static) endif() # Load toolchains if(NOT VCPKG_CHAINLOAD_TOOLCHAIN_FILE) @@ -246,9 +312,9 @@ function(vcpkg_configure_make) list(JOIN _csc_OPTIONS_DEBUG " " _csc_OPTIONS_DEBUG) set(rel_command - ${base_cmd} -c "${WIN_TARGET_COMPILER} ${_csc_SOURCE_PATH}/configure ${WIN_TARGET_ARCH} ${_csc_OPTIONS} ${_csc_OPTIONS_RELEASE}") + ${base_cmd} -c "${COMPILER_CC} ${_csc_SOURCE_PATH}/configure ${BUILD_TARGET} ${HOST_TYPE} ${_csc_OPTIONS} ${_csc_OPTIONS_RELEASE}") set(dbg_command - ${base_cmd} -c "${WIN_TARGET_COMPILER} ${_csc_SOURCE_PATH}/configure ${WIN_TARGET_ARCH} ${_csc_OPTIONS} ${_csc_OPTIONS_DEBUG}") + ${base_cmd} -c "${COMPILER_CC} ${_csc_SOURCE_PATH}/configure ${BUILD_TARGET} ${HOST_TYPE} ${_csc_OPTIONS} ${_csc_OPTIONS_DEBUG}") else() set(base_cmd ./) set(rel_command @@ -261,7 +327,6 @@ function(vcpkg_configure_make) # Configure debug if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug" AND NOT _csc_NO_DEBUG) - if(_csc_PKG_CONFIG_PATHS_DEBUG) set(BACKUP_ENV_PKG_CONFIG_PATH_DEBUG $ENV{PKG_CONFIG_PATH}) foreach(_path IN LISTS _csc_PKG_CONFIG_PATHS_DEBUG) @@ -269,18 +334,18 @@ function(vcpkg_configure_make) set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}${VCPKG_HOST_PATH_SEPARATOR}${_path}") endforeach() endif() - + if (CMAKE_HOST_WIN32) set(TMP_CFLAGS "${C_FLAGS_GLOBAL} ${VCPKG_C_FLAGS_DEBUG}") - string(REPLACE "/" "-" TMP_CFLAGS "${TMP_CFLAGS}") + string(REGEX REPLACE "[ \t]+/" " -" TMP_CFLAGS "${TMP_CFLAGS}") set(ENV{CFLAGS} ${TMP_CFLAGS}) set(TMP_CXXFLAGS "${CXX_FLAGS_GLOBAL} ${VCPKG_CXX_FLAGS_DEBUG}") - string(REPLACE "/" "-" TMP_CXXFLAGS "${TMP_CXXFLAGS}") + string(REGEX REPLACE "[ \t]+/" " -" TMP_CXXFLAGS "${TMP_CXXFLAGS}") set(ENV{CXXFLAGS} ${TMP_CXXFLAGS}) set(TMP_LDFLAGS "${LD_FLAGS_GLOBAL} ${VCPKG_LINKER_FLAGS_DEBUG}") - string(REPLACE "/" "-" TMP_LDFLAGS "${TMP_LDFLAGS}") + string(REGEX REPLACE "[ \t]+/" " -" TMP_LDFLAGS "${TMP_LDFLAGS}") set(ENV{LDFLAGS} ${TMP_LDFLAGS}) else() set(ENV{CFLAGS} "${C_FLAGS_GLOBAL} ${VCPKG_C_FLAGS_DEBUG}") @@ -288,12 +353,12 @@ function(vcpkg_configure_make) set(ENV{LDFLAGS} "${LD_FLAGS_GLOBAL} -L${CURRENT_INSTALLED_DIR}/debug/lib -L${CURRENT_INSTALLED_DIR}/debug/lib/manual-link ${VCPKG_LINKER_FLAGS_DEBUG}") endif() set(ENV{LD_LIBRARY_PATH} "${LD_LIBRARY_PATH_BACKUP}${VCPKG_HOST_PATH_SEPARATOR}${CURRENT_INSTALLED_DIR}/debug/lib${VCPKG_HOST_PATH_SEPARATOR}${CURRENT_INSTALLED_DIR}/debug/lib/manual-link") + + set(OBJ_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + set(PRJ_DIR "${OBJ_DIR}/${_csc_PROJECT_SUBPATH}") - set(OBJ_DIR ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) - set(PRJ_DIR ${OBJ_DIR}/${_csc_PROJECT_SUBPATH}) - - file(MAKE_DIRECTORY ${OBJ_DIR}) - + file(MAKE_DIRECTORY "${OBJ_DIR}") + if (NOT CMAKE_HOST_WIN32) file(GLOB_RECURSE SOURCE_FILES ${_csc_SOURCE_PATH}/*) foreach(ONE_SOUCRCE_FILE ${SOURCE_FILES}) @@ -305,9 +370,9 @@ function(vcpkg_configure_make) if (_csc_PRERUN_SHELL) message(STATUS "Prerun shell with ${TARGET_TRIPLET}-dbg") - vcpkg_execute_required_process2( - COMMAND ${base_cmd} -c "\"${_csc_PRERUN_SHELL}\"" - WORKING_DIRECTORY ${PRJ_DIR} + vcpkg_execute_required_process( + COMMAND ${base_cmd} -c "${_csc_PRERUN_SHELL}" + WORKING_DIRECTORY "${PRJ_DIR}" LOGNAME prerun-${TARGET_TRIPLET}-dbg ) endif() @@ -327,6 +392,7 @@ function(vcpkg_configure_make) LOGNAME autoconf-${TARGET_TRIPLET}-dbg ) endif() + endif() if (NOT _csc_SKIP_CONFIGURE) @@ -354,15 +420,15 @@ function(vcpkg_configure_make) if (CMAKE_HOST_WIN32) set(TMP_CFLAGS "${C_FLAGS_GLOBAL} ${VCPKG_C_FLAGS_RELEASE}") - string(REPLACE "/" "-" TMP_CFLAGS "${TMP_CFLAGS}") + string(REGEX REPLACE "[ \t]+/" " -" TMP_CFLAGS "${TMP_CFLAGS}") set(ENV{CFLAGS} ${TMP_CFLAGS}) set(TMP_CXXFLAGS "${CXX_FLAGS_GLOBAL} ${VCPKG_CXX_FLAGS_RELEASE}") - string(REPLACE "/" "-" TMP_CXXFLAGS "${TMP_CXXFLAGS}") + string(REGEX REPLACE "[ \t]+/" " -" TMP_CXXFLAGS "${TMP_CXXFLAGS}") set(ENV{CXXFLAGS} ${TMP_CXXFLAGS}) set(TMP_LDFLAGS "${LD_FLAGS_GLOBAL} ${VCPKG_LINKER_FLAGS_RELEASE}") - string(REPLACE "/" "-" TMP_LDFLAGS "${TMP_LDFLAGS}") + string(REGEX REPLACE "[ \t]+/" " -" TMP_LDFLAGS "${TMP_LDFLAGS}") set(ENV{LDFLAGS} ${TMP_LDFLAGS}) else() set(ENV{CFLAGS} "${C_FLAGS_GLOBAL} ${VCPKG_C_FLAGS_RELEASE}") @@ -382,6 +448,7 @@ function(vcpkg_configure_make) file(MAKE_DIRECTORY ${OBJ_DIR}) if (NOT CMAKE_HOST_WIN32) + ##COPY SOURCES file(GLOB_RECURSE SOURCE_FILES ${_csc_SOURCE_PATH}/*) foreach(ONE_SOUCRCE_FILE ${SOURCE_FILES}) get_filename_component(DST_DIR ${ONE_SOUCRCE_FILE} PATH) @@ -403,7 +470,7 @@ function(vcpkg_configure_make) message(STATUS "Generating configure with ${TAR_TRIPLET_DIR}") if (CMAKE_HOST_WIN32) vcpkg_execute_required_process( - COMMAND ${base_cmd} autoreconf -vfi + COMMAND ${base_cmd} -c "autoreconf -vfi" WORKING_DIRECTORY ${_csc_SOURCE_PATH}/${_csc_PROJECT_SUBPATH} LOGNAME autoconf-${TAR_TRIPLET_DIR} ) From 82d3b1cb460a3ed5c27a7fb711e489f527afd68f Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 4 Feb 2020 17:15:49 +0100 Subject: [PATCH 368/419] fix env --- scripts/cmake/vcpkg_configure_make.cmake | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index 697d58ed32c0be..17829ec71021f2 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -226,11 +226,10 @@ function(vcpkg_configure_make) if(NOT VCPKG_USE_POSIX_TOOLCHAIN) if(HOST_ARCH MATCHES "x86|arm") vcpkg_add_to_path("${MSYS_ROOT}/mingw32/bin") - vcpkg_add_to_path("${MSYS_ROOT}/i686-w64-mingw32/bin") + vcpkg_add_to_path("${MSYS_ROOT}/mingw32/i686-w64-mingw32/bin") elseif(HOST_ARCH STREQUAL x64) vcpkg_add_to_path("${MSYS_ROOT}/mingw64/bin") - vcpkg_add_to_path("${MSYS_ROOT}/x86_64-w64-mingw32/bin") - vcpkg_add_to_path("${MSYS_ROOT}/mingw32/bin") + vcpkg_add_to_path("${MSYS_ROOT}/mingw64/x86_64-w64-mingw32/bin") endif() endif() vcpkg_add_to_path("${MSYS_ROOT}/usr/bin") From 2aded657d1cae0deebb7b7be6477269853a1bb4f Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 4 Feb 2020 17:31:09 +0100 Subject: [PATCH 369/419] working comit i/N --- scripts/cmake/vcpkg_build_make.cmake | 90 +++++++++++------------- scripts/cmake/vcpkg_configure_make.cmake | 22 +++--- 2 files changed, 54 insertions(+), 58 deletions(-) diff --git a/scripts/cmake/vcpkg_build_make.cmake b/scripts/cmake/vcpkg_build_make.cmake index be6979683b03ec..03e0e8fdc38cf2 100644 --- a/scripts/cmake/vcpkg_build_make.cmake +++ b/scripts/cmake/vcpkg_build_make.cmake @@ -41,6 +41,7 @@ function(vcpkg_build_make) set(INSTALL_OPTS ) if (_VCPKG_MAKE_GENERATOR STREQUAL "make") if (CMAKE_HOST_WIN32) + _vcpkg_get_mingw_vars() # Compiler requriements vcpkg_find_acquire_program(YASM) vcpkg_find_acquire_program(PERL) @@ -50,32 +51,45 @@ function(vcpkg_build_make) set(PATH_GLOBAL "$ENV{PATH}") vcpkg_add_to_path("${YASM_EXE_PATH}") + if(NOT VCPKG_USE_POSIX_TOOLCHAIN) + if(HOST_ARCH MATCHES "x86|arm") + vcpkg_add_to_path("${MSYS_ROOT}/mingw32/bin") + vcpkg_add_to_path("${MSYS_ROOT}/mingw32/i686-w64-mingw32/bin") + elseif(HOST_ARCH STREQUAL x64) + vcpkg_add_to_path("${MSYS_ROOT}/mingw64/bin") + vcpkg_add_to_path("${MSYS_ROOT}/mingw64/x86_64-w64-mingw32/bin") + endif() + endif() vcpkg_add_to_path("${MSYS_ROOT}/usr/bin") vcpkg_add_to_path("${PERL_EXE_PATH}") - set(BASH ${MSYS_ROOT}/usr/bin/bash.exe) + find_program(MAKE make REQUIRED) + set(BASH "${MSYS_ROOT}/usr/bin/bash.exe") # Set make command and install command - set(MAKE ${BASH} --noprofile --norc -c "${_VCPKG_PROJECT_SUBPATH}make") + set(MAKE_BASH "${BASH}" --noprofile --norc -c) + set(MAKE_COMMAND "make") # Must use absolute path to call make in windows - set(MAKE_OPTS -j ${VCPKG_CONCURRENCY}) - set(INSTALL_OPTS install -j ${VCPKG_CONCURRENCY}) + set(MAKE_OPTS "-j ${VCPKG_CONCURRENCY} -f makefile all") + set(INSTALL_OPTS "install -j ${VCPKG_CONCURRENCY}") else() # Compiler requriements + set(MAKE_BASH) find_program(MAKE make REQUIRED) - set(MAKE make;) + set(MAKE_COMMAND ${MAKE}) # Set make command and install command - set(MAKE_OPTS -j;${VCPKG_CONCURRENCY}) - set(INSTALL_OPTS install;-j;${VCPKG_CONCURRENCY}) + set(MAKE_OPTS "-j ${VCPKG_CONCURRENCY} -f makefile all") + set(INSTALL_OPTS "install") endif() elseif (_VCPKG_MAKE_GENERATOR STREQUAL "nmake") + set(MAKE_BASH) find_program(NMAKE nmake REQUIRED) get_filename_component(NMAKE_EXE_PATH ${NMAKE} DIRECTORY) set(PATH_GLOBAL "$ENV{PATH}") set(ENV{PATH} "$ENV{PATH};${NMAKE_EXE_PATH}") set(ENV{CL} "$ENV{CL} /MP") # Set make command and install command - set(MAKE ${NMAKE} /NOLOGO /G /U) - set(MAKE_OPTS -f makefile all) - set(INSTALL_OPTS install) + set(MAKE_COMMAND "${NMAKE} /NOLOGO /G /U") + set(MAKE_OPTS "-f makefile all") + set(INSTALL_OPTS "install") else() message(FATAL_ERROR "${_VCPKG_MAKE_GENERATOR} not supported.") endif() @@ -91,15 +105,9 @@ function(vcpkg_build_make) string(APPEND C_FLAGS_GLOBAL " -fPIC") string(APPEND CXX_FLAGS_GLOBAL " -fPIC") endif() - + set(ENV{INCLUDE} "${CURRENT_INSTALLED_DIR}/include;$ENV{INCLUDE}") - if(VCPKG_TARGET_IS_WINDOWS) - string(APPEND C_FLAGS_GLOBAL " -I\"${MSYS_ROOT}/usr/include\"") - string(APPEND CXX_FLAGS_GLOBAL " -I\"${MSYS_ROOT}/usr/include\"") - set(ENV{INCLUDE} "${CURRENT_INSTALLED_DIR}/include;${MSYS_ROOT}/usr/include;$ENV{INCLUDE}") - endif() - - + foreach(BUILDTYPE "debug" "release") if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL BUILDTYPE) if(BUILDTYPE STREQUAL "debug") @@ -139,15 +147,15 @@ function(vcpkg_build_make) if (CMAKE_HOST_WIN32) set(TMP_CFLAGS "${C_FLAGS_GLOBAL} ${VCPKG_C_FLAGS_${CMAKE_BUILDTYPE}}") - string(REPLACE "/" "-" TMP_CFLAGS "${TMP_CFLAGS}") + string(REGEX REPLACE "[ \t]+/" " -" TMP_CFLAGS "${TMP_CFLAGS}") set(ENV{CFLAGS} ${TMP_CFLAGS}) set(TMP_CXXFLAGS "${CXX_FLAGS_GLOBAL} ${VCPKG_CXX_FLAGS_${CMAKE_BUILDTYPE}}") - string(REPLACE "/" "-" TMP_CXXFLAGS "${TMP_CXXFLAGS}") + string(REGEX REPLACE "[ \t]+/" " -" TMP_CXXFLAGS "${TMP_CXXFLAGS}") set(ENV{CXXFLAGS} ${TMP_CXXFLAGS}) set(TMP_LDFLAGS "${LD_FLAGS_GLOBAL} ${VCPKG_LINKER_FLAGS_${CMAKE_BUILDTYPE}}") - string(REPLACE "/" "-" TMP_LDFLAGS "${TMP_LDFLAGS}") + string(REGEX REPLACE "[ \t]+/" " -" TMP_LDFLAGS "${TMP_LDFLAGS}") set(ENV{LDFLAGS} ${TMP_LDFLAGS}) else() set(ENV{CFLAGS} "${C_FLAGS_GLOBAL} ${VCPKG_C_FLAGS_${CMAKE_BUILDTYPE}}") @@ -155,27 +163,19 @@ function(vcpkg_build_make) set(ENV{LDFLAGS} "${LD_FLAGS_GLOBAL} ${VCPKG_LINKER_FLAGS_${CMAKE_BUILDTYPE}}") endif() - if (CMAKE_HOST_WIN32) - vcpkg_execute_build_process( - COMMAND "${MAKE} ${MAKE_OPTS}" + vcpkg_execute_build_process( + COMMAND ${MAKE_BASH} "${MAKE_COMMAND} ${MAKE_OPTS}" WORKING_DIRECTORY "${WORKING_DIRECTORY}" LOGNAME "${_bc_LOGFILE_ROOT}-${TARGET_TRIPLET}${SHORT_BUILDTYPE}" ) - else() - vcpkg_execute_build_process( - COMMAND "${MAKE};${MAKE_OPTS}" - WORKING_DIRECTORY "${WORKING_DIRECTORY}" - LOGNAME "${_bc_LOGFILE_ROOT}-${TARGET_TRIPLET}${SHORT_BUILDTYPE}" - ) - endif() - + if(_bc_ADD_BIN_TO_PATH) set(ENV{PATH} "${_BACKUP_ENV_PATH}") endif() endif() endforeach() - if (_bc_ENABLE_INSTALL) + if (_bc_ENABLE_INSTALL OR TRUE) foreach(BUILDTYPE "debug" "release") if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL BUILDTYPE) if(BUILDTYPE STREQUAL "debug") @@ -194,22 +194,14 @@ function(vcpkg_build_make) endif() message(STATUS "Installing ${TARGET_TRIPLET}${SHORT_BUILDTYPE}") - if (CMAKE_HOST_WIN32) - # In windows we can remotely call make - set(WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}${SHORT_BUILDTYPE}") - vcpkg_execute_build_process( - COMMAND "${MAKE} ${INSTALL_OPTS}" - WORKING_DIRECTORY "${WORKING_DIRECTORY}" - LOGNAME "install-${TARGET_TRIPLET}${SHORT_BUILDTYPE}" - ) - else() - set(WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}${SHORT_BUILDTYPE}${_VCPKG_PROJECT_SUBPATH}") - vcpkg_execute_build_process( - COMMAND "${MAKE};${INSTALL_OPTS}" - WORKING_DIRECTORY "${WORKING_DIRECTORY}" - LOGNAME "install-${TARGET_TRIPLET}${SHORT_BUILDTYPE}" - ) - endif() + + set(WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}${SHORT_BUILDTYPE}") + vcpkg_execute_build_process( + COMMAND ${MAKE_BASH} "${MAKE_COMMAND} ${INSTALL_OPTS}" + WORKING_DIRECTORY "${WORKING_DIRECTORY}" + LOGNAME "install-${TARGET_TRIPLET}${SHORT_BUILDTYPE}" + ) + endif() endforeach() endif() diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index 17829ec71021f2..683641cc570940 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -85,12 +85,15 @@ macro(_vcpkg_get_mingw_vars) set(MINGW_PACKAGES) #message(STATUS "${HOST_ARCH}") if(HOST_ARCH MATCHES "(amd|AMD)64") + set(MINGW_HOST x86_64-w64-mingw32) set(HOST_ARCH x64) set(BITS 64) elseif(HOST_ARCH MATCHES "(x|X)86") + set(MINGW_HOST i686-w64-mingw32) set(HOST_ARCH x86) set(BITS 32) elseif(HOST_ARCH MATCHES "^(ARM|arm)64$") + set(MINGW_HOST i686-w64-mingw32) set(HOST_ARCH x86) set(BITS 32) elseif(HOST_ARCH MATCHES "^(ARM|arm)$") @@ -105,25 +108,25 @@ macro(_vcpkg_get_mingw_vars) if(NOT "${HOST_ARCH}" STREQUAL "${TARGET_ARCH}") list(APPEND MINGW_PACKAGES mingw-w64-cross-gcc) if(${HOST_ARCH} MATCHES "x64" AND ${TARGET_ARCH} MATCHES "x86") - set(MINGW_HOST i686) set(MINGW_TOOLCHAIN i686) + set(MINGW_TARGET i686-w64-mingw32) set(MINGW_NAME mingw64) - elseif(${HOST_ARCH} MATCHES "x86|ARM64" AND ${TARGET_ARCH} MATCHES "x64") - set(MINGW_HOST i686) + elseif(${HOST_ARCH} MATCHES "x86|ARM64" AND ${TARGET_ARCH} MATCHES "x64") set(MINGW_TOOLCHAIN x86_64) + set(MINGW_TARGET x86_64-w64-mingw32) set(MINGW_NAME mingw32) else() message(FATAL_ERROR "Unsupported host/target architecture combination ${HOST_ARCH}/${TARGET_ARCH} in _vcpkg_get_msys_toolchain!" ) endif() else() if(${TARGET_ARCH} MATCHES "x64") - set(MINGW_HOST i686) set(MINGW_TOOLCHAIN x86_64) set(MINGW_NAME mingw64) + set(MINGW_TARGET x86_64-w64-mingw32) elseif(${TARGET_ARCH} MATCHES "x86|ARM64") - set(MINGW_HOST i686) set(MINGW_TOOLCHAIN i686) set(MINGW_NAME mingw32) + set(MINGW_TARGET i686-w64-mingw32) endif() endif() @@ -210,15 +213,16 @@ function(vcpkg_configure_make) if (NOT _csc_DISABLE_AUTO_HOST) if(VCPKG_TARGET_ARCHITECTURE STREQUAL x86) - set(BUILD_TARGET i686-w64-mingw32) - #set(HOST_TYPE --host=i686-w64-mingw32) + set(BUILD_TARGET "--build=${MINGW_TARGET} --target==${MINGW_TARGET} --enable-lib32 --disable-lib64") + set(HOST_TYPE --host=i686-w64-mingw32) elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL x64) - set(BUILD_TARGET x86_64-w64-mingw64) - #set(HOST_TYPE --host=x86_64-w64-mingw64) + set(BUILD_TARGET "--build=${MINGW_TARGET} --target==${MINGW_TARGET} --enable-lib64 --disable-lib32") + set(HOST_TYPE --host=x86_64-w64-mingw64) elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL arm) set(BUILD_TARGET --target=arm-pc-mingw32) set(HOST_TYPE --host=i686-w64-mingw32) endif() + #x86_64-pc-mingw32 #x86_64-w64-mingw32 #--enable-secure-api #--enable-64bit # endif() set(COMPILER_CC CC=gcc) From 441d668e5c43bff22c5c81a5318765f4b10c8854 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 4 Feb 2020 20:32:20 +0100 Subject: [PATCH 370/419] fix missing " around path --- toolsrc/src/vcpkg/cmakevars.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolsrc/src/vcpkg/cmakevars.cpp b/toolsrc/src/vcpkg/cmakevars.cpp index 6a9d26ec8aa766..636934046a1894 100644 --- a/toolsrc/src/vcpkg/cmakevars.cpp +++ b/toolsrc/src/vcpkg/cmakevars.cpp @@ -18,7 +18,7 @@ namespace vcpkg::CMakeVars Files::Filesystem& fs = paths.get_filesystem(); static int tag_extract_id = 0; - std::string extraction_file("include(" + get_tags_path.generic_u8string() + ")\n\n"); + std::string extraction_file("include(\"" + get_tags_path.generic_u8string() + "\")\n\n"); std::map emitted_triplets; int emitted_triplet_id = 0; From 3f0677399b0dbb9e82c975c70205b450540d6fe3 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 4 Feb 2020 22:26:17 +0100 Subject: [PATCH 371/419] Update VERSION.txt --- toolsrc/VERSION.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolsrc/VERSION.txt b/toolsrc/VERSION.txt index f9cb2e7e9e57c7..966303f8ace7ab 100644 --- a/toolsrc/VERSION.txt +++ b/toolsrc/VERSION.txt @@ -1 +1 @@ -"2020.01.18" +"2020.02.04" From ccd59cf570690151aa6bdc95b2f38128d13e8277 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 4 Feb 2020 14:28:12 -0800 Subject: [PATCH 372/419] [vcpkg] Add quotes to include() in generated dep info file --- toolsrc/src/vcpkg/cmakevars.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolsrc/src/vcpkg/cmakevars.cpp b/toolsrc/src/vcpkg/cmakevars.cpp index 636934046a1894..6059833e77e936 100644 --- a/toolsrc/src/vcpkg/cmakevars.cpp +++ b/toolsrc/src/vcpkg/cmakevars.cpp @@ -67,7 +67,7 @@ namespace vcpkg::CMakeVars static int dep_info_id = 0; Files::Filesystem& fs = paths.get_filesystem(); - std::string extraction_file("include(" + get_dep_info_path.generic_u8string() + ")\n\n"); + std::string extraction_file("include(\"" + get_dep_info_path.generic_u8string() + "\")\n\n"); std::map emitted_triplets; int emitted_triplet_id = 0; From ce9795f4aa29e868a2049152bc9487513c48e123 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 5 Feb 2020 01:03:46 +0100 Subject: [PATCH 373/419] deal with spaces in paths correctly --- ports/applewm/portfile.cmake | 2 +- ports/bzip2/portfile.cmake | 16 ++++++++-------- ports/dmx/portfile.cmake | 2 +- ports/font-util/portfile.cmake | 2 +- ports/fontenc/portfile.cmake | 2 +- ports/fs/portfile.cmake | 2 +- ports/ice/portfile.cmake | 2 +- ports/pciaccess/portfile.cmake | 2 +- ports/pthread-stubs/portfile.cmake | 2 +- ports/sm/portfile.cmake | 2 +- ports/xau/portfile.cmake | 2 +- ports/xaw/portfile.cmake | 2 +- ports/xaw3d/portfile.cmake | 2 +- ports/xcb-cursor/portfile.cmake | 2 +- ports/xcb-errors/portfile.cmake | 2 +- ports/xcb-image/portfile.cmake | 2 +- ports/xcb-keysyms/portfile.cmake | 2 +- ports/xcb-proto/portfile.cmake | 2 +- ports/xcb-render-util/portfile.cmake | 2 +- ports/xcb-util/portfile.cmake | 2 +- ports/xcb-wm/portfile.cmake | 2 +- ports/xcb/portfile.cmake | 2 +- ports/xcomposite/portfile.cmake | 2 +- ports/xcursor/portfile.cmake | 2 +- ports/xcwm/portfile.cmake | 2 +- ports/xdamage/portfile.cmake | 2 +- ports/xdmcp/portfile.cmake | 2 +- ports/xext/portfile.cmake | 2 +- ports/xfixes/portfile.cmake | 2 +- ports/xfont/portfile.cmake | 2 +- ports/xft/portfile.cmake | 2 +- ports/xi/portfile.cmake | 2 +- ports/xinerama/portfile.cmake | 2 +- ports/xkbfile/portfile.cmake | 2 +- ports/xlib/portfile.cmake | 2 +- ports/xmu/portfile.cmake | 2 +- ports/xp/portfile.cmake | 2 +- ports/xpm/portfile.cmake | 2 +- ports/xpresent/portfile.cmake | 2 +- ports/xproto/portfile.cmake | 2 +- ports/xrandr/portfile.cmake | 2 +- ports/xrandrutils/portfile.cmake | 2 +- ports/xrender/portfile.cmake | 2 +- ports/xres/portfile.cmake | 2 +- ports/xscrnsaver/portfile.cmake | 2 +- ports/xserver/portfile.cmake | 2 +- ports/xshmfence/portfile.cmake | 2 +- ports/xt/portfile.cmake | 2 +- ports/xtrans/portfile.cmake | 2 +- ports/xv/portfile.cmake | 2 +- ports/xvmc/portfile.cmake | 2 +- ports/xxf86dga/portfile.cmake | 2 +- ports/xxf86vm/portfile.cmake | 2 +- 53 files changed, 60 insertions(+), 60 deletions(-) diff --git a/ports/applewm/portfile.cmake b/ports/applewm/portfile.cmake index 1cc1701425c065..3c213033fc0926 100644 --- a/ports/applewm/portfile.cmake +++ b/ports/applewm/portfile.cmake @@ -10,7 +10,7 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) -set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/bzip2/portfile.cmake b/ports/bzip2/portfile.cmake index f439737496bf9d..feb1e19faf7b07 100644 --- a/ports/bzip2/portfile.cmake +++ b/ports/bzip2/portfile.cmake @@ -13,7 +13,7 @@ vcpkg_extract_source_archive_ex( fix-import-export-macros.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} @@ -26,27 +26,27 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_copy_pdbs() -file(READ ${CURRENT_PACKAGES_DIR}/include/bzlib.h BZLIB_H) +file(READ "${CURRENT_PACKAGES_DIR}/include/bzlib.h" BZLIB_H) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") string(REPLACE "defined(BZ_IMPORT)" "0" BZLIB_H "${BZLIB_H}") else() string(REPLACE "defined(BZ_IMPORT)" "1" BZLIB_H "${BZLIB_H}") endif() -file(WRITE ${CURRENT_PACKAGES_DIR}/include/bzlib.h "${BZLIB_H}") +file(WRITE "${CURRENT_PACKAGES_DIR}/include/bzlib.h" "${BZLIB_H}") -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/bzip2) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/bzip2/LICENSE ${CURRENT_PACKAGES_DIR}/share/bzip2/copyright) +file(COPY "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/bzip2") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/bzip2/LICENSE" "${CURRENT_PACKAGES_DIR}/share/bzip2/copyright") -file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") vcpkg_test_cmake(PACKAGE_NAME BZip2 MODULE) set(BZIP2_PREFIX "${CURRENT_INSTALLED_DIR}") set(bzname bz2) -configure_file("${CMAKE_CURRENT_LIST_DIR}/bzip2.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/bzip2.pc" DESTINATION @ONLY) +configure_file("${CMAKE_CURRENT_LIST_DIR}/bzip2.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/bzip2.pc" @ONLY) set(BZIP2_PREFIX "${CURRENT_INSTALLED_DIR}/debug") if(VCPKG_TARGET_IS_WINDOWS) set(bzname bz2d) endif() -configure_file("${CMAKE_CURRENT_LIST_DIR}/bzip2.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/bzip2.pc" DESTINATION @ONLY) +configure_file("${CMAKE_CURRENT_LIST_DIR}/bzip2.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/bzip2.pc" @ONLY) vcpkg_fixup_pkgconfig() \ No newline at end of file diff --git a/ports/dmx/portfile.cmake b/ports/dmx/portfile.cmake index ec9b65d309e027..a538f4f4375c62 100644 --- a/ports/dmx/portfile.cmake +++ b/ports/dmx/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) #file(TOUCH ${SOURCE_PATH}/m4/dummy) -set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/font-util/portfile.cmake b/ports/font-util/portfile.cmake index 9bc592b40246d8..30c0d890ea2bab 100644 --- a/ports/font-util/portfile.cmake +++ b/ports/font-util/portfile.cmake @@ -10,7 +10,7 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) #file(TOUCH ${SOURCE_PATH}/m4/dummy) -set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/fontenc/portfile.cmake b/ports/fontenc/portfile.cmake index 8ea30c91a4af5e..85029d61bad489 100644 --- a/ports/fontenc/portfile.cmake +++ b/ports/fontenc/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) #file(TOUCH ${SOURCE_PATH}/m4/dummy) -set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/fs/portfile.cmake b/ports/fs/portfile.cmake index 855f8c45217ffc..e0834e6d9eaecb 100644 --- a/ports/fs/portfile.cmake +++ b/ports/fs/portfile.cmake @@ -10,7 +10,7 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) -set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/ice/portfile.cmake b/ports/ice/portfile.cmake index 0c6f9c1d124182..a8a8d7e4f6878a 100644 --- a/ports/ice/portfile.cmake +++ b/ports/ice/portfile.cmake @@ -10,7 +10,7 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) -set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/pciaccess/portfile.cmake b/ports/pciaccess/portfile.cmake index 920f531f93268f..e03534964794ca 100644 --- a/ports/pciaccess/portfile.cmake +++ b/ports/pciaccess/portfile.cmake @@ -11,7 +11,7 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) #file(TOUCH ${SOURCE_PATH}/m4/dummy) -set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/pthread-stubs/portfile.cmake b/ports/pthread-stubs/portfile.cmake index f0ecd514a6a015..75028f6d739667 100644 --- a/ports/pthread-stubs/portfile.cmake +++ b/ports/pthread-stubs/portfile.cmake @@ -11,7 +11,7 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) -set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +#set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/sm/portfile.cmake b/ports/sm/portfile.cmake index 9bced21a1cc419..0f8ea81ff4f205 100644 --- a/ports/sm/portfile.cmake +++ b/ports/sm/portfile.cmake @@ -10,7 +10,7 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) -set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/xau/portfile.cmake b/ports/xau/portfile.cmake index d47e2c44f06cac..c1e3eb3662794d 100644 --- a/ports/xau/portfile.cmake +++ b/ports/xau/portfile.cmake @@ -10,7 +10,7 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) -set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") if(WIN32) SET(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled) # dumpbin will fail on GCC diff --git a/ports/xaw/portfile.cmake b/ports/xaw/portfile.cmake index 9e7b8a5dd03c07..b551a8817397b2 100644 --- a/ports/xaw/portfile.cmake +++ b/ports/xaw/portfile.cmake @@ -10,7 +10,7 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) -set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/xaw3d/portfile.cmake b/ports/xaw3d/portfile.cmake index bb973f1309b37b..1fb3d24599a946 100644 --- a/ports/xaw3d/portfile.cmake +++ b/ports/xaw3d/portfile.cmake @@ -10,7 +10,7 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) -set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/xcb-cursor/portfile.cmake b/ports/xcb-cursor/portfile.cmake index b9f400369c34e2..790208de5b50c6 100644 --- a/ports/xcb-cursor/portfile.cmake +++ b/ports/xcb-cursor/portfile.cmake @@ -13,7 +13,7 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) file(TOUCH ${SOURCE_PATH}/m4/dummy) -set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/xcb-errors/portfile.cmake b/ports/xcb-errors/portfile.cmake index e15708b85dcefc..07a985024185c8 100644 --- a/ports/xcb-errors/portfile.cmake +++ b/ports/xcb-errors/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) file(TOUCH ${SOURCE_PATH}/m4/dummy) -set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/xcb-image/portfile.cmake b/ports/xcb-image/portfile.cmake index fcf0a9536a4868..4b0bd8fad0efea 100644 --- a/ports/xcb-image/portfile.cmake +++ b/ports/xcb-image/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) file(TOUCH ${SOURCE_PATH}/m4/dummy) -set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/xcb-keysyms/portfile.cmake b/ports/xcb-keysyms/portfile.cmake index eb26b9e2f2904a..d8ae8d5a074c0a 100644 --- a/ports/xcb-keysyms/portfile.cmake +++ b/ports/xcb-keysyms/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) file(TOUCH ${SOURCE_PATH}/m4/dummy) -set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/xcb-proto/portfile.cmake b/ports/xcb-proto/portfile.cmake index 9c1c81eb6cd76a..cea3a448ec7836 100644 --- a/ports/xcb-proto/portfile.cmake +++ b/ports/xcb-proto/portfile.cmake @@ -29,7 +29,7 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) -set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/xcb-render-util/portfile.cmake b/ports/xcb-render-util/portfile.cmake index 2a83d51b9f1f31..7da02dbed85a1d 100644 --- a/ports/xcb-render-util/portfile.cmake +++ b/ports/xcb-render-util/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) file(TOUCH ${SOURCE_PATH}/m4/dummy) -set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/xcb-util/portfile.cmake b/ports/xcb-util/portfile.cmake index 90f276f7147093..0104f8dd9837b2 100644 --- a/ports/xcb-util/portfile.cmake +++ b/ports/xcb-util/portfile.cmake @@ -10,7 +10,7 @@ vcpkg_from_gitlab( ) file(TOUCH "${SOURCE_PATH}/m4/dummy") -set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/xcb-wm/portfile.cmake b/ports/xcb-wm/portfile.cmake index 004bec2daa8549..b1208aa7effd65 100644 --- a/ports/xcb-wm/portfile.cmake +++ b/ports/xcb-wm/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) file(TOUCH ${SOURCE_PATH}/m4/dummy) -set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/xcb/portfile.cmake b/ports/xcb/portfile.cmake index 4f453089a7dc1e..ff438f3d1a7f3d 100644 --- a/ports/xcb/portfile.cmake +++ b/ports/xcb/portfile.cmake @@ -14,7 +14,7 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) -set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") vcpkg_find_acquire_program(PYTHON3) get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) diff --git a/ports/xcomposite/portfile.cmake b/ports/xcomposite/portfile.cmake index 9fed12171031f9..442fd4397e6c2f 100644 --- a/ports/xcomposite/portfile.cmake +++ b/ports/xcomposite/portfile.cmake @@ -10,7 +10,7 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) -set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/xcursor/portfile.cmake b/ports/xcursor/portfile.cmake index c12e5f70d1b280..45a81680485332 100644 --- a/ports/xcursor/portfile.cmake +++ b/ports/xcursor/portfile.cmake @@ -10,7 +10,7 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) -set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/xcwm/portfile.cmake b/ports/xcwm/portfile.cmake index bf293917c64795..b675722bb1107f 100644 --- a/ports/xcwm/portfile.cmake +++ b/ports/xcwm/portfile.cmake @@ -13,7 +13,7 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) #file(TOUCH ${SOURCE_PATH}/m4/dummy) -set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/xdamage/portfile.cmake b/ports/xdamage/portfile.cmake index 5363908c8cf4a1..ddafa797dc0488 100644 --- a/ports/xdamage/portfile.cmake +++ b/ports/xdamage/portfile.cmake @@ -10,7 +10,7 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) -set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/xdmcp/portfile.cmake b/ports/xdmcp/portfile.cmake index 757f31373f329a..cdd9a44c32261b 100644 --- a/ports/xdmcp/portfile.cmake +++ b/ports/xdmcp/portfile.cmake @@ -10,7 +10,7 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) -set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/xext/portfile.cmake b/ports/xext/portfile.cmake index 06d894615920a2..d64ea7fe3ab96e 100644 --- a/ports/xext/portfile.cmake +++ b/ports/xext/portfile.cmake @@ -11,7 +11,7 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) -set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/xfixes/portfile.cmake b/ports/xfixes/portfile.cmake index 7c7b510dc09fc4..8e70077e127326 100644 --- a/ports/xfixes/portfile.cmake +++ b/ports/xfixes/portfile.cmake @@ -11,7 +11,7 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) -set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/xfont/portfile.cmake b/ports/xfont/portfile.cmake index 6028e93808bbd2..1a113ed666b762 100644 --- a/ports/xfont/portfile.cmake +++ b/ports/xfont/portfile.cmake @@ -10,7 +10,7 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) -set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/xft/portfile.cmake b/ports/xft/portfile.cmake index 1f06d2e1cffa7b..192d0050fcfdb5 100644 --- a/ports/xft/portfile.cmake +++ b/ports/xft/portfile.cmake @@ -10,7 +10,7 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) -set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/xi/portfile.cmake b/ports/xi/portfile.cmake index 55ba5f50813421..2e4a4842ca910e 100644 --- a/ports/xi/portfile.cmake +++ b/ports/xi/portfile.cmake @@ -11,7 +11,7 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) -set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/xinerama/portfile.cmake b/ports/xinerama/portfile.cmake index b79e50222085e3..66560e82f81d22 100644 --- a/ports/xinerama/portfile.cmake +++ b/ports/xinerama/portfile.cmake @@ -11,7 +11,7 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) -set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/xkbfile/portfile.cmake b/ports/xkbfile/portfile.cmake index f5540f90327f64..f97b15c060f945 100644 --- a/ports/xkbfile/portfile.cmake +++ b/ports/xkbfile/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) #file(TOUCH ${SOURCE_PATH}/m4/dummy) -set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/xlib/portfile.cmake b/ports/xlib/portfile.cmake index 308546dffc0193..c7b6482b8b9fe6 100644 --- a/ports/xlib/portfile.cmake +++ b/ports/xlib/portfile.cmake @@ -11,7 +11,7 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) -set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/xmu/portfile.cmake b/ports/xmu/portfile.cmake index 145a6e869ab18a..05a0d239c39d00 100644 --- a/ports/xmu/portfile.cmake +++ b/ports/xmu/portfile.cmake @@ -10,7 +10,7 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) -set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/xp/portfile.cmake b/ports/xp/portfile.cmake index bf4e9ae2d2b30f..bf197f77182e4a 100644 --- a/ports/xp/portfile.cmake +++ b/ports/xp/portfile.cmake @@ -11,7 +11,7 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) -set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/xpm/portfile.cmake b/ports/xpm/portfile.cmake index 25d7ac954ae019..8309d83034cb5d 100644 --- a/ports/xpm/portfile.cmake +++ b/ports/xpm/portfile.cmake @@ -10,7 +10,7 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) -set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" diff --git a/ports/xpresent/portfile.cmake b/ports/xpresent/portfile.cmake index 4036acfdffeb8e..db962dffdea8ea 100644 --- a/ports/xpresent/portfile.cmake +++ b/ports/xpresent/portfile.cmake @@ -11,7 +11,7 @@ vcpkg_from_gitlab( ) file(MAKE_DIRECTORY "${SOURCE_PATH}/m4/") file(TOUCH "${SOURCE_PATH}/m4/dummy") -set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/xproto/portfile.cmake b/ports/xproto/portfile.cmake index f24d8bb381ffa8..72d7fd349f6fa2 100644 --- a/ports/xproto/portfile.cmake +++ b/ports/xproto/portfile.cmake @@ -11,7 +11,7 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) -set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") if(NOT VCPKG_TARGET_IS_WINDOWS) set(OPTIONS --enable-legacy) # has an build error on windows so I assume it is unsupported. diff --git a/ports/xrandr/portfile.cmake b/ports/xrandr/portfile.cmake index 99095e315350a6..ebcbb5e41e08e0 100644 --- a/ports/xrandr/portfile.cmake +++ b/ports/xrandr/portfile.cmake @@ -10,7 +10,7 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) -set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/xrandrutils/portfile.cmake b/ports/xrandrutils/portfile.cmake index 2bc59ee8831973..cd065c36ba37d2 100644 --- a/ports/xrandrutils/portfile.cmake +++ b/ports/xrandrutils/portfile.cmake @@ -10,7 +10,7 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) -set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/xrender/portfile.cmake b/ports/xrender/portfile.cmake index 17c7da174d34a1..b353e6f5ebd071 100644 --- a/ports/xrender/portfile.cmake +++ b/ports/xrender/portfile.cmake @@ -11,7 +11,7 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) -set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/xres/portfile.cmake b/ports/xres/portfile.cmake index d0d01031319a27..6ea3f0aeefd57c 100644 --- a/ports/xres/portfile.cmake +++ b/ports/xres/portfile.cmake @@ -10,7 +10,7 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) -set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/xscrnsaver/portfile.cmake b/ports/xscrnsaver/portfile.cmake index d5d77816f545fd..ed97e86bf3e6b5 100644 --- a/ports/xscrnsaver/portfile.cmake +++ b/ports/xscrnsaver/portfile.cmake @@ -10,7 +10,7 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) -set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/xserver/portfile.cmake b/ports/xserver/portfile.cmake index 2f38beb36dff17..ad461a54952b2a 100644 --- a/ports/xserver/portfile.cmake +++ b/ports/xserver/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) -set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") vcpkg_acquire_msys(MSYS_ROOT PACKAGES pkg-config) vcpkg_add_to_path("${MSYS_ROOT}/usr/bin") diff --git a/ports/xshmfence/portfile.cmake b/ports/xshmfence/portfile.cmake index 4c0e2ad35bf47b..a9fc57ae42e874 100644 --- a/ports/xshmfence/portfile.cmake +++ b/ports/xshmfence/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) #file(TOUCH ${SOURCE_PATH}/m4/dummy) -set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/xt/portfile.cmake b/ports/xt/portfile.cmake index c9f21ec1fce616..b3860afcc0d680 100644 --- a/ports/xt/portfile.cmake +++ b/ports/xt/portfile.cmake @@ -10,7 +10,7 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) -set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/xtrans/portfile.cmake b/ports/xtrans/portfile.cmake index 8f8051d99c2372..1d0d53aca0c326 100644 --- a/ports/xtrans/portfile.cmake +++ b/ports/xtrans/portfile.cmake @@ -11,7 +11,7 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) -set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} AUTOCONFIG diff --git a/ports/xv/portfile.cmake b/ports/xv/portfile.cmake index 34717059d1615c..19d53e917e54de 100644 --- a/ports/xv/portfile.cmake +++ b/ports/xv/portfile.cmake @@ -10,7 +10,7 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) -set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/xvmc/portfile.cmake b/ports/xvmc/portfile.cmake index 80fd0127c48768..a7c7be69a88c42 100644 --- a/ports/xvmc/portfile.cmake +++ b/ports/xvmc/portfile.cmake @@ -10,7 +10,7 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) -set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/xxf86dga/portfile.cmake b/ports/xxf86dga/portfile.cmake index ded682c7291166..326658793ea782 100644 --- a/ports/xxf86dga/portfile.cmake +++ b/ports/xxf86dga/portfile.cmake @@ -10,7 +10,7 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) -set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/xxf86vm/portfile.cmake b/ports/xxf86vm/portfile.cmake index bf171a2afbdf4e..664906e7aa79ae 100644 --- a/ports/xxf86vm/portfile.cmake +++ b/ports/xxf86vm/portfile.cmake @@ -10,7 +10,7 @@ vcpkg_from_gitlab( #PATCHES example.patch #patch name ) -set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} From 6cf1921d8071e0f486a94bd665e87053a3c4ac37 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 5 Feb 2020 01:04:30 +0100 Subject: [PATCH 374/419] playing with whitespaces 1/N --- scripts/cmake/vcpkg_build_make.cmake | 28 ++++++--- scripts/cmake/vcpkg_configure_make.cmake | 76 +++++++++++++++--------- 2 files changed, 68 insertions(+), 36 deletions(-) diff --git a/scripts/cmake/vcpkg_build_make.cmake b/scripts/cmake/vcpkg_build_make.cmake index 03e0e8fdc38cf2..bb2dfb21d1163e 100644 --- a/scripts/cmake/vcpkg_build_make.cmake +++ b/scripts/cmake/vcpkg_build_make.cmake @@ -68,16 +68,16 @@ function(vcpkg_build_make) set(MAKE_BASH "${BASH}" --noprofile --norc -c) set(MAKE_COMMAND "make") # Must use absolute path to call make in windows - set(MAKE_OPTS "-j ${VCPKG_CONCURRENCY} -f makefile all") - set(INSTALL_OPTS "install -j ${VCPKG_CONCURRENCY}") + set(MAKE_OPTS "-j ${VCPKG_CONCURRENCY} -f makefile all --no-silent") + set(INSTALL_OPTS "install -j ${VCPKG_CONCURRENCY} --no-silent") else() # Compiler requriements set(MAKE_BASH) find_program(MAKE make REQUIRED) set(MAKE_COMMAND ${MAKE}) # Set make command and install command - set(MAKE_OPTS "-j ${VCPKG_CONCURRENCY} -f makefile all") - set(INSTALL_OPTS "install") + set(MAKE_OPTS -j ${VCPKG_CONCURRENCY} -f makefile all) + set(INSTALL_OPTS install) endif() elseif (_VCPKG_MAKE_GENERATOR STREQUAL "nmake") set(MAKE_BASH) @@ -88,7 +88,7 @@ function(vcpkg_build_make) set(ENV{CL} "$ENV{CL} /MP") # Set make command and install command set(MAKE_COMMAND "${NMAKE} /NOLOGO /G /U") - set(MAKE_OPTS "-f makefile all") + set(MAKE_OPTS "-f makefile all ") set(INSTALL_OPTS "install") else() message(FATAL_ERROR "${_VCPKG_MAKE_GENERATOR} not supported.") @@ -162,9 +162,15 @@ function(vcpkg_build_make) set(ENV{CXXFLAGS} "${CXX_FLAGS_GLOBAL} ${VCPKG_CXX_FLAGS_${CMAKE_BUILDTYPE}}") set(ENV{LDFLAGS} "${LD_FLAGS_GLOBAL} ${VCPKG_LINKER_FLAGS_${CMAKE_BUILDTYPE}}") endif() + + if(MAKE_BASH) + set(MAKE_CMD_LINE "${MAKE_COMMAND} ${MAKE_OPTS}") + else() + set(MAKE_CMD_LINE ${MAKE_COMMAND} ${MAKE_OPTS}) + endif() vcpkg_execute_build_process( - COMMAND ${MAKE_BASH} "${MAKE_COMMAND} ${MAKE_OPTS}" + COMMAND ${MAKE_BASH} ${MAKE_CMD_LINE} WORKING_DIRECTORY "${WORKING_DIRECTORY}" LOGNAME "${_bc_LOGFILE_ROOT}-${TARGET_TRIPLET}${SHORT_BUILDTYPE}" ) @@ -194,10 +200,16 @@ function(vcpkg_build_make) endif() message(STATUS "Installing ${TARGET_TRIPLET}${SHORT_BUILDTYPE}") - + + if(MAKE_BASH) + set(MAKE_CMD_LINE "${MAKE_COMMAND} ${INSTALL_OPTS}") + else() + set(MAKE_CMD_LINE ${MAKE_COMMAND} ${INSTALL_OPTS}) + endif() + set(WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}${SHORT_BUILDTYPE}") vcpkg_execute_build_process( - COMMAND ${MAKE_BASH} "${MAKE_COMMAND} ${INSTALL_OPTS}" + COMMAND ${MAKE_BASH} ${MAKE_CMD_LINE} WORKING_DIRECTORY "${WORKING_DIRECTORY}" LOGNAME "install-${TARGET_TRIPLET}${SHORT_BUILDTYPE}" ) diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index 683641cc570940..a17b8e599d59fc 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -213,10 +213,10 @@ function(vcpkg_configure_make) if (NOT _csc_DISABLE_AUTO_HOST) if(VCPKG_TARGET_ARCHITECTURE STREQUAL x86) - set(BUILD_TARGET "--build=${MINGW_TARGET} --target==${MINGW_TARGET} --enable-lib32 --disable-lib64") + set(BUILD_TARGET "--build=${MINGW_TARGET} --target==${MINGW_TARGET}") set(HOST_TYPE --host=i686-w64-mingw32) elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL x64) - set(BUILD_TARGET "--build=${MINGW_TARGET} --target==${MINGW_TARGET} --enable-lib64 --disable-lib32") + set(BUILD_TARGET "--build=${MINGW_TARGET} --target==${MINGW_TARGET}") set(HOST_TYPE --host=x86_64-w64-mingw64) elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL arm) set(BUILD_TARGET --target=arm-pc-mingw32) @@ -234,8 +234,9 @@ function(vcpkg_configure_make) elseif(HOST_ARCH STREQUAL x64) vcpkg_add_to_path("${MSYS_ROOT}/mingw64/bin") vcpkg_add_to_path("${MSYS_ROOT}/mingw64/x86_64-w64-mingw32/bin") - endif() + endif() endif() + vcpkg_add_to_path("${MSYS_ROOT}/usr/bin") vcpkg_add_to_path("${PERL_EXE_PATH}") set(BASH "${MSYS_ROOT}/usr/bin/bash.exe") @@ -246,22 +247,31 @@ function(vcpkg_configure_make) file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}") + if(WIN32) + set(_VCPKG_PREFIX ${CURRENT_PACKAGES_DIR}) + set(_VCPKG_INSTALLED ${CURRENT_INSTALLED_DIR}) + set(EXTRA_QUOTES "\\\"") + else() + string(REPLACE " " "\ " _VCPKG_PREFIX "${CURRENT_PACKAGES_DIR}") + string(REPLACE " " "\ " _VCPKG_INSTALLED "${CURRENT_INSTALLED_DIR}") + set(EXTRA_QUOTES) + endif() + if (NOT _csc_DISABLE_AUTO_DST) set(_csc_OPTIONS_RELEASE ${_csc_OPTIONS_RELEASE} - --prefix=${CURRENT_PACKAGES_DIR} - --bindir=${CURRENT_PACKAGES_DIR}/bin - --sbindir=${CURRENT_PACKAGES_DIR}/bin - --libdir=${CURRENT_PACKAGES_DIR}/lib - --includedir=${CURRENT_PACKAGES_DIR}/include - --mandir=${CURRENT_PACKAGES_DIR}/share/${PORT} - --docdir=${CURRENT_PACKAGES_DIR}/share/${PORT}) - - set(_csc_OPTIONS_DEBUG ${_csc_OPTIONS_DEBUG} - --prefix=${CURRENT_PACKAGES_DIR}/debug - --bindir=${CURRENT_PACKAGES_DIR}/debug/bin - --sbindir=${CURRENT_PACKAGES_DIR}/debug/bin - --libdir=${CURRENT_PACKAGES_DIR}/debug/lib - --includedir=${CURRENT_PACKAGES_DIR}/debug/include) + "--prefix=${EXTRA_QUOTES}${_VCPKG_PREFIX}${EXTRA_QUOTES}" + "--bindir=${EXTRA_QUOTES}${_VCPKG_PREFIX}/bin${EXTRA_QUOTES}" + "--sbindir=${EXTRA_QUOTES}${_VCPKG_PREFIX}/bin${EXTRA_QUOTES}" + "--libdir=${EXTRA_QUOTES}${_VCPKG_PREFIX}/lib${EXTRA_QUOTES}" + "--includedir=${EXTRA_QUOTES}${_VCPKG_PREFIX}/include${EXTRA_QUOTES}" + "--mandir=${EXTRA_QUOTES}${_VCPKG_PREFIX}/share/${PORT}${EXTRA_QUOTES}" + "--docdir=${EXTRA_QUOTES}${_VCPKG_PREFIX}/share/${PORT}${EXTRA_QUOTES}") + set(_csc_OPTIONS_DEBUG ${_csc_OPTIONS_RELEASE} + "--prefix=${EXTRA_QUOTES}${_VCPKG_PREFIX}/debug${EXTRA_QUOTES}" + "--bindir=${EXTRA_QUOTES}${_VCPKG_PREFIX}/debug/bin${EXTRA_QUOTES}" + "--sbindir=${EXTRA_QUOTES}${_VCPKG_PREFIX}/debug/bin${EXTRA_QUOTES}" + "--libdir=${EXTRA_QUOTES}${_VCPKG_PREFIX}/debug/lib${EXTRA_QUOTES}" + "--includedir=${EXTRA_QUOTES}${_VCPKG_PREFIX}/debug/include${EXTRA_QUOTES}") endif() set(C_FLAGS_BACKUP "$ENV{CFLAGS}") @@ -273,17 +283,15 @@ function(vcpkg_configure_make) #set(ENV{C_INCLUDE_PATH} "${C_INCLUDE_PATH_BACKUP}${VCPKG_HOST_PATH_SEPARATOR}${CURRENT_INSTALLED_DIR}/include") #set(ENV{CPLUS_INCLUDE_PATH} "${C_INCLUDE_PATH_BACKUP}${VCPKG_HOST_PATH_SEPARATOR}${CURRENT_INSTALLED_DIR}/include") - - set(C_FLAGS_GLOBAL "$ENV{CFLAGS} -I${CURRENT_INSTALLED_DIR}/include ${VCPKG_C_FLAGS}") - set(CXX_FLAGS_GLOBAL "$ENV{CXXFLAGS} -I${CURRENT_INSTALLED_DIR}/include ${VCPKG_CXX_FLAGS}") + set(ENV{VCPKG_INCLUDE} "${_VCPKG_INSTALLED}/include") + set(C_FLAGS_GLOBAL "$ENV{CFLAGS} -I\$VCPKG_INCLUDE ${VCPKG_C_FLAGS}") + set(CXX_FLAGS_GLOBAL "$ENV{CXXFLAGS} -I\$VCPKG_INCLUDE ${VCPKG_CXX_FLAGS}") set(LD_FLAGS_GLOBAL "$ENV{LDFLAGS} ${VCPKG_LINKER_FLAGS}") if(NOT VCPKG_TARGET_IS_WINDOWS) string(APPEND C_FLAGS_GLOBAL " -fPIC") string(APPEND CXX_FLAGS_GLOBAL " -fPIC") endif() - set(ENV{LD_LIBRARY_PATH} "${LD_LIBRARY_PATH_BACKUP}${VCPKG_HOST_PATH_SEPARATOR}${CURRENT_INSTALLED_DIR}/lib${VCPKG_HOST_PATH_SEPARATOR}${CURRENT_INSTALLED_DIR}/lib/manual-link") - set(base_cmd) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) set(_csc_OPTIONS ${_csc_OPTIONS} --enable-shared --disable-static) @@ -314,14 +322,18 @@ function(vcpkg_configure_make) list(JOIN _csc_OPTIONS_RELEASE " " _csc_OPTIONS_RELEASE) list(JOIN _csc_OPTIONS_DEBUG " " _csc_OPTIONS_DEBUG) + file(RELATIVE_PATH RELATIVE_BUILD_PATH "${CURRENT_BUILDTREES_DIR}" "${_csc_SOURCE_PATH}") + set(rel_command - ${base_cmd} -c "${COMPILER_CC} ${_csc_SOURCE_PATH}/configure ${BUILD_TARGET} ${HOST_TYPE} ${_csc_OPTIONS} ${_csc_OPTIONS_RELEASE}") + ${base_cmd} -c "${COMPILER_CC} eval ../${RELATIVE_BUILD_PATH}/configure \"${BUILD_TARGET} ${HOST_TYPE} ${_csc_OPTIONS} ${_csc_OPTIONS_RELEASE}\"") set(dbg_command - ${base_cmd} -c "${COMPILER_CC} ${_csc_SOURCE_PATH}/configure ${BUILD_TARGET} ${HOST_TYPE} ${_csc_OPTIONS} ${_csc_OPTIONS_DEBUG}") + ${base_cmd} -c "${COMPILER_CC} eval ../${RELATIVE_BUILD_PATH}/configure \"${BUILD_TARGET} ${HOST_TYPE} ${_csc_OPTIONS} ${_csc_OPTIONS_DEBUG}\"") + else() set(base_cmd ./) + set(LD_FLAGS "${LD_FLAGS_GLOBAL} \"-L\${_VCPKG_INSTALLED}/lib\\" \"-L${_VCPKG_INSTALLED}/lib/manual-link\" ${VCPKG_LINKER_FLAGS_RELEASE}") set(rel_command - "${base_cmd}configure;${_csc_OPTIONS};${_csc_OPTIONS_RELEASE}" + "LDFLAGS=${LD_FLAGS} ${base_cmd}configure;${_csc_OPTIONS};${_csc_OPTIONS_RELEASE}" ) set(dbg_command "${base_cmd}configure;${_csc_OPTIONS};${_csc_OPTIONS_DEBUG}") @@ -353,9 +365,16 @@ function(vcpkg_configure_make) else() set(ENV{CFLAGS} "${C_FLAGS_GLOBAL} ${VCPKG_C_FLAGS_DEBUG}") set(ENV{CXXFLAGS} "${CXX_FLAGS_GLOBAL} ${VCPKG_CXX_FLAGS_DEBUG}") - set(ENV{LDFLAGS} "${LD_FLAGS_GLOBAL} -L${CURRENT_INSTALLED_DIR}/debug/lib -L${CURRENT_INSTALLED_DIR}/debug/lib/manual-link ${VCPKG_LINKER_FLAGS_DEBUG}") + if(NOT WIN32) + set(ENV{VCPKG_MANUAL_LINK} "${_VCPKG_INSTALLED}/debug/lib/manual-link") + set(ENV{VCPKG_LIBS} "${_VCPKG_INSTALLED}/debug/lib/manual-link") + else() + set(_VCPKG_INSTALLED_2 ${_VCPKG_INSTALLED}) + set(EXTRA_QUOTES_2 \") + endif() + set(ENV{LDFLAGS} "${LD_FLAGS_GLOBAL} -L\$VCPKG_LIBS -L\$VCPKG_MANUAL_LINK ${VCPKG_LINKER_FLAGS_DEBUG}") + message(STATUS "LDFLAGS:$ENV{LDFLAGS}") endif() - set(ENV{LD_LIBRARY_PATH} "${LD_LIBRARY_PATH_BACKUP}${VCPKG_HOST_PATH_SEPARATOR}${CURRENT_INSTALLED_DIR}/debug/lib${VCPKG_HOST_PATH_SEPARATOR}${CURRENT_INSTALLED_DIR}/debug/lib/manual-link") set(OBJ_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") set(PRJ_DIR "${OBJ_DIR}/${_csc_PROJECT_SUBPATH}") @@ -417,6 +436,7 @@ function(vcpkg_configure_make) set(BACKUP_ENV_PKG_CONFIG_PATH_RELEASE $ENV{PKG_CONFIG_PATH}) foreach(_path IN LISTS _csc_PKG_CONFIG_PATHS_RELEASE) file(TO_NATIVE_PATH "${_path}" _path) + message(STATUS "${_path}") set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}${VCPKG_HOST_PATH_SEPARATOR}${_path}") endforeach() endif() @@ -436,7 +456,7 @@ function(vcpkg_configure_make) else() set(ENV{CFLAGS} "${C_FLAGS_GLOBAL} ${VCPKG_C_FLAGS_RELEASE}") set(ENV{CXXFLAGS} "${CXX_FLAGS_GLOBAL} ${VCPKG_CXX_FLAGS_RELEASE}") - set(ENV{LDFLAGS} "${LD_FLAGS_GLOBAL} -L${CURRENT_INSTALLED_DIR}/lib -L${CURRENT_INSTALLED_DIR}/lib/manual-link ${VCPKG_LINKER_FLAGS_RELEASE}") + #set(ENV{LDFLAGS} "${LD_FLAGS_GLOBAL} -L\"${_VCPKG_INSTALLED}/lib\" -L\"${_VCPKG_INSTALLED}/lib/manual-link\" ${VCPKG_LINKER_FLAGS_RELEASE}") endif() if (_csc_NO_DEBUG) From 346e5cb78097c9695ef303452393851aa9d70e32 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 5 Feb 2020 01:05:40 +0100 Subject: [PATCH 375/419] remove unnecessary build depends --- ports/pthread-stubs/CONTROL | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/pthread-stubs/CONTROL b/ports/pthread-stubs/CONTROL index 10c2622e12d4c8..7fcd8549a4a1fd 100644 --- a/ports/pthread-stubs/CONTROL +++ b/ports/pthread-stubs/CONTROL @@ -2,4 +2,3 @@ Source: pthread-stubs Version: 0.4 Homepage: https://gitlab.freedesktop.org/xorg/lib/pthread-stubs Description: Stub replacements for POSIX Threads functions. -Build-Depends: From a8e7a4a64d24323ae4649eec695a373e04886e67 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 5 Feb 2020 01:06:05 +0100 Subject: [PATCH 376/419] fix extra \ --- scripts/cmake/vcpkg_configure_make.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index a17b8e599d59fc..95842c7da9f112 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -331,7 +331,7 @@ function(vcpkg_configure_make) else() set(base_cmd ./) - set(LD_FLAGS "${LD_FLAGS_GLOBAL} \"-L\${_VCPKG_INSTALLED}/lib\\" \"-L${_VCPKG_INSTALLED}/lib/manual-link\" ${VCPKG_LINKER_FLAGS_RELEASE}") + set(LD_FLAGS "${LD_FLAGS_GLOBAL} \"-L\${_VCPKG_INSTALLED}/lib\" \"-L${_VCPKG_INSTALLED}/lib/manual-link\" ${VCPKG_LINKER_FLAGS_RELEASE}") set(rel_command "LDFLAGS=${LD_FLAGS} ${base_cmd}configure;${_csc_OPTIONS};${_csc_OPTIONS_RELEASE}" ) From e92e70faa6fe77432260a1523f4442f92ea6917f Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 5 Feb 2020 01:14:37 +0100 Subject: [PATCH 377/419] x of N enough for today --- scripts/cmake/vcpkg_configure_make.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index 95842c7da9f112..1de115d2568bae 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -331,9 +331,9 @@ function(vcpkg_configure_make) else() set(base_cmd ./) - set(LD_FLAGS "${LD_FLAGS_GLOBAL} \"-L\${_VCPKG_INSTALLED}/lib\" \"-L${_VCPKG_INSTALLED}/lib/manual-link\" ${VCPKG_LINKER_FLAGS_RELEASE}") + set(LD_FLAGS "\"${LD_FLAGS_GLOBAL} -L\\\"${_VCPKG_INSTALLED}/lib\\\" -L\\\"${_VCPKG_INSTALLED}/lib/manual-link\\\" ${VCPKG_LINKER_FLAGS_RELEASE}\"") set(rel_command - "LDFLAGS=${LD_FLAGS} ${base_cmd}configure;${_csc_OPTIONS};${_csc_OPTIONS_RELEASE}" + "${base_cmd}configure;LDFLAGS=${LD_FLAGS};${_csc_OPTIONS};${_csc_OPTIONS_RELEASE}" ) set(dbg_command "${base_cmd}configure;${_csc_OPTIONS};${_csc_OPTIONS_DEBUG}") From 246828943068303db4152a784c4b3bc617f32eac Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 5 Feb 2020 10:34:00 +0100 Subject: [PATCH 378/419] comment out whitespace handling on linux --- scripts/cmake/vcpkg_configure_make.cmake | 49 ++++++++++++----------- scripts/cmake/vcpkg_fixup_pkgconfig.cmake | 2 + 2 files changed, 28 insertions(+), 23 deletions(-) diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index 1de115d2568bae..fc4f62534f9632 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -224,23 +224,26 @@ function(vcpkg_configure_make) endif() #x86_64-pc-mingw32 #x86_64-w64-mingw32 #--enable-secure-api #--enable-64bit # endif() - - set(COMPILER_CC CC=gcc) + vcpkg_add_to_path("${YASM_EXE_PATH}") if(NOT VCPKG_USE_POSIX_TOOLCHAIN) - if(HOST_ARCH MATCHES "x86|arm") + if(HOST_ARCH MATCHES "x86|arm") vcpkg_add_to_path("${MSYS_ROOT}/mingw32/bin") vcpkg_add_to_path("${MSYS_ROOT}/mingw32/i686-w64-mingw32/bin") elseif(HOST_ARCH STREQUAL x64) vcpkg_add_to_path("${MSYS_ROOT}/mingw64/bin") vcpkg_add_to_path("${MSYS_ROOT}/mingw64/x86_64-w64-mingw32/bin") - endif() + endif() endif() vcpkg_add_to_path("${MSYS_ROOT}/usr/bin") vcpkg_add_to_path("${PERL_EXE_PATH}") set(BASH "${MSYS_ROOT}/usr/bin/bash.exe") elseif (_csc_AUTOCONFIG) + if(${CURRENT_PACKAGES_DIR} MATCHES " " OR ${CURRENT_INSTALLED_DIR} MATCHES " ") + # Don't bother with whitespaces on Linux. The tools will fail anyway and I tried very hard to make it work! + message(FATAL_ERROR "Detected whitespace in CURRENT_PACKAGES_DIR or CURRENT_INSTALLED_DIR. Please remove the whitespaces from the paths! The required tools do not handle whitespaces correctly") + endif() find_program(AUTORECONF autoreconf REQUIRED) endif() @@ -280,12 +283,8 @@ function(vcpkg_configure_make) set(C_INCLUDE_PATH_BACKUP "$ENV{C_INCLUDE_PATH}") set(CPLUS_INCLUDE_PATH_BACKUP "$ENV{CPLUS_INCLUDE_PATH}") set(LD_LIBRARY_PATH_BACKUP "$ENV{LD_LIBRARY_PATH}") - - #set(ENV{C_INCLUDE_PATH} "${C_INCLUDE_PATH_BACKUP}${VCPKG_HOST_PATH_SEPARATOR}${CURRENT_INSTALLED_DIR}/include") - #set(ENV{CPLUS_INCLUDE_PATH} "${C_INCLUDE_PATH_BACKUP}${VCPKG_HOST_PATH_SEPARATOR}${CURRENT_INSTALLED_DIR}/include") - set(ENV{VCPKG_INCLUDE} "${_VCPKG_INSTALLED}/include") - set(C_FLAGS_GLOBAL "$ENV{CFLAGS} -I\$VCPKG_INCLUDE ${VCPKG_C_FLAGS}") - set(CXX_FLAGS_GLOBAL "$ENV{CXXFLAGS} -I\$VCPKG_INCLUDE ${VCPKG_CXX_FLAGS}") + set(C_FLAGS_GLOBAL "$ENV{CFLAGS} -I\"${_VCPKG_INSTALLED}/include\" ${VCPKG_C_FLAGS}") + set(CXX_FLAGS_GLOBAL "$ENV{CXXFLAGS} -I\"${_VCPKG_INSTALLED}/include\" ${VCPKG_CXX_FLAGS}") set(LD_FLAGS_GLOBAL "$ENV{LDFLAGS} ${VCPKG_LINKER_FLAGS}") if(NOT VCPKG_TARGET_IS_WINDOWS) string(APPEND C_FLAGS_GLOBAL " -fPIC") @@ -331,9 +330,8 @@ function(vcpkg_configure_make) else() set(base_cmd ./) - set(LD_FLAGS "\"${LD_FLAGS_GLOBAL} -L\\\"${_VCPKG_INSTALLED}/lib\\\" -L\\\"${_VCPKG_INSTALLED}/lib/manual-link\\\" ${VCPKG_LINKER_FLAGS_RELEASE}\"") set(rel_command - "${base_cmd}configure;LDFLAGS=${LD_FLAGS};${_csc_OPTIONS};${_csc_OPTIONS_RELEASE}" + "${base_cmd}configure;${_csc_OPTIONS};${_csc_OPTIONS_RELEASE}" ) set(dbg_command "${base_cmd}configure;${_csc_OPTIONS};${_csc_OPTIONS_DEBUG}") @@ -346,8 +344,9 @@ function(vcpkg_configure_make) set(BACKUP_ENV_PKG_CONFIG_PATH_DEBUG $ENV{PKG_CONFIG_PATH}) foreach(_path IN LISTS _csc_PKG_CONFIG_PATHS_DEBUG) file(TO_NATIVE_PATH "${_path}" _path) - set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}${VCPKG_HOST_PATH_SEPARATOR}${_path}") + set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}${VCPKG_HOST_PATH_SEPARATOR}${_path}") endforeach() + message(STATUS "PKG_RELEASE:$ENV{PKG_CONFIG_PATH}") endif() if (CMAKE_HOST_WIN32) @@ -365,15 +364,13 @@ function(vcpkg_configure_make) else() set(ENV{CFLAGS} "${C_FLAGS_GLOBAL} ${VCPKG_C_FLAGS_DEBUG}") set(ENV{CXXFLAGS} "${CXX_FLAGS_GLOBAL} ${VCPKG_CXX_FLAGS_DEBUG}") - if(NOT WIN32) - set(ENV{VCPKG_MANUAL_LINK} "${_VCPKG_INSTALLED}/debug/lib/manual-link") - set(ENV{VCPKG_LIBS} "${_VCPKG_INSTALLED}/debug/lib/manual-link") - else() - set(_VCPKG_INSTALLED_2 ${_VCPKG_INSTALLED}) - set(EXTRA_QUOTES_2 \") - endif() - set(ENV{LDFLAGS} "${LD_FLAGS_GLOBAL} -L\$VCPKG_LIBS -L\$VCPKG_MANUAL_LINK ${VCPKG_LINKER_FLAGS_DEBUG}") - message(STATUS "LDFLAGS:$ENV{LDFLAGS}") + # if(NOT WIN32) + # set(ENV{VCPKG_MANUAL_LINK_DEBUG} "${_VCPKG_INSTALLED}/debug/lib/manual-link") + # set(ENV{VCPKG_LIBS_DEBUG} "${_VCPKG_INSTALLED}/debug/lib/") + # set(ENV{LDFLAGS} "-L\$(VCPKG_LIBS_DEBUG) -L\$(VCPKG_MANUAL_LINK_DEBUG) ${LD_FLAGS_GLOBAL} ${VCPKG_LINKER_FLAGS_DEBUG}") + # else() + set(ENV{LDFLAGS} "-L\"${_VCPKG_INSTALLED}/debug/lib/\" -L\"${_VCPKG_INSTALLED}/debug/lib/manual-link/\" ${LD_FLAGS_GLOBAL} ${VCPKG_LINKER_FLAGS_DEBUG}") + # endif() endif() set(OBJ_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") @@ -456,7 +453,13 @@ function(vcpkg_configure_make) else() set(ENV{CFLAGS} "${C_FLAGS_GLOBAL} ${VCPKG_C_FLAGS_RELEASE}") set(ENV{CXXFLAGS} "${CXX_FLAGS_GLOBAL} ${VCPKG_CXX_FLAGS_RELEASE}") - #set(ENV{LDFLAGS} "${LD_FLAGS_GLOBAL} -L\"${_VCPKG_INSTALLED}/lib\" -L\"${_VCPKG_INSTALLED}/lib/manual-link\" ${VCPKG_LINKER_FLAGS_RELEASE}") + # if(NOT WIN32) + # set(ENV{VCPKG_MANUAL_LINK_RELEASE} "${_VCPKG_INSTALLED}/lib/manual-link") + # set(ENV{VCPKG_LIBS_RELEASE} "${_VCPKG_INSTALLED}/lib/") + # set(ENV{LDFLAGS} "-L\$(VCPKG_LIBS_RELEASE) -L\$(VCPKG_MANUAL_LINK_RELEASE) ${LD_FLAGS_GLOBAL} ${VCPKG_LINKER_FLAGS_RELEASE}") + # else() + set(ENV{LDFLAGS} "-L\"${_VCPKG_INSTALLED}/lib/\" -L\"${_VCPKG_INSTALLED}/lib/manual-link/\" ${LD_FLAGS_GLOBAL} ${VCPKG_LINKER_FLAGS_RELEASE}") + # endif() endif() if (_csc_NO_DEBUG) diff --git a/scripts/cmake/vcpkg_fixup_pkgconfig.cmake b/scripts/cmake/vcpkg_fixup_pkgconfig.cmake index 7acbdef8d5ec3f..6811cd575d7698 100644 --- a/scripts/cmake/vcpkg_fixup_pkgconfig.cmake +++ b/scripts/cmake/vcpkg_fixup_pkgconfig.cmake @@ -28,6 +28,7 @@ function(vcpkg_fixup_pkgconfig) string(REPLACE "${CURRENT_PACKAGES_DIR}" "\${prefix}" _contents "${_contents}") string(REPLACE "${CURRENT_INSTALLED_DIR}" "\${prefix}" _contents "${_contents}") string(REGEX REPLACE "^prefix=\\\${prefix}" "prefix=${CURRENT_INSTALLED_DIR}" _contents "${_contents}") + #string(REGEX REPLACE "^prefix=\\\${prefix}" "" _contents "${_contents}") # Removes prefix file(WRITE "${_file}" "${_contents}") endforeach() @@ -46,6 +47,7 @@ function(vcpkg_fixup_pkgconfig) string(REPLACE "debug/lib" "lib" _contents "${_contents}") # the prefix will contain the debug keyword string(REGEX REPLACE "^prefix=\\\${prefix}" "prefix=${CURRENT_INSTALLED_DIR}" _contents "${_contents}") + #string(REGEX REPLACE "^prefix=\\\${prefix}/debug" "prefix=${CURRENT_INSTALLED_DIR}" _contents "${_contents}") # Removes prefix file(WRITE "${_file}" "${_contents}") endforeach() message(STATUS "Fixing pkgconfig --- finished") From b4a031e0889da167a54241a90e4713cdda78b08b Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 5 Feb 2020 11:43:55 +0100 Subject: [PATCH 379/419] fix patch --- ports/elfutils/configure.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/elfutils/configure.patch b/ports/elfutils/configure.patch index b0c18166f551df..2099752081d5fb 100644 --- a/ports/elfutils/configure.patch +++ b/ports/elfutils/configure.patch @@ -6,8 +6,8 @@ index 07d371c31..15552315c 100644 dnl zlib is mandatory. save_LIBS="$LIBS" LIBS= --eu_ZIPLIB(zlib,ZLIB,gzdirect,gzip) -+eu_ZIPLIB(zlib,ZLIB,zlibd,gzdirect,gzip) +-eu_ZIPLIB(zlib,ZLIB,z,gzdirect,gzip) ++eu_ZIPLIB(zlib,ZLIB,z,zlibd,gzdirect,gzip) AS_IF([test "x$with_zlib" = xno], [AC_MSG_ERROR([zlib not found but is required])]) LIBS="$save_LIBS" From 64794ab9adc1e883d654d029ccdd6e888270b7fb Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 5 Feb 2020 11:44:10 +0100 Subject: [PATCH 380/419] adjust pkgconfig fix --- scripts/cmake/vcpkg_configure_make.cmake | 11 +++++++++-- scripts/cmake/vcpkg_fixup_pkgconfig.cmake | 6 ++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index fc4f62534f9632..6b57848cf1fd75 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -245,6 +245,13 @@ function(vcpkg_configure_make) message(FATAL_ERROR "Detected whitespace in CURRENT_PACKAGES_DIR or CURRENT_INSTALLED_DIR. Please remove the whitespaces from the paths! The required tools do not handle whitespaces correctly") endif() find_program(AUTORECONF autoreconf REQUIRED) + find_program(LIBTOOL libtool REQUIRED) + if(NOT ENV{PKG_CONFIG}) + find_program(PKGCONFIG pkg-config REQUIRED) + else() + message(STATUS "PKG_CONF ENV found: $ENV{PKG_CONFIG}") + set(PKGCONFIG $ENV{PKG_CONFIG}) + endif() endif() file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") @@ -346,7 +353,6 @@ function(vcpkg_configure_make) file(TO_NATIVE_PATH "${_path}" _path) set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}${VCPKG_HOST_PATH_SEPARATOR}${_path}") endforeach() - message(STATUS "PKG_RELEASE:$ENV{PKG_CONFIG_PATH}") endif() if (CMAKE_HOST_WIN32) @@ -371,6 +377,7 @@ function(vcpkg_configure_make) # else() set(ENV{LDFLAGS} "-L\"${_VCPKG_INSTALLED}/debug/lib/\" -L\"${_VCPKG_INSTALLED}/debug/lib/manual-link/\" ${LD_FLAGS_GLOBAL} ${VCPKG_LINKER_FLAGS_DEBUG}") # endif() + set(ENV{PKG_CONFIG} "${PKGCONFIG} --define-variable=prefix=${_VCPKG_INSTALLED}/debug") endif() set(OBJ_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") @@ -433,7 +440,6 @@ function(vcpkg_configure_make) set(BACKUP_ENV_PKG_CONFIG_PATH_RELEASE $ENV{PKG_CONFIG_PATH}) foreach(_path IN LISTS _csc_PKG_CONFIG_PATHS_RELEASE) file(TO_NATIVE_PATH "${_path}" _path) - message(STATUS "${_path}") set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}${VCPKG_HOST_PATH_SEPARATOR}${_path}") endforeach() endif() @@ -460,6 +466,7 @@ function(vcpkg_configure_make) # else() set(ENV{LDFLAGS} "-L\"${_VCPKG_INSTALLED}/lib/\" -L\"${_VCPKG_INSTALLED}/lib/manual-link/\" ${LD_FLAGS_GLOBAL} ${VCPKG_LINKER_FLAGS_RELEASE}") # endif() + set(ENV{PKG_CONFIG} "${PKGCONFIG} --define-variable=prefix=${_VCPKG_INSTALLED}") endif() if (_csc_NO_DEBUG) diff --git a/scripts/cmake/vcpkg_fixup_pkgconfig.cmake b/scripts/cmake/vcpkg_fixup_pkgconfig.cmake index 6811cd575d7698..3c91acf86ce374 100644 --- a/scripts/cmake/vcpkg_fixup_pkgconfig.cmake +++ b/scripts/cmake/vcpkg_fixup_pkgconfig.cmake @@ -27,8 +27,7 @@ function(vcpkg_fixup_pkgconfig) file(READ "${_file}" _contents) string(REPLACE "${CURRENT_PACKAGES_DIR}" "\${prefix}" _contents "${_contents}") string(REPLACE "${CURRENT_INSTALLED_DIR}" "\${prefix}" _contents "${_contents}") - string(REGEX REPLACE "^prefix=\\\${prefix}" "prefix=${CURRENT_INSTALLED_DIR}" _contents "${_contents}") - #string(REGEX REPLACE "^prefix=\\\${prefix}" "" _contents "${_contents}") # Removes prefix + string(REGEX REPLACE "^prefix=\\\${prefix}" "#prefix=${CURRENT_INSTALLED_DIR}" _contents "${_contents}") # Comment out prefix file(WRITE "${_file}" "${_contents}") endforeach() @@ -46,8 +45,7 @@ function(vcpkg_fixup_pkgconfig) string(REPLACE "\${prefix}/share" "\${prefix}/../share" _contents "${_contents}") string(REPLACE "debug/lib" "lib" _contents "${_contents}") # the prefix will contain the debug keyword - string(REGEX REPLACE "^prefix=\\\${prefix}" "prefix=${CURRENT_INSTALLED_DIR}" _contents "${_contents}") - #string(REGEX REPLACE "^prefix=\\\${prefix}/debug" "prefix=${CURRENT_INSTALLED_DIR}" _contents "${_contents}") # Removes prefix + string(REGEX REPLACE "^prefix=\\\${prefix}/debug" "#prefix=${CURRENT_INSTALLED_DIR}/debug" _contents "${_contents}") # Comment out prefix file(WRITE "${_file}" "${_contents}") endforeach() message(STATUS "Fixing pkgconfig --- finished") From 8a785110e73b2fb76b217792307f112ebf57c394 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 5 Feb 2020 13:49:24 +0100 Subject: [PATCH 381/419] merge fixup pkgconfig --- scripts/cmake/vcpkg_fixup_pkgconfig.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/cmake/vcpkg_fixup_pkgconfig.cmake b/scripts/cmake/vcpkg_fixup_pkgconfig.cmake index 3c91acf86ce374..a81d3cb4bf9e2c 100644 --- a/scripts/cmake/vcpkg_fixup_pkgconfig.cmake +++ b/scripts/cmake/vcpkg_fixup_pkgconfig.cmake @@ -22,7 +22,7 @@ function(vcpkg_fixup_pkgconfig) endif() message(STATUS "Fixing pkgconfig - release") - message(STATUS "Files: ${_vfpkg_RELEASE_FILES}") + debug_message("Files: ${_vfpkg_RELEASE_FILES}") foreach(_file ${_vfpkg_RELEASE_FILES}) file(READ "${_file}" _contents) string(REPLACE "${CURRENT_PACKAGES_DIR}" "\${prefix}" _contents "${_contents}") @@ -32,7 +32,7 @@ function(vcpkg_fixup_pkgconfig) endforeach() message(STATUS "Fixing pkgconfig - debug") - message(STATUS "Files: ${_vfpkg_DEBUG_FILES}") + debug_message("Files: ${_vfpkg_DEBUG_FILES}") foreach(_file ${_vfpkg_DEBUG_FILES}) file(READ "${_file}" _contents) string(REPLACE "${CURRENT_PACKAGES_DIR}" "\${prefix}" _contents "${_contents}") From 145761fae72d51e7838b272bead6ff4c839cd632 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 5 Feb 2020 13:49:49 +0100 Subject: [PATCH 382/419] add configure_patches as an option and fixed the enviromnent --- scripts/cmake/vcpkg_configure_make.cmake | 82 ++++++++++++++---------- 1 file changed, 49 insertions(+), 33 deletions(-) diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index 6b57848cf1fd75..2dcba3bc60f05c 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -144,7 +144,7 @@ function(vcpkg_configure_make) cmake_parse_arguments(_csc "AUTOCONFIG;DISABLE_AUTO_HOST;DISABLE_AUTO_DST;NO_DEBUG;SKIP_CONFIGURE" "SOURCE_PATH;PROJECT_SUBPATH;GENERATOR;PRERUN_SHELL" - "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE;PKG_CONFIG_PATHS;PKG_CONFIG_PATHS_DEBUG;PKG_CONFIG_PATHS_RELEASE" + "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE;PKG_CONFIG_PATHS;PKG_CONFIG_PATHS_DEBUG;PKG_CONFIG_PATHS_RELEASE;CONFIGURE_PATCHES" ${ARGN} ) @@ -283,20 +283,6 @@ function(vcpkg_configure_make) "--libdir=${EXTRA_QUOTES}${_VCPKG_PREFIX}/debug/lib${EXTRA_QUOTES}" "--includedir=${EXTRA_QUOTES}${_VCPKG_PREFIX}/debug/include${EXTRA_QUOTES}") endif() - - set(C_FLAGS_BACKUP "$ENV{CFLAGS}") - set(CXX_FLAGS_BACKUP "$ENV{CXXFLAGS}") - set(LD_FLAGS_BACKUP "$ENV{LDFLAGS}") - set(C_INCLUDE_PATH_BACKUP "$ENV{C_INCLUDE_PATH}") - set(CPLUS_INCLUDE_PATH_BACKUP "$ENV{CPLUS_INCLUDE_PATH}") - set(LD_LIBRARY_PATH_BACKUP "$ENV{LD_LIBRARY_PATH}") - set(C_FLAGS_GLOBAL "$ENV{CFLAGS} -I\"${_VCPKG_INSTALLED}/include\" ${VCPKG_C_FLAGS}") - set(CXX_FLAGS_GLOBAL "$ENV{CXXFLAGS} -I\"${_VCPKG_INSTALLED}/include\" ${VCPKG_CXX_FLAGS}") - set(LD_FLAGS_GLOBAL "$ENV{LDFLAGS} ${VCPKG_LINKER_FLAGS}") - if(NOT VCPKG_TARGET_IS_WINDOWS) - string(APPEND C_FLAGS_GLOBAL " -fPIC") - string(APPEND CXX_FLAGS_GLOBAL " -fPIC") - endif() set(base_cmd) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) @@ -344,6 +330,32 @@ function(vcpkg_configure_make) "${base_cmd}configure;${_csc_OPTIONS};${_csc_OPTIONS_DEBUG}") endif() + + # Backup enviromnent variables + set(C_FLAGS_BACKUP "$ENV{CFLAGS}") + set(CXX_FLAGS_BACKUP "$ENV{CXXFLAGS}") + set(LD_FLAGS_BACKUP "$ENV{LDFLAGS}") + set(INCLUDE_PATH_BACKUP "$ENV{INCLUDE_PATH}") + set(INCLUDE_BACKUP "$ENV{INCLUDE}") + set(C_INCLUDE_PATH_BACKUP "$ENV{C_INCLUDE_PATH}") + set(CPLUS_INCLUDE_PATH_BACKUP "$ENV{CPLUS_INCLUDE_PATH}") + set(LD_LIBRARY_PATH_BACKUP "$ENV{LD_LIBRARY_PATH}") + set(LIBRARY_PATH_BACKUP "$ENV{LIBRARY_PATH}") + + # Setup include enviromnent + set(ENV{INCLUDE} "${_VCPKG_INSTALLED}/include${VCPKG_HOST_PATH_SEPARATOR}${INCLUDE_PATH_BACKUP}") + set(ENV{INCLUDE_PATH} "${_VCPKG_INSTALLED}/include${VCPKG_HOST_PATH_SEPARATOR}${INCLUDE_PATH_BACKUP}") + set(ENV{C_INCLUDE_PATH} "${_VCPKG_INSTALLED}/include${VCPKG_HOST_PATH_SEPARATOR}${C_INCLUDE_PATH_BACKUP}") + set(ENV{CPLUS_INCLUDE_PATH} "${_VCPKG_INSTALLED}/include${VCPKG_HOST_PATH_SEPARATOR}${CPLUS_INCLUDE_PATH_BACKUP}") + + # Setup global flags + set(C_FLAGS_GLOBAL "$ENV{CFLAGS} -I\"${_VCPKG_INSTALLED}/include\" ${VCPKG_C_FLAGS}") + set(CXX_FLAGS_GLOBAL "$ENV{CXXFLAGS} -I\"${_VCPKG_INSTALLED}/include\" ${VCPKG_CXX_FLAGS}") + set(LD_FLAGS_GLOBAL "$ENV{LDFLAGS} ${VCPKG_LINKER_FLAGS}") + if(NOT VCPKG_TARGET_IS_WINDOWS) + string(APPEND C_FLAGS_GLOBAL " -fPIC") + string(APPEND CXX_FLAGS_GLOBAL " -fPIC") + endif() # Configure debug if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug" AND NOT _csc_NO_DEBUG) @@ -355,6 +367,7 @@ function(vcpkg_configure_make) endforeach() endif() + # Setup debug enviromnent if (CMAKE_HOST_WIN32) set(TMP_CFLAGS "${C_FLAGS_GLOBAL} ${VCPKG_C_FLAGS_DEBUG}") string(REGEX REPLACE "[ \t]+/" " -" TMP_CFLAGS "${TMP_CFLAGS}") @@ -370,12 +383,9 @@ function(vcpkg_configure_make) else() set(ENV{CFLAGS} "${C_FLAGS_GLOBAL} ${VCPKG_C_FLAGS_DEBUG}") set(ENV{CXXFLAGS} "${CXX_FLAGS_GLOBAL} ${VCPKG_CXX_FLAGS_DEBUG}") - # if(NOT WIN32) - # set(ENV{VCPKG_MANUAL_LINK_DEBUG} "${_VCPKG_INSTALLED}/debug/lib/manual-link") - # set(ENV{VCPKG_LIBS_DEBUG} "${_VCPKG_INSTALLED}/debug/lib/") - # set(ENV{LDFLAGS} "-L\$(VCPKG_LIBS_DEBUG) -L\$(VCPKG_MANUAL_LINK_DEBUG) ${LD_FLAGS_GLOBAL} ${VCPKG_LINKER_FLAGS_DEBUG}") - # else() - set(ENV{LDFLAGS} "-L\"${_VCPKG_INSTALLED}/debug/lib/\" -L\"${_VCPKG_INSTALLED}/debug/lib/manual-link/\" ${LD_FLAGS_GLOBAL} ${VCPKG_LINKER_FLAGS_DEBUG}") + set(ENV{LDFLAGS} "${LD_FLAGS_GLOBAL} ${VCPKG_LINKER_FLAGS_DEBUG}") + set(ENV{LIBRARY_PATH} "${LIBRARY_PATH_BACKUP}${VCPKG_HOST_PATH_SEPARATOR}${_VCPKG_INSTALLED}/debug/lib/${VCPKG_HOST_PATH_SEPARATOR}${_VCPKG_INSTALLED}/debug/lib/manual-link/") + set(ENV{LD_LIBRARY_PATH} "${LD_LIBRARY_PATH_BACKUP}${VCPKG_HOST_PATH_SEPARATOR}${_VCPKG_INSTALLED}/debug/lib/${VCPKG_HOST_PATH_SEPARATOR}${_VCPKG_INSTALLED}/debug/lib/manual-link/") # endif() set(ENV{PKG_CONFIG} "${PKGCONFIG} --define-variable=prefix=${_VCPKG_INSTALLED}/debug") endif() @@ -422,6 +432,9 @@ function(vcpkg_configure_make) endif() if (NOT _csc_SKIP_CONFIGURE) + if(_csc_CONFIGURE_PATCHES) + vcpkg_apply_patches(SOURCE_PATH "${PRJ_DIR}" PATCHES "${_csc_CONFIGURE_PATCHES}") + endif() message(STATUS "Configuring ${TARGET_TRIPLET}-dbg") vcpkg_execute_required_process( COMMAND ${dbg_command} @@ -443,7 +456,8 @@ function(vcpkg_configure_make) set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}${VCPKG_HOST_PATH_SEPARATOR}${_path}") endforeach() endif() - + + # Setup release enviromnent if (CMAKE_HOST_WIN32) set(TMP_CFLAGS "${C_FLAGS_GLOBAL} ${VCPKG_C_FLAGS_RELEASE}") string(REGEX REPLACE "[ \t]+/" " -" TMP_CFLAGS "${TMP_CFLAGS}") @@ -459,12 +473,9 @@ function(vcpkg_configure_make) else() set(ENV{CFLAGS} "${C_FLAGS_GLOBAL} ${VCPKG_C_FLAGS_RELEASE}") set(ENV{CXXFLAGS} "${CXX_FLAGS_GLOBAL} ${VCPKG_CXX_FLAGS_RELEASE}") - # if(NOT WIN32) - # set(ENV{VCPKG_MANUAL_LINK_RELEASE} "${_VCPKG_INSTALLED}/lib/manual-link") - # set(ENV{VCPKG_LIBS_RELEASE} "${_VCPKG_INSTALLED}/lib/") - # set(ENV{LDFLAGS} "-L\$(VCPKG_LIBS_RELEASE) -L\$(VCPKG_MANUAL_LINK_RELEASE) ${LD_FLAGS_GLOBAL} ${VCPKG_LINKER_FLAGS_RELEASE}") - # else() - set(ENV{LDFLAGS} "-L\"${_VCPKG_INSTALLED}/lib/\" -L\"${_VCPKG_INSTALLED}/lib/manual-link/\" ${LD_FLAGS_GLOBAL} ${VCPKG_LINKER_FLAGS_RELEASE}") + set(ENV{LDFLAGS} "${LD_FLAGS_GLOBAL} ${VCPKG_LINKER_FLAGS_RELEASE}") + set(ENV{LIBRARY_PATH} "${LIBRARY_PATH_BACKUP}${VCPKG_HOST_PATH_SEPARATOR}${_VCPKG_INSTALLED}/lib/${VCPKG_HOST_PATH_SEPARATOR}${_VCPKG_INSTALLED}/lib/manual-link/") + set(ENV{LD_LIBRARY_PATH} "${LD_LIBRARY_PATH_BACKUP}${VCPKG_HOST_PATH_SEPARATOR}${_VCPKG_INSTALLED}/lib/${VCPKG_HOST_PATH_SEPARATOR}${_VCPKG_INSTALLED}/lib/manual-link/") # endif() set(ENV{PKG_CONFIG} "${PKGCONFIG} --define-variable=prefix=${_VCPKG_INSTALLED}") endif() @@ -517,6 +528,9 @@ function(vcpkg_configure_make) endif() if (NOT _csc_SKIP_CONFIGURE) + if(_csc_CONFIGURE_PATCHES) + vcpkg_apply_patches(SOURCE_PATH "${PRJ_DIR}" PATCHES "${_csc_CONFIGURE_PATCHES}") + endif() message(STATUS "Configuring ${TAR_TRIPLET_DIR}") vcpkg_execute_required_process( COMMAND ${rel_command} @@ -530,20 +544,22 @@ function(vcpkg_configure_make) endif() endif() - # Restore envs + # Restore enviromnent set(ENV{CFLAGS} "${C_FLAGS_BACKUP}") set(ENV{CXXFLAGS} "${CXX_FLAGS_BACKUP}") set(ENV{LDFLAGS} "${LD_FLAGS_BACKUP}") - + + set(ENV{INCLUDE} "${INCLUDE_BACKUP}") + set(ENV{INCLUDE_PATH} "${INCLUDE_PATH_BACKUP}") set(ENV{C_INCLUDE_PATH} "${C_INCLUDE_PATH_BACKUP}") set(ENV{CPLUS_INCLUDE_PATH} "${CPLUS_INCLUDE_PATH_BACKUP}") + set(ENV{LIBRARY_PATH} "${LIBRARY_PATH_BACKUP}") set(ENV{LD_LIBRARY_PATH} "${LD_LIBRARY_PATH_BACKUP}") - + if(_csc_PKG_CONFIG_PATHS) set(ENV{PKG_CONFIG_PATH} "${BACKUP_ENV_PKG_CONFIG_PATH}") endif() - - + set(_VCPKG_MAKE_GENERATOR "${GENERATOR}" PARENT_SCOPE) set(_VCPKG_NO_DEBUG ${_csc_NO_DEBUG} PARENT_SCOPE) SET(_VCPKG_PROJECT_SOURCE_PATH ${_csc_SOURCE_PATH} PARENT_SCOPE) From ff44de672a4f1b03ddff4e1eddd274aff6559547 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 5 Feb 2020 13:49:59 +0100 Subject: [PATCH 383/419] same env fixes --- scripts/cmake/vcpkg_build_make.cmake | 53 ++++++++++++++++++++++++---- 1 file changed, 46 insertions(+), 7 deletions(-) diff --git a/scripts/cmake/vcpkg_build_make.cmake b/scripts/cmake/vcpkg_build_make.cmake index bb2dfb21d1163e..388ecd546f2980 100644 --- a/scripts/cmake/vcpkg_build_make.cmake +++ b/scripts/cmake/vcpkg_build_make.cmake @@ -35,7 +35,15 @@ function(vcpkg_build_make) if (_VCPKG_PROJECT_SUBPATH) set(_VCPKG_PROJECT_SUBPATH /${_VCPKG_PROJECT_SUBPATH}/) endif() - + + if(WIN32) + set(_VCPKG_PREFIX ${CURRENT_PACKAGES_DIR}) + set(_VCPKG_INSTALLED ${CURRENT_INSTALLED_DIR}) + else() + string(REPLACE " " "\ " _VCPKG_PREFIX "${CURRENT_PACKAGES_DIR}") + string(REPLACE " " "\ " _VCPKG_INSTALLED "${CURRENT_INSTALLED_DIR}") + endif() + set(MAKE ) set(MAKE_OPTS ) set(INSTALL_OPTS ) @@ -93,11 +101,24 @@ function(vcpkg_build_make) else() message(FATAL_ERROR "${_VCPKG_MAKE_GENERATOR} not supported.") endif() - - + + # Backup enviromnent variables set(C_FLAGS_BACKUP "$ENV{CFLAGS}") set(CXX_FLAGS_BACKUP "$ENV{CXXFLAGS}") set(LD_FLAGS_BACKUP "$ENV{LDFLAGS}") + set(INCLUDE_PATH_BACKUP "$ENV{INCLUDE_PATH}") + set(INCLUDE_BACKUP "$ENV{INCLUDE}") + set(C_INCLUDE_PATH_BACKUP "$ENV{C_INCLUDE_PATH}") + set(CPLUS_INCLUDE_PATH_BACKUP "$ENV{CPLUS_INCLUDE_PATH}") + set(LD_LIBRARY_PATH_BACKUP "$ENV{LD_LIBRARY_PATH}") + set(LIBRARY_PATH_BACKUP "$ENV{LIBRARY_PATH}") + + # Setup include enviromnent + set(ENV{INCLUDE} "${_VCPKG_INSTALLED}/include${VCPKG_HOST_PATH_SEPARATOR}${INCLUDE_PATH_BACKUP}") + set(ENV{INCLUDE_PATH} "${_VCPKG_INSTALLED}/include${VCPKG_HOST_PATH_SEPARATOR}${INCLUDE_PATH_BACKUP}") + set(ENV{C_INCLUDE_PATH} "${_VCPKG_INSTALLED}/include${VCPKG_HOST_PATH_SEPARATOR}${C_INCLUDE_PATH_BACKUP}") + set(ENV{CPLUS_INCLUDE_PATH} "${_VCPKG_INSTALLED}/include${VCPKG_HOST_PATH_SEPARATOR}${CPLUS_INCLUDE_PATH_BACKUP}") + set(C_FLAGS_GLOBAL "$ENV{CFLAGS} ${VCPKG_C_FLAGS}") set(CXX_FLAGS_GLOBAL "$ENV{CXXFLAGS} ${VCPKG_CXX_FLAGS}") set(LD_FLAGS_GLOBAL "$ENV{LDFLAGS} ${VCPKG_LINKER_FLAGS}") @@ -161,6 +182,13 @@ function(vcpkg_build_make) set(ENV{CFLAGS} "${C_FLAGS_GLOBAL} ${VCPKG_C_FLAGS_${CMAKE_BUILDTYPE}}") set(ENV{CXXFLAGS} "${CXX_FLAGS_GLOBAL} ${VCPKG_CXX_FLAGS_${CMAKE_BUILDTYPE}}") set(ENV{LDFLAGS} "${LD_FLAGS_GLOBAL} ${VCPKG_LINKER_FLAGS_${CMAKE_BUILDTYPE}}") + if(BUILDTYPE STREQUAL "debug") + set(ENV{LIBRARY_PATH} "${LIBRARY_PATH_BACKUP}${VCPKG_HOST_PATH_SEPARATOR}${_VCPKG_INSTALLED}/debug/lib/${VCPKG_HOST_PATH_SEPARATOR}${_VCPKG_INSTALLED}/debug/lib/manual-link/") + set(ENV{LD_LIBRARY_PATH} "${LD_LIBRARY_PATH_BACKUP}${VCPKG_HOST_PATH_SEPARATOR}${_VCPKG_INSTALLED}/debug/lib/${VCPKG_HOST_PATH_SEPARATOR}${_VCPKG_INSTALLED}/debug/lib/manual-link/") + else() + set(ENV{LIBRARY_PATH} "${LIBRARY_PATH_BACKUP}${VCPKG_HOST_PATH_SEPARATOR}${_VCPKG_INSTALLED}/lib/${VCPKG_HOST_PATH_SEPARATOR}${_VCPKG_INSTALLED}/lib/manual-link/") + set(ENV{LD_LIBRARY_PATH} "${LD_LIBRARY_PATH_BACKUP}${VCPKG_HOST_PATH_SEPARATOR}${_VCPKG_INSTALLED}/lib/${VCPKG_HOST_PATH_SEPARATOR}${_VCPKG_INSTALLED}/lib/manual-link/") + endif() endif() if(MAKE_BASH) @@ -217,12 +245,23 @@ function(vcpkg_build_make) endif() endforeach() endif() - + + # Restore enviromnent + set(ENV{CFLAGS} "${C_FLAGS_BACKUP}") + set(ENV{CXXFLAGS} "${CXX_FLAGS_BACKUP}") + set(ENV{LDFLAGS} "${LD_FLAGS_BACKUP}") + + set(ENV{INCLUDE} "${INCLUDE_BACKUP}") + set(ENV{INCLUDE_PATH} "${INCLUDE_PATH_BACKUP}") + set(ENV{C_INCLUDE_PATH} "${C_INCLUDE_PATH_BACKUP}") + set(ENV{CPLUS_INCLUDE_PATH} "${CPLUS_INCLUDE_PATH_BACKUP}") + set(ENV{LIBRARY_PATH} "${LIBRARY_PATH_BACKUP}") + set(ENV{LD_LIBRARY_PATH} "${LD_LIBRARY_PATH_BACKUP}") + if (CMAKE_HOST_WIN32) set(ENV{PATH} "${PATH_GLOBAL}") endif() - set(ENV{CFLAGS} "${C_FLAGS_BACKUP}") - set(ENV{CXXFLAGS} "${CXX_FLAGS_BACKUP}") - set(ENV{LDFLAGS} "${LD_FLAGS_BACKUP}") + + endfunction() From e2e13c24f07241e77c288a098e6722972144c901 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 5 Feb 2020 13:50:12 +0100 Subject: [PATCH 384/419] more env --- scripts/cmake/vcpkg_configure_meson.cmake | 29 ++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index b935d089213dbf..48d6b194ef0c89 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -1,9 +1,19 @@ function(vcpkg_configure_meson) cmake_parse_arguments(_vcm "" "SOURCE_PATH" "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE;PKG_CONFIG_PATHS;PKG_CONFIG_PATHS_DEBUG;PKG_CONFIG_PATHS_RELEASE" ${ARGN}) - file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel) - file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) - + file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") + file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + + if(WIN32) + set(_VCPKG_PREFIX ${CURRENT_PACKAGES_DIR}) + set(_VCPKG_INSTALLED ${CURRENT_INSTALLED_DIR}) + set(EXTRA_QUOTES "\\\"") + else() + string(REPLACE " " "\ " _VCPKG_PREFIX "${CURRENT_PACKAGES_DIR}") + string(REPLACE " " "\ " _VCPKG_INSTALLED "${CURRENT_INSTALLED_DIR}") + set(EXTRA_QUOTES) + endif() + # use the same compiler options as in vcpkg_configure_cmake if(NOT VCPKG_CHAINLOAD_TOOLCHAIN_FILE) set(_MESON_FLAG_SUFFIX "_INIT") @@ -64,8 +74,18 @@ function(vcpkg_configure_meson) vcpkg_add_to_path("${NINJA_PATH}") + if(NOT ENV{PKG_CONFIG}) + find_program(PKGCONFIG pkg-config) + else() + message(STATUS "PKG_CONF ENV found: $ENV{PKG_CONFIG}") + set(PKGCONFIG $ENV{PKG_CONFIG}) + endif() + # configure release if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + if(PKGCONFIG) + set(ENV{PKG_CONFIG} "${PKGCONFIG} --define-variable=prefix=${_VCPKG_INSTALLED}") + endif() message(STATUS "Configuring ${TARGET_TRIPLET}-rel") if(_vcm_PKG_CONFIG_PATHS_RELEASE) set(BACKUP_ENV_PKG_CONFIG_PATH_RELEASE $ENV{PKG_CONFIG_PATH}) @@ -92,6 +112,9 @@ function(vcpkg_configure_meson) endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + if(PKGCONFIG) + set(ENV{PKG_CONFIG} "${PKGCONFIG} --define-variable=prefix=${_VCPKG_INSTALLED}/debug") + endif() # configure debug message(STATUS "Configuring ${TARGET_TRIPLET}-dbg") if(_vcm_PKG_CONFIG_PATHS_DEBUG) From bc74836e68715c7fbb43af87e371197a23f49051 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 5 Feb 2020 13:50:28 +0100 Subject: [PATCH 385/419] port fixes --- ports/elfutils/CONTROL | 2 +- ports/elfutils/configure.dep.patch | 31 ++++++++++++++++++++++++++++++ ports/elfutils/configure.patch | 22 --------------------- ports/elfutils/portfile.cmake | 26 +++++++++++++++++++++---- ports/pciaccess/portfile.cmake | 8 +++++--- ports/xtrans/portfile.cmake | 4 +++- 6 files changed, 62 insertions(+), 31 deletions(-) create mode 100644 ports/elfutils/configure.dep.patch delete mode 100644 ports/elfutils/configure.patch diff --git a/ports/elfutils/CONTROL b/ports/elfutils/CONTROL index a96261c2734daa..f640c63a27ff35 100644 --- a/ports/elfutils/CONTROL +++ b/ports/elfutils/CONTROL @@ -2,4 +2,4 @@ Source: elfutils Version: 0.178 Homepage: https://sourceware.org/elfutils/ Description: elfutils is a collection of utilities and libraries to read, create and modify ELF binary files, find and handle DWARF debug data, symbols, thread state and stacktraces for processes and core files on GNU/Linux. -Build-Depends: +Build-Depends: bzip2, zlib, liblzma diff --git a/ports/elfutils/configure.dep.patch b/ports/elfutils/configure.dep.patch new file mode 100644 index 00000000000000..fadea958bad99d --- /dev/null +++ b/ports/elfutils/configure.dep.patch @@ -0,0 +1,31 @@ +diff --git a/configure b/configure +index 84055e799..3fc7c0bbc 100644 +--- a/configure ++++ b/configure +@@ -5986,7 +5986,7 @@ return gzdirect (); + return 0; + } + _ACEOF +-for ac_lib in '' z; do ++for ac_lib in '' z zd zlib zlibd; do + if test -z "$ac_lib"; then + ac_res="none required" + else +@@ -6077,7 +6077,7 @@ return BZ2_bzdopen (); + return 0; + } + _ACEOF +-for ac_lib in '' bz2; do ++for ac_lib in '' bz2 bz2d; do + if test -z "$ac_lib"; then + ac_res="none required" + else +@@ -6164,7 +6164,7 @@ return lzma_auto_decoder (); + return 0; + } + _ACEOF +-for ac_lib in '' lzma; do ++for ac_lib in '' lzma lzmad; do + if test -z "$ac_lib"; then + ac_res="none required" + else diff --git a/ports/elfutils/configure.patch b/ports/elfutils/configure.patch deleted file mode 100644 index 2099752081d5fb..00000000000000 --- a/ports/elfutils/configure.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 07d371c31..15552315c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -383,7 +383,7 @@ AM_CONDITIONAL(TESTS_RPATH, test "$tests_use_rpath" = yes) - dnl zlib is mandatory. - save_LIBS="$LIBS" - LIBS= --eu_ZIPLIB(zlib,ZLIB,z,gzdirect,gzip) -+eu_ZIPLIB(zlib,ZLIB,z,zlibd,gzdirect,gzip) - AS_IF([test "x$with_zlib" = xno], [AC_MSG_ERROR([zlib not found but is required])]) - LIBS="$save_LIBS" - -@@ -391,7 +391,7 @@ dnl Test for bzlib and xz/lzma, gives BZLIB/LZMALIB .am - dnl conditional and config.h USE_BZLIB/USE_LZMALIB #define. - save_LIBS="$LIBS" - LIBS= --eu_ZIPLIB(bzlib,BZLIB,bz2,BZ2_bzdopen,bzip2) -+eu_ZIPLIB(bzlib,BZLIB,bz2,bz2d,BZ2_bzdopen,bzip2) - # We need this since bzip2 doesn't have a pkgconfig file. - BZ2_LIB="$LIBS" - AC_SUBST([BZ2_LIB]) diff --git a/ports/elfutils/portfile.cmake b/ports/elfutils/portfile.cmake index 45ab403537b48d..ec14a27b817eb6 100644 --- a/ports/elfutils/portfile.cmake +++ b/ports/elfutils/portfile.cmake @@ -12,7 +12,6 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE "${ARCHIVE}" - PATCHES configure.patch ) vcpkg_configure_make( @@ -24,13 +23,33 @@ vcpkg_configure_make( #AUTO_DST #PRERUN_SHELL ${SHELL_PATH} OPTIONS --disable-debuginfod - #OPTIONS_DEBUG - #OPTIONS_RELEASE + OPTIONS_DEBUG + --with-zlib=${CURRENT_INSTALLED_DIR} + --with-bzlib=${CURRENT_INSTALLED_DIR} + --with-lzma=${CURRENT_INSTALLED_DIR} + OPTIONS_RELEASE + --with-zlib=${CURRENT_INSTALLED_DIR}/debug + --with-bzlib=${CURRENT_INSTALLED_DIR}/debug + --with-lzma=${CURRENT_INSTALLED_DIR}/debug + CONFIGURE_PATCHES configure.dep.patch PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" ) + +if(VCPKG_TARGET_IS_WINDOWS) + #zlib patch required + #zlibd patch required + #bz2d patch required + #lzmad patch required +else() + #bz2d patch required + #lzmad patch required +endif() +#vcpkg_apply_patches() + vcpkg_install_make() + vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) @@ -46,7 +65,6 @@ foreach(_tool ${TOOLS}) file(RENAME "${CURRENT_PACKAGES_DIR}/bin/${TOOL_PREFIX}-${_tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/${TOOL_PREFIX}-${_tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}") endforeach() file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(RENAME "${CURRENT_PACKAGES_DIR}/share/man" "${CURRENT_PACKAGES_DIR}/share/${PORT}/man") file(RENAME "${CURRENT_PACKAGES_DIR}/share/locale" "${CURRENT_PACKAGES_DIR}/share/${PORT}/locale") if(VCPKG_LIBRARY_LINKAGE STREQUAL static OR NOT VCPKG_TARGET_IS_WINDOWS) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") diff --git a/ports/pciaccess/portfile.cmake b/ports/pciaccess/portfile.cmake index e03534964794ca..e31847af292a97 100644 --- a/ports/pciaccess/portfile.cmake +++ b/ports/pciaccess/portfile.cmake @@ -21,9 +21,11 @@ vcpkg_configure_make( #AUTO_HOST #AUTO_DST #PRERUN_SHELL ${SHELL_PATH} - OPTIONS --with-zlib - #OPTIONS_DEBUG - #OPTIONS_RELEASE + OPTIONS + OPTIONS_DEBUG + --with-zlib=${CURRENT_INSTALLED_DIR} + OPTIONS_RELEASE + --with-zlib=${CURRENT_INSTALLED_DIR}/debug PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" ) diff --git a/ports/xtrans/portfile.cmake b/ports/xtrans/portfile.cmake index 1d0d53aca0c326..246699e427430a 100644 --- a/ports/xtrans/portfile.cmake +++ b/ports/xtrans/portfile.cmake @@ -43,7 +43,9 @@ file(RENAME "${CURRENT_PACKAGES_DIR}/include/" "${CURRENT_PACKAGES_DIR}/share/${ # the include folder is moved since it contains source files. It is not meant as a traditional include folder but as a shared files folder for different x libraries. file(RENAME "${CURRENT_PACKAGES_DIR}/share/pkgconfig/" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") file(RENAME "${CURRENT_PACKAGES_DIR}/share/aclocal/" "${CURRENT_PACKAGES_DIR}/share/xorg/aclocal") -file(RENAME "${CURRENT_PACKAGES_DIR}/share/doc/" "${CURRENT_PACKAGES_DIR}/share/xorg/doc") + +#file(RENAME "${CURRENT_PACKAGES_DIR}/share/doc/" "${CURRENT_PACKAGES_DIR}/share/xorg/doc") + if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig") file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/" "${CURRENT_PACKAGES_DIR}/share/xorg/debug") From 4bde009d71ab8a8cc43cafb795a535f84ad30967 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 5 Feb 2020 16:45:14 +0100 Subject: [PATCH 386/419] fix replace operation --- ports/zlib/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/zlib/portfile.cmake b/ports/zlib/portfile.cmake index 2a0c7039451397..5f690dcaee61a1 100644 --- a/ports/zlib/portfile.cmake +++ b/ports/zlib/portfile.cmake @@ -33,13 +33,13 @@ vcpkg_fixup_pkgconfig() if(VCPKG_TARGET_IS_WINDOWS) set(_file "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/zlib.pc") file(READ "${_file}" _contents) - file(REPLACE " -lz" " -lzlib" _contents "${_contents}") + string(REPLACE " -lz" " -lzlib" _contents "${_contents}") file(WRITE "${_file}" "${_contents}") set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/zlib.pc") if(EXISTS "${_file}") file(READ "${_file}" _contents) - file(REPLACE " -lz" " -lzlibd" _contents "${_contents}") + string(REPLACE " -lz" " -lzlibd" _contents "${_contents}") file(WRITE "${_file}" "${_contents}") endif() endif() From 6bd2cb9210f47250a5aad754ceb8a7153742d0a1 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 6 Feb 2020 01:16:48 +0100 Subject: [PATCH 387/419] working commit y/N --- ports/applewm/portfile.cmake | 4 +-- ports/dmx/portfile.cmake | 4 +-- ports/drm/portfile.cmake | 4 +-- ports/elfutils/portfile.cmake | 4 +-- ports/font-util/portfile.cmake | 4 +-- ports/fontenc/portfile.cmake | 4 +-- ports/fs/portfile.cmake | 4 +-- ports/ice/portfile.cmake | 4 +-- ports/mesa/portfile.cmake | 4 +-- ports/pciaccess/portfile.cmake | 4 +-- ports/pthread-stubs/portfile.cmake | 4 +-- ports/sm/portfile.cmake | 4 +-- ports/wayland-protocols/portfile.cmake | 4 +-- ports/wayland/portfile.cmake | 4 +-- ports/xau/portfile.cmake | 4 +-- ports/xaw/portfile.cmake | 4 +-- ports/xaw3d/portfile.cmake | 4 +-- ports/xcb-cursor/portfile.cmake | 4 +-- ports/xcb-errors/portfile.cmake | 4 +-- ports/xcb-image/portfile.cmake | 4 +-- ports/xcb-keysyms/portfile.cmake | 4 +-- ports/xcb-proto/portfile.cmake | 4 +-- ports/xcb-render-util/portfile.cmake | 4 +-- ports/xcb-util/portfile.cmake | 4 +-- ports/xcb-wm/portfile.cmake | 4 +-- ports/xcb/portfile.cmake | 26 +++++++-------- ports/xcomposite/portfile.cmake | 4 +-- ports/xcursor/portfile.cmake | 4 +-- ports/xcwm/portfile.cmake | 4 +-- ports/xdamage/portfile.cmake | 4 +-- ports/xdmcp/portfile.cmake | 14 ++++++--- ports/xext/portfile.cmake | 4 +-- ports/xfixes/portfile.cmake | 4 +-- ports/xfont/portfile.cmake | 4 +-- ports/xft/portfile.cmake | 4 +-- ports/xi/portfile.cmake | 4 +-- ports/xinerama/portfile.cmake | 4 +-- ports/xkbcommon/portfile.cmake | 4 +-- ports/xkbfile/portfile.cmake | 4 +-- ports/xlib/portfile.cmake | 4 +-- ports/xmu/portfile.cmake | 4 +-- ports/xorg-macros/portfile.cmake | 4 +-- ports/xp/portfile.cmake | 4 +-- ports/xpm/portfile.cmake | 4 +-- ports/xpresent/portfile.cmake | 4 +-- ports/xproto/portfile.cmake | 4 +-- ports/xrandr/portfile.cmake | 4 +-- ports/xrandrutils/portfile.cmake | 4 +-- ports/xrender/portfile.cmake | 4 +-- ports/xres/portfile.cmake | 4 +-- ports/xscrnsaver/portfile.cmake | 4 +-- ports/xserver/portfile.cmake | 4 +-- ports/xshmfence/portfile.cmake | 4 +-- ports/xt/portfile.cmake | 4 +-- ports/xtrans/portfile.cmake | 4 +-- ports/xv/portfile.cmake | 4 +-- ports/xvmc/portfile.cmake | 4 +-- ports/xxf86dga/portfile.cmake | 4 +-- ports/xxf86vm/portfile.cmake | 4 +-- scripts/cmake/vcpkg_build_make.cmake | 25 ++++++++++----- scripts/cmake/vcpkg_configure_make.cmake | 40 +++++++++++++++--------- 61 files changed, 180 insertions(+), 153 deletions(-) diff --git a/ports/applewm/portfile.cmake b/ports/applewm/portfile.cmake index 3c213033fc0926..93b93184450a3a 100644 --- a/ports/applewm/portfile.cmake +++ b/ports/applewm/portfile.cmake @@ -23,8 +23,8 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_make() diff --git a/ports/dmx/portfile.cmake b/ports/dmx/portfile.cmake index a538f4f4375c62..5063e88588c590 100644 --- a/ports/dmx/portfile.cmake +++ b/ports/dmx/portfile.cmake @@ -22,8 +22,8 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_make() diff --git a/ports/drm/portfile.cmake b/ports/drm/portfile.cmake index a67b4561fab540..cd7cc0d346219d 100644 --- a/ports/drm/portfile.cmake +++ b/ports/drm/portfile.cmake @@ -12,8 +12,8 @@ vcpkg_from_gitlab( vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_meson() diff --git a/ports/elfutils/portfile.cmake b/ports/elfutils/portfile.cmake index ec14a27b817eb6..5d257d37d5be28 100644 --- a/ports/elfutils/portfile.cmake +++ b/ports/elfutils/portfile.cmake @@ -32,8 +32,8 @@ vcpkg_configure_make( --with-bzlib=${CURRENT_INSTALLED_DIR}/debug --with-lzma=${CURRENT_INSTALLED_DIR}/debug CONFIGURE_PATCHES configure.dep.patch - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) if(VCPKG_TARGET_IS_WINDOWS) diff --git a/ports/font-util/portfile.cmake b/ports/font-util/portfile.cmake index 30c0d890ea2bab..c23ab35eff4b25 100644 --- a/ports/font-util/portfile.cmake +++ b/ports/font-util/portfile.cmake @@ -23,8 +23,8 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_make() diff --git a/ports/fontenc/portfile.cmake b/ports/fontenc/portfile.cmake index 85029d61bad489..e632bbde5fd4bb 100644 --- a/ports/fontenc/portfile.cmake +++ b/ports/fontenc/portfile.cmake @@ -22,8 +22,8 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_make() diff --git a/ports/fs/portfile.cmake b/ports/fs/portfile.cmake index e0834e6d9eaecb..ba3c325e680b97 100644 --- a/ports/fs/portfile.cmake +++ b/ports/fs/portfile.cmake @@ -23,8 +23,8 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_make() diff --git a/ports/ice/portfile.cmake b/ports/ice/portfile.cmake index a8a8d7e4f6878a..fce3cec6ee9c3c 100644 --- a/ports/ice/portfile.cmake +++ b/ports/ice/portfile.cmake @@ -23,8 +23,8 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_make() diff --git a/ports/mesa/portfile.cmake b/ports/mesa/portfile.cmake index 05fb4263295d36..105d532a4aa6de 100644 --- a/ports/mesa/portfile.cmake +++ b/ports/mesa/portfile.cmake @@ -25,8 +25,8 @@ vcpkg_configure_meson( -D gles-lib-suffix=_mesa -D egl-lib-suffix=_mesa "${MESA_OPTIONS}" - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_meson() diff --git a/ports/pciaccess/portfile.cmake b/ports/pciaccess/portfile.cmake index e31847af292a97..2b2a706938aa45 100644 --- a/ports/pciaccess/portfile.cmake +++ b/ports/pciaccess/portfile.cmake @@ -26,8 +26,8 @@ vcpkg_configure_make( --with-zlib=${CURRENT_INSTALLED_DIR} OPTIONS_RELEASE --with-zlib=${CURRENT_INSTALLED_DIR}/debug - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_make() diff --git a/ports/pthread-stubs/portfile.cmake b/ports/pthread-stubs/portfile.cmake index 75028f6d739667..a5095780a9e8d5 100644 --- a/ports/pthread-stubs/portfile.cmake +++ b/ports/pthread-stubs/portfile.cmake @@ -24,8 +24,8 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_make() diff --git a/ports/sm/portfile.cmake b/ports/sm/portfile.cmake index 0f8ea81ff4f205..4b031a1a21c790 100644 --- a/ports/sm/portfile.cmake +++ b/ports/sm/portfile.cmake @@ -23,8 +23,8 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_make() diff --git a/ports/wayland-protocols/portfile.cmake b/ports/wayland-protocols/portfile.cmake index 536b0ac9f6986c..88dc781c188d0e 100644 --- a/ports/wayland-protocols/portfile.cmake +++ b/ports/wayland-protocols/portfile.cmake @@ -23,8 +23,8 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_make() diff --git a/ports/wayland/portfile.cmake b/ports/wayland/portfile.cmake index 65382cf16a6785..202ed3bce57f25 100644 --- a/ports/wayland/portfile.cmake +++ b/ports/wayland/portfile.cmake @@ -19,8 +19,8 @@ vcpkg_configure_meson( OPTIONS -Dcmake_prefix_path="${CURRENT_INSTALLED_DIR}" -Ddtd_validation=false -Ddocumentation=false - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_meson() diff --git a/ports/xau/portfile.cmake b/ports/xau/portfile.cmake index c1e3eb3662794d..241c6498d0f558 100644 --- a/ports/xau/portfile.cmake +++ b/ports/xau/portfile.cmake @@ -29,8 +29,8 @@ vcpkg_configure_make( OPTIONS ${OPTIONS} #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_make() diff --git a/ports/xaw/portfile.cmake b/ports/xaw/portfile.cmake index b551a8817397b2..913f9dc838898c 100644 --- a/ports/xaw/portfile.cmake +++ b/ports/xaw/portfile.cmake @@ -23,8 +23,8 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_make() diff --git a/ports/xaw3d/portfile.cmake b/ports/xaw3d/portfile.cmake index 1fb3d24599a946..a16d4a01fb6cc8 100644 --- a/ports/xaw3d/portfile.cmake +++ b/ports/xaw3d/portfile.cmake @@ -23,8 +23,8 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_make() diff --git a/ports/xcb-cursor/portfile.cmake b/ports/xcb-cursor/portfile.cmake index 790208de5b50c6..689e1e2bdbf6b9 100644 --- a/ports/xcb-cursor/portfile.cmake +++ b/ports/xcb-cursor/portfile.cmake @@ -26,8 +26,8 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_make() diff --git a/ports/xcb-errors/portfile.cmake b/ports/xcb-errors/portfile.cmake index 07a985024185c8..edf81e00b75f40 100644 --- a/ports/xcb-errors/portfile.cmake +++ b/ports/xcb-errors/portfile.cmake @@ -22,8 +22,8 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_make() diff --git a/ports/xcb-image/portfile.cmake b/ports/xcb-image/portfile.cmake index 4b0bd8fad0efea..f9cfaddb4cb454 100644 --- a/ports/xcb-image/portfile.cmake +++ b/ports/xcb-image/portfile.cmake @@ -22,8 +22,8 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_make() diff --git a/ports/xcb-keysyms/portfile.cmake b/ports/xcb-keysyms/portfile.cmake index d8ae8d5a074c0a..f07f9da3a6979d 100644 --- a/ports/xcb-keysyms/portfile.cmake +++ b/ports/xcb-keysyms/portfile.cmake @@ -22,8 +22,8 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_make() diff --git a/ports/xcb-proto/portfile.cmake b/ports/xcb-proto/portfile.cmake index cea3a448ec7836..266182b093597a 100644 --- a/ports/xcb-proto/portfile.cmake +++ b/ports/xcb-proto/portfile.cmake @@ -42,8 +42,8 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_make() diff --git a/ports/xcb-render-util/portfile.cmake b/ports/xcb-render-util/portfile.cmake index 7da02dbed85a1d..f81509cf7fb2b8 100644 --- a/ports/xcb-render-util/portfile.cmake +++ b/ports/xcb-render-util/portfile.cmake @@ -22,8 +22,8 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_make() diff --git a/ports/xcb-util/portfile.cmake b/ports/xcb-util/portfile.cmake index 0104f8dd9837b2..e5ded40599987a 100644 --- a/ports/xcb-util/portfile.cmake +++ b/ports/xcb-util/portfile.cmake @@ -23,8 +23,8 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_make() diff --git a/ports/xcb-wm/portfile.cmake b/ports/xcb-wm/portfile.cmake index b1208aa7effd65..5a736a00143c0a 100644 --- a/ports/xcb-wm/portfile.cmake +++ b/ports/xcb-wm/portfile.cmake @@ -22,8 +22,8 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_make() diff --git a/ports/xcb/portfile.cmake b/ports/xcb/portfile.cmake index ff438f3d1a7f3d..19f15ef571832c 100644 --- a/ports/xcb/portfile.cmake +++ b/ports/xcb/portfile.cmake @@ -1,9 +1,5 @@ ## requires AUTOCONF, LIBTOOL and PKCONF -file(GLOB_RECURSE _xorgfiles "${CURRENT_INSTALLED_DIR}/share/xorg/*") -message(STATUS "############# xorg files: ${_xorgfiles}") -file(GLOB_RECURSE _xcbfiles "${CURRENT_INSTALLED_DIR}/share/xcb/*") -message(STATUS "############# xcb files: ${_xcbfiles}") vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org/xorg OUT_SOURCE_PATH SOURCE_PATH @@ -15,11 +11,16 @@ vcpkg_from_gitlab( ) set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") +if(VCPKG_TARGET_IS_WINDOWS) + set(OPTIONS --disable-dependency-tracking) + #list(APPEND VCPKG_CXX_FLAGS /D__ILP32__) + #list(APPEND VCPKG_C_FLAGS /D__ILP32__) +endif() -vcpkg_find_acquire_program(PYTHON3) -get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) -file(TO_NATIVE_PATH "${PYTHON3_DIR}" PYTHON3_DIR_NATIVE) -vcpkg_add_to_path("${PYTHON3_DIR}") +vcpkg_find_acquire_program(PYTHON2) +get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY) +file(TO_NATIVE_PATH "${PYTHON2_DIR}" PYTHON3_DIR_NATIVE) +vcpkg_add_to_path("${PYTHON2_DIR}") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} @@ -29,14 +30,13 @@ vcpkg_configure_make( #AUTO_HOST #AUTO_DST #PRERUN_SHELL ${SHELL_PATH} - #OPTIONS + OPTIONS ${OPTIONS} #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/xcb/") -vcpkg_install_make() +vcpkg_install_make(MAKE_OPTIONS -k --print-data-base) vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/xcomposite/portfile.cmake b/ports/xcomposite/portfile.cmake index 442fd4397e6c2f..0f9a980c617825 100644 --- a/ports/xcomposite/portfile.cmake +++ b/ports/xcomposite/portfile.cmake @@ -23,8 +23,8 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_make() diff --git a/ports/xcursor/portfile.cmake b/ports/xcursor/portfile.cmake index 45a81680485332..8027f9a1abf7ca 100644 --- a/ports/xcursor/portfile.cmake +++ b/ports/xcursor/portfile.cmake @@ -23,8 +23,8 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_make() diff --git a/ports/xcwm/portfile.cmake b/ports/xcwm/portfile.cmake index b675722bb1107f..470c8a4aecb09f 100644 --- a/ports/xcwm/portfile.cmake +++ b/ports/xcwm/portfile.cmake @@ -26,8 +26,8 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_make() diff --git a/ports/xdamage/portfile.cmake b/ports/xdamage/portfile.cmake index ddafa797dc0488..3d65e7abefd747 100644 --- a/ports/xdamage/portfile.cmake +++ b/ports/xdamage/portfile.cmake @@ -23,8 +23,8 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_make() diff --git a/ports/xdmcp/portfile.cmake b/ports/xdmcp/portfile.cmake index cdd9a44c32261b..9ed28688744787 100644 --- a/ports/xdmcp/portfile.cmake +++ b/ports/xdmcp/portfile.cmake @@ -1,5 +1,5 @@ message(STATUS "----- ${PORT} requires autoconf, libtool and pkconf from the system package manager! -----") - +SET(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled) # this is a lie but the lib has a different name than the dll vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org/xorg OUT_SOURCE_PATH SOURCE_PATH @@ -11,7 +11,11 @@ vcpkg_from_gitlab( ) set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") - +if(VCPKG_TARGET_IS_WINDOWS) + set(OPTIONS --disable-dependency-tracking) + list(APPEND VCPKG_CXX_FLAGS /D__ILP32__) + list(APPEND VCPKG_C_FLAGS /D__ILP32__) +endif() vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} AUTOCONFIG @@ -20,11 +24,11 @@ vcpkg_configure_make( #AUTO_HOST #AUTO_DST #PRERUN_SHELL "export ACLOCAL=\"aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/\"" - #OPTIONS + OPTIONS ${OPTIONS} #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_make() diff --git a/ports/xext/portfile.cmake b/ports/xext/portfile.cmake index d64ea7fe3ab96e..0742489247f774 100644 --- a/ports/xext/portfile.cmake +++ b/ports/xext/portfile.cmake @@ -24,8 +24,8 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_make() diff --git a/ports/xfixes/portfile.cmake b/ports/xfixes/portfile.cmake index 8e70077e127326..69490c21339e8d 100644 --- a/ports/xfixes/portfile.cmake +++ b/ports/xfixes/portfile.cmake @@ -24,8 +24,8 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_make() diff --git a/ports/xfont/portfile.cmake b/ports/xfont/portfile.cmake index 1a113ed666b762..541cbd2f661b7b 100644 --- a/ports/xfont/portfile.cmake +++ b/ports/xfont/portfile.cmake @@ -23,8 +23,8 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_make() diff --git a/ports/xft/portfile.cmake b/ports/xft/portfile.cmake index 192d0050fcfdb5..95488c8dc99132 100644 --- a/ports/xft/portfile.cmake +++ b/ports/xft/portfile.cmake @@ -23,8 +23,8 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_make() diff --git a/ports/xi/portfile.cmake b/ports/xi/portfile.cmake index 2e4a4842ca910e..f9c5344ae218bf 100644 --- a/ports/xi/portfile.cmake +++ b/ports/xi/portfile.cmake @@ -24,8 +24,8 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_make() diff --git a/ports/xinerama/portfile.cmake b/ports/xinerama/portfile.cmake index 66560e82f81d22..d99f309f3f264e 100644 --- a/ports/xinerama/portfile.cmake +++ b/ports/xinerama/portfile.cmake @@ -24,8 +24,8 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_make() diff --git a/ports/xkbcommon/portfile.cmake b/ports/xkbcommon/portfile.cmake index 83285b80872b22..6793811d7d3ffa 100644 --- a/ports/xkbcommon/portfile.cmake +++ b/ports/xkbcommon/portfile.cmake @@ -18,8 +18,8 @@ vcpkg_configure_meson( OPTIONS -Denable-wayland=false -Denable-docs=false - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_meson() vcpkg_fixup_pkgconfig() diff --git a/ports/xkbfile/portfile.cmake b/ports/xkbfile/portfile.cmake index f97b15c060f945..f987f4ee50e772 100644 --- a/ports/xkbfile/portfile.cmake +++ b/ports/xkbfile/portfile.cmake @@ -22,8 +22,8 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_make() diff --git a/ports/xlib/portfile.cmake b/ports/xlib/portfile.cmake index c7b6482b8b9fe6..03481ca24d8580 100644 --- a/ports/xlib/portfile.cmake +++ b/ports/xlib/portfile.cmake @@ -24,8 +24,8 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_make() diff --git a/ports/xmu/portfile.cmake b/ports/xmu/portfile.cmake index 05a0d239c39d00..05a089416c08d1 100644 --- a/ports/xmu/portfile.cmake +++ b/ports/xmu/portfile.cmake @@ -23,8 +23,8 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_make() diff --git a/ports/xorg-macros/portfile.cmake b/ports/xorg-macros/portfile.cmake index c4ecd68a2d7e2d..073a95bf54b097 100644 --- a/ports/xorg-macros/portfile.cmake +++ b/ports/xorg-macros/portfile.cmake @@ -24,8 +24,8 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_make() diff --git a/ports/xp/portfile.cmake b/ports/xp/portfile.cmake index bf197f77182e4a..09cc7421ca55bf 100644 --- a/ports/xp/portfile.cmake +++ b/ports/xp/portfile.cmake @@ -24,8 +24,8 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_make() diff --git a/ports/xpm/portfile.cmake b/ports/xpm/portfile.cmake index 8309d83034cb5d..fc72598cf1be48 100644 --- a/ports/xpm/portfile.cmake +++ b/ports/xpm/portfile.cmake @@ -23,8 +23,8 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_make() diff --git a/ports/xpresent/portfile.cmake b/ports/xpresent/portfile.cmake index db962dffdea8ea..c70e6ab9cb6f58 100644 --- a/ports/xpresent/portfile.cmake +++ b/ports/xpresent/portfile.cmake @@ -24,8 +24,8 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_make() diff --git a/ports/xproto/portfile.cmake b/ports/xproto/portfile.cmake index 72d7fd349f6fa2..f4f1ea726b8c7e 100644 --- a/ports/xproto/portfile.cmake +++ b/ports/xproto/portfile.cmake @@ -28,8 +28,8 @@ vcpkg_configure_make( OPTIONS ${OPTIONS} #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_make() diff --git a/ports/xrandr/portfile.cmake b/ports/xrandr/portfile.cmake index ebcbb5e41e08e0..f904b1c615a91d 100644 --- a/ports/xrandr/portfile.cmake +++ b/ports/xrandr/portfile.cmake @@ -23,8 +23,8 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_make() diff --git a/ports/xrandrutils/portfile.cmake b/ports/xrandrutils/portfile.cmake index cd065c36ba37d2..353a8162536ac9 100644 --- a/ports/xrandrutils/portfile.cmake +++ b/ports/xrandrutils/portfile.cmake @@ -23,8 +23,8 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_make() diff --git a/ports/xrender/portfile.cmake b/ports/xrender/portfile.cmake index b353e6f5ebd071..dbcfcabe042883 100644 --- a/ports/xrender/portfile.cmake +++ b/ports/xrender/portfile.cmake @@ -24,8 +24,8 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_make() diff --git a/ports/xres/portfile.cmake b/ports/xres/portfile.cmake index 6ea3f0aeefd57c..93775c2f4dce2d 100644 --- a/ports/xres/portfile.cmake +++ b/ports/xres/portfile.cmake @@ -23,8 +23,8 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_make() diff --git a/ports/xscrnsaver/portfile.cmake b/ports/xscrnsaver/portfile.cmake index ed97e86bf3e6b5..1d62c72b30a7ad 100644 --- a/ports/xscrnsaver/portfile.cmake +++ b/ports/xscrnsaver/portfile.cmake @@ -23,8 +23,8 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_make() diff --git a/ports/xserver/portfile.cmake b/ports/xserver/portfile.cmake index ad461a54952b2a..4bfb126e42a2cd 100644 --- a/ports/xserver/portfile.cmake +++ b/ports/xserver/portfile.cmake @@ -16,8 +16,8 @@ vcpkg_add_to_path("${MSYS_ROOT}/usr/bin") vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_meson() vcpkg_fixup_pkgconfig() diff --git a/ports/xshmfence/portfile.cmake b/ports/xshmfence/portfile.cmake index a9fc57ae42e874..f849fc1cb6a215 100644 --- a/ports/xshmfence/portfile.cmake +++ b/ports/xshmfence/portfile.cmake @@ -22,8 +22,8 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_make() diff --git a/ports/xt/portfile.cmake b/ports/xt/portfile.cmake index b3860afcc0d680..c32e2ad701adfb 100644 --- a/ports/xt/portfile.cmake +++ b/ports/xt/portfile.cmake @@ -23,8 +23,8 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_make() diff --git a/ports/xtrans/portfile.cmake b/ports/xtrans/portfile.cmake index 246699e427430a..2c928390c82dc8 100644 --- a/ports/xtrans/portfile.cmake +++ b/ports/xtrans/portfile.cmake @@ -24,8 +24,8 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_make() diff --git a/ports/xv/portfile.cmake b/ports/xv/portfile.cmake index 19d53e917e54de..85277ebda5cfa9 100644 --- a/ports/xv/portfile.cmake +++ b/ports/xv/portfile.cmake @@ -23,8 +23,8 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_make() diff --git a/ports/xvmc/portfile.cmake b/ports/xvmc/portfile.cmake index a7c7be69a88c42..695aefc044c7a6 100644 --- a/ports/xvmc/portfile.cmake +++ b/ports/xvmc/portfile.cmake @@ -23,8 +23,8 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_make() diff --git a/ports/xxf86dga/portfile.cmake b/ports/xxf86dga/portfile.cmake index 326658793ea782..3b99b6735d5eba 100644 --- a/ports/xxf86dga/portfile.cmake +++ b/ports/xxf86dga/portfile.cmake @@ -23,8 +23,8 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_make() diff --git a/ports/xxf86vm/portfile.cmake b/ports/xxf86vm/portfile.cmake index 664906e7aa79ae..345da69c3d1c7e 100644 --- a/ports/xxf86vm/portfile.cmake +++ b/ports/xxf86vm/portfile.cmake @@ -23,8 +23,8 @@ vcpkg_configure_make( #OPTIONS #OPTIONS_DEBUG #OPTIONS_RELEASE - PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/" - PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/" + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) vcpkg_install_make() diff --git a/scripts/cmake/vcpkg_build_make.cmake b/scripts/cmake/vcpkg_build_make.cmake index 388ecd546f2980..900634b2aae075 100644 --- a/scripts/cmake/vcpkg_build_make.cmake +++ b/scripts/cmake/vcpkg_build_make.cmake @@ -26,7 +26,7 @@ ## * [freexl](https://github.com/Microsoft/vcpkg/blob/master/ports/freexl/portfile.cmake) ## * [libosip2](https://github.com/Microsoft/vcpkg/blob/master/ports/libosip2/portfile.cmake) function(vcpkg_build_make) - cmake_parse_arguments(_bc "ADD_BIN_TO_PATH;ENABLE_INSTALL" "LOGFILE_ROOT" "" ${ARGN}) + cmake_parse_arguments(_bc "ADD_BIN_TO_PATH;ENABLE_INSTALL" "LOGFILE_ROOT" "MAKE_OPTIONS" ${ARGN}) if(NOT _bc_LOGFILE_ROOT) set(_bc_LOGFILE_ROOT "build") @@ -68,23 +68,24 @@ function(vcpkg_build_make) vcpkg_add_to_path("${MSYS_ROOT}/mingw64/x86_64-w64-mingw32/bin") endif() endif() - vcpkg_add_to_path("${MSYS_ROOT}/usr/bin") + #vcpkg_add_to_path("${MSYS_ROOT}/usr/bin") vcpkg_add_to_path("${PERL_EXE_PATH}") - find_program(MAKE make REQUIRED) + find_program(MAKE mingw32-make make REQUIRED) set(BASH "${MSYS_ROOT}/usr/bin/bash.exe") # Set make command and install command set(MAKE_BASH "${BASH}" --noprofile --norc -c) - set(MAKE_COMMAND "make") + set(MAKE_COMMAND "${MAKE}") + message(STATUS ${MAKE_COMMAND}) # Must use absolute path to call make in windows - set(MAKE_OPTS "-j ${VCPKG_CONCURRENCY} -f makefile all --no-silent") - set(INSTALL_OPTS "install -j ${VCPKG_CONCURRENCY} --no-silent") + set(MAKE_OPTS "${_bc_MAKE_OPTIONS} -j ${VCPKG_CONCURRENCY}") + set(INSTALL_OPTS "install -j ${VCPKG_CONCURRENCY} --trace") else() # Compiler requriements set(MAKE_BASH) find_program(MAKE make REQUIRED) set(MAKE_COMMAND ${MAKE}) # Set make command and install command - set(MAKE_OPTS -j ${VCPKG_CONCURRENCY} -f makefile all) + set(MAKE_OPTS -j ${VCPKG_CONCURRENCY} -f makefile all ${_bc_MAKE_OPTIONS}) set(INSTALL_OPTS install) endif() elseif (_VCPKG_MAKE_GENERATOR STREQUAL "nmake") @@ -178,6 +179,16 @@ function(vcpkg_build_make) set(TMP_LDFLAGS "${LD_FLAGS_GLOBAL} ${VCPKG_LINKER_FLAGS_${CMAKE_BUILDTYPE}}") string(REGEX REPLACE "[ \t]+/" " -" TMP_LDFLAGS "${TMP_LDFLAGS}") set(ENV{LDFLAGS} ${TMP_LDFLAGS}) + + string(REPLACE " " "\ " _VCPKG_INSTALLED_PKGCONF "${CURRENT_INSTALLED_DIR}") + string(REGEX REPLACE "([a-zA-Z]):/" "/\\1/" _VCPKG_INSTALLED_PKGCONF "${_VCPKG_INSTALLED_PKGCONF}") + string(REPLACE "\\" "/" _VCPKG_INSTALLED_PKGCONF "${_VCPKG_INSTALLED_PKGCONF}") + if(BUILDTYPE STREQUAL "debug") + set(ENV{VCPKG_PKG_PREFIX} ${_VCPKG_INSTALLED_PKGCONF}/debug) + else() + set(ENV{VCPKG_PKG_PREFIX} ${_VCPKG_INSTALLED_PKGCONF}) + endif() + else() set(ENV{CFLAGS} "${C_FLAGS_GLOBAL} ${VCPKG_C_FLAGS_${CMAKE_BUILDTYPE}}") set(ENV{CXXFLAGS} "${CXX_FLAGS_GLOBAL} ${VCPKG_CXX_FLAGS_${CMAKE_BUILDTYPE}}") diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index 2dcba3bc60f05c..69297db1f237cb 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -192,9 +192,15 @@ function(vcpkg_configure_make) else() message(FATAL_ERROR "${GENERATOR} not supported.") endif() - + + if(${CURRENT_PACKAGES_DIR} MATCHES " " OR ${CURRENT_INSTALLED_DIR} MATCHES " ") + # Don't bother with whitespaces on Linux. The tools will fail anyway and I tried very hard to make it work! + message(WARNING "Detected whitespace in root directory. Please move the path to one without whitespaces! The required tools do not handle whitespaces correctly and the build will most likely fail") + endif() + # Pre-processing windows configure requirements if (CMAKE_HOST_WIN32) + ## Please read https://github.com/orlp/dev-on-windows/wiki/Installing-GCC--&-MSYS2 set(VCPKG_POLICY_SKIP_DUMPBIN_CHECKS enabled PARENT_SCOPE) # since we cannot use dumpbin on the generated dll'ds vcpkg_find_acquire_program(YASM) @@ -240,26 +246,28 @@ function(vcpkg_configure_make) vcpkg_add_to_path("${PERL_EXE_PATH}") set(BASH "${MSYS_ROOT}/usr/bin/bash.exe") elseif (_csc_AUTOCONFIG) - if(${CURRENT_PACKAGES_DIR} MATCHES " " OR ${CURRENT_INSTALLED_DIR} MATCHES " ") - # Don't bother with whitespaces on Linux. The tools will fail anyway and I tried very hard to make it work! - message(FATAL_ERROR "Detected whitespace in CURRENT_PACKAGES_DIR or CURRENT_INSTALLED_DIR. Please remove the whitespaces from the paths! The required tools do not handle whitespaces correctly") - endif() find_program(AUTORECONF autoreconf REQUIRED) find_program(LIBTOOL libtool REQUIRED) - if(NOT ENV{PKG_CONFIG}) - find_program(PKGCONFIG pkg-config REQUIRED) - else() - message(STATUS "PKG_CONF ENV found: $ENV{PKG_CONFIG}") - set(PKGCONFIG $ENV{PKG_CONFIG}) - endif() + endif() + + if(NOT ENV{PKG_CONFIG}) + find_program(PKGCONFIG pkg-config REQUIRED) + message(STATUS "Using pkg-config from: ${PKGCONFIG}") + else() + message(STATUS "PKG_CONF ENV found! Using: $ENV{PKG_CONFIG}") + set(PKGCONFIG $ENV{PKG_CONFIG}) endif() file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}") if(WIN32) - set(_VCPKG_PREFIX ${CURRENT_PACKAGES_DIR}) + string(REPLACE " " "\\\ " _VCPKG_PREFIX "${CURRENT_PACKAGES_DIR}") + #string(REGEX REPLACE "([a-zA-Z]):/" "/\\1/" _VCPKG_PREFIX "${_VCPKG_PREFIX}") set(_VCPKG_INSTALLED ${CURRENT_INSTALLED_DIR}) + string(REPLACE " " "\ " _VCPKG_INSTALLED_PKGCONF "${CURRENT_INSTALLED_DIR}") + string(REGEX REPLACE "([a-zA-Z]):/" "/\\1/" _VCPKG_INSTALLED_PKGCONF "${_VCPKG_INSTALLED_PKGCONF}") + string(REPLACE "\\" "/" _VCPKG_INSTALLED_PKGCONF "${_VCPKG_INSTALLED_PKGCONF}") set(EXTRA_QUOTES "\\\"") else() string(REPLACE " " "\ " _VCPKG_PREFIX "${CURRENT_PACKAGES_DIR}") @@ -349,8 +357,8 @@ function(vcpkg_configure_make) set(ENV{CPLUS_INCLUDE_PATH} "${_VCPKG_INSTALLED}/include${VCPKG_HOST_PATH_SEPARATOR}${CPLUS_INCLUDE_PATH_BACKUP}") # Setup global flags - set(C_FLAGS_GLOBAL "$ENV{CFLAGS} -I\"${_VCPKG_INSTALLED}/include\" ${VCPKG_C_FLAGS}") - set(CXX_FLAGS_GLOBAL "$ENV{CXXFLAGS} -I\"${_VCPKG_INSTALLED}/include\" ${VCPKG_CXX_FLAGS}") + set(C_FLAGS_GLOBAL "$ENV{CFLAGS} ${VCPKG_C_FLAGS}") + set(CXX_FLAGS_GLOBAL "$ENV{CXXFLAGS} ${VCPKG_CXX_FLAGS}") set(LD_FLAGS_GLOBAL "$ENV{LDFLAGS} ${VCPKG_LINKER_FLAGS}") if(NOT VCPKG_TARGET_IS_WINDOWS) string(APPEND C_FLAGS_GLOBAL " -fPIC") @@ -380,6 +388,8 @@ function(vcpkg_configure_make) set(TMP_LDFLAGS "${LD_FLAGS_GLOBAL} ${VCPKG_LINKER_FLAGS_DEBUG}") string(REGEX REPLACE "[ \t]+/" " -" TMP_LDFLAGS "${TMP_LDFLAGS}") set(ENV{LDFLAGS} ${TMP_LDFLAGS}) + set(ENV{VCPKG_PKG_PREFIX} ${_VCPKG_INSTALLED_PKGCONF}/debug) + set(ENV{PKG_CONFIG} "${PKGCONFIG} --define-variable=prefix=$(VCPKG_PKG_PREFIX)") else() set(ENV{CFLAGS} "${C_FLAGS_GLOBAL} ${VCPKG_C_FLAGS_DEBUG}") set(ENV{CXXFLAGS} "${CXX_FLAGS_GLOBAL} ${VCPKG_CXX_FLAGS_DEBUG}") @@ -470,6 +480,8 @@ function(vcpkg_configure_make) set(TMP_LDFLAGS "${LD_FLAGS_GLOBAL} ${VCPKG_LINKER_FLAGS_RELEASE}") string(REGEX REPLACE "[ \t]+/" " -" TMP_LDFLAGS "${TMP_LDFLAGS}") set(ENV{LDFLAGS} ${TMP_LDFLAGS}) + set(ENV{VCPKG_PKG_PREFIX} ${_VCPKG_INSTALLED_PKGCONF}) + set(ENV{PKG_CONFIG} "${PKGCONFIG} --define-variable=prefix=$(VCPKG_PKG_PREFIX)") else() set(ENV{CFLAGS} "${C_FLAGS_GLOBAL} ${VCPKG_C_FLAGS_RELEASE}") set(ENV{CXXFLAGS} "${CXX_FLAGS_GLOBAL} ${VCPKG_CXX_FLAGS_RELEASE}") From 293e634cbf26186f48b334c5667043b6b02cf617 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 6 Feb 2020 01:26:08 +0100 Subject: [PATCH 388/419] allow libxstl to build tool --- ports/libxslt/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/libxslt/portfile.cmake b/ports/libxslt/portfile.cmake index 5ab963bff92680..747f4f1cdcddf5 100644 --- a/ports/libxslt/portfile.cmake +++ b/ports/libxslt/portfile.cmake @@ -23,7 +23,7 @@ if (VCPKG_TARGET_IS_WINDOWS) prefix=@INSTALL_DIR@ include=@INCLUDE_DIR@ lib=@LIB_DIR@ - bindir=$(PREFIX)\\tools\\ + bindir=$(PREFIX)\\share\\tools\\${PORT} sodir=$(PREFIX)\\bin\\ ) # Debug params @@ -144,7 +144,7 @@ endif() file(WRITE ${CURRENT_PACKAGES_DIR}/include/libexslt/exsltexports.h "${EXSLTEXPORTS_H}") # Remove tools and debug include directories -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools) +#file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/tools) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) From 136dc1e8fb5b739eae4f689077e19e7bbb9cae82 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 6 Feb 2020 13:53:54 +0100 Subject: [PATCH 389/419] make tool available --- ports/libxslt/portfile.cmake | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ports/libxslt/portfile.cmake b/ports/libxslt/portfile.cmake index 747f4f1cdcddf5..a7487fed9debf7 100644 --- a/ports/libxslt/portfile.cmake +++ b/ports/libxslt/portfile.cmake @@ -23,7 +23,7 @@ if (VCPKG_TARGET_IS_WINDOWS) prefix=@INSTALL_DIR@ include=@INCLUDE_DIR@ lib=@LIB_DIR@ - bindir=$(PREFIX)\\share\\tools\\${PORT} + bindir=$(PREFIX)\\tools\\${PORT} sodir=$(PREFIX)\\bin\\ ) # Debug params @@ -77,8 +77,8 @@ if (VCPKG_TARGET_IS_WINDOWS) file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libexslt_a${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX} ${CURRENT_PACKAGES_DIR}/debug/lib/libexslt${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}) endif() else() - vcpkg_find_acquire_program(PYTHON2) - get_filename_component(PYTHON2_DIR ${PYTHON2} DIRECTORY) + vcpkg_find_acquire_program(PYTHON3) + get_filename_component(PYTHON3_DIR ${PYTHON3} DIRECTORY) find_library(LibXml2_DEBUG_LIBRARIES libxml2 PATHS ${CURRENT_INSTALLED_DIR}/debug/lib REQUIRED) find_library(LibXml2_RELEASE_LIBRARIES libxml2 PATHS ${CURRENT_INSTALLED_DIR}/lib REQUIRED) @@ -90,7 +90,7 @@ else() --with-crypto --with-plugins --with-libxml-include-prefix=${CURRENT_INSTALLED_DIR}/include - --with-python=${PYTHON2_DIR} + --with-python=${PYTHON3_DIR} OPTIONS_DEBUG --with-mem-debug --with-debug @@ -121,6 +121,8 @@ else() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/libxslt-plugins ${CURRENT_PACKAGES_DIR}/debug/lib/libxslt-plugins) endif() file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/libxslt.so) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/xsltproc" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/xsltproc") endif() # # Cleanup @@ -145,6 +147,7 @@ file(WRITE ${CURRENT_PACKAGES_DIR}/include/libexslt/exsltexports.h "${EXSLTEXPOR # Remove tools and debug include directories #file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools) +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/tools) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) From 7481b9c6de59c8136c764088875175ba1042e5a7 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 6 Feb 2020 13:54:02 +0100 Subject: [PATCH 390/419] fix xcb build --- ports/xcb/makefile.patch | 13 +++++++++++++ ports/xcb/portfile.cmake | 40 +++++++++++++++++++++++++++++++++++----- 2 files changed, 48 insertions(+), 5 deletions(-) create mode 100644 ports/xcb/makefile.patch diff --git a/ports/xcb/makefile.patch b/ports/xcb/makefile.patch new file mode 100644 index 00000000000000..9171fcf03705db --- /dev/null +++ b/ports/xcb/makefile.patch @@ -0,0 +1,13 @@ +diff --git a/src/Makefile.am b/src/Makefile.am +index 17b64a80e..f45d9d0fe 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -260,7 +260,7 @@ if XCB_SERVERSIDE_SUPPORT + C_CLIENT_PY_EXTRA_ARGS += --server-side + endif + +-$(EXTSOURCES): c_client.py $(XCBPROTO_XCBINCLUDEDIR)/$(@:.c=.xml) ++$(EXTSOURCES): c_client.py /$(@:.c=.xml) + $(AM_V_GEN)$(PYTHON) $(srcdir)/c_client.py -c "$(PACKAGE_STRING)" -l "$(XORG_MAN_PAGE)" \ + -s "$(LIB_MAN_SUFFIX)" -p $(XCBPROTO_XCBPYTHONDIR) \ + $(C_CLIENT_PY_EXTRA_ARGS) \ diff --git a/ports/xcb/portfile.cmake b/ports/xcb/portfile.cmake index 19f15ef571832c..8b631f3bbbf684 100644 --- a/ports/xcb/portfile.cmake +++ b/ports/xcb/portfile.cmake @@ -7,7 +7,7 @@ vcpkg_from_gitlab( REF 8287ebd7b752c33b0cabc4982606fe4831106f7e #v1.13.1 SHA512 625939b67d129f681503a2f784daa75897b31b09daba0b9ea72457c9dffdab34a644c0b73068282de01ddfdcd5fc29242e4db5367d39b795984374846c1319c8 HEAD_REF master # branch name - #PATCHES example.patch #patch name + PATCHES makefile.patch #without the patch target xproto.c is missing target XCBPROTO_XCBINCLUDEDIR ) set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") @@ -17,10 +17,39 @@ if(VCPKG_TARGET_IS_WINDOWS) #list(APPEND VCPKG_C_FLAGS /D__ILP32__) endif() -vcpkg_find_acquire_program(PYTHON2) -get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY) -file(TO_NATIVE_PATH "${PYTHON2_DIR}" PYTHON3_DIR_NATIVE) -vcpkg_add_to_path("${PYTHON2_DIR}") +vcpkg_find_acquire_program(PYTHON3) +get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) +file(TO_NATIVE_PATH "${PYTHON3_DIR}" PYTHON3_DIR_NATIVE) +vcpkg_add_to_path("${PYTHON3_DIR}") + +#vcpkg_find_acquire_program(XLSTPROC) +if(NOT XLSTPROC) + if(WIN32) + set(HOST_TRIPLETS x64-windows x64-windows-static x86-windows x86-windows-static) + elseif(APPLE) + set(HOST_TRIPLETS x64-osx) + elseif(UNIX) + set(HOST_TRIPLETS x64-linux) + endif() + foreach(HOST_TRIPLET ${HOST_TRIPLETS}) + find_program(XLSTPROC NAMES xsltproc${VCPKG_HOST_EXECUTABLE_SUFFIX} PATHS "${CURRENT_INSTALLED_DIR}/../${HOST_TRIPLET}/tools/libxslt") + if(XLSTPROC) + break() + endif() + endforeach() +endif() +if(NOT XLSTPROC) + message(FATAL_ERROR "${PORT} requires xlstproc for the host system. Please install libxslt within vcpkg or your system package manager!") +endif() +get_filename_component(XLSTPROC_DIR "${XLSTPROC}" DIRECTORY) +file(TO_NATIVE_PATH "${XLSTPROC_DIR}" XLSTPROC_DIR_NATIVE) +vcpkg_add_to_path("${XLSTPROC_DIR}") + +get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) +file(TO_NATIVE_PATH "${PYTHON3_DIR}" PYTHON3_DIR_NATIVE) + +vcpkg_add_to_path("${PYTHON3_DIR}") +set(ENV{PYTHONPATH} "$ENV{PYTHONPATH}${VCPKG_HOST_PATH_SEPARATOR}${CURRENT_INSTALLED_DIR}/lib/python3.7/site-packages/") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} @@ -36,6 +65,7 @@ vcpkg_configure_make( PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) + vcpkg_install_make(MAKE_OPTIONS -k --print-data-base) vcpkg_fixup_pkgconfig() From d75e60ec780794528037d482a82dfc0c5ee4a924 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 6 Feb 2020 13:54:11 +0100 Subject: [PATCH 391/419] fix xfixes dependencies --- ports/xfixes/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/xfixes/CONTROL b/ports/xfixes/CONTROL index 700fec73e61055..f2220dfe0654f8 100644 --- a/ports/xfixes/CONTROL +++ b/ports/xfixes/CONTROL @@ -2,4 +2,4 @@ Source: xfixes Version: 5.0.3 Homepage: https://gitlab.freedesktop.org/xorg/lib/libxfixes Description: Xlib-based library for the XFIXES Extension -Build-Depends: xorg-macros +Build-Depends: xorg-macros, xproto, x11 From 73b711c4fbd594ee14949afc44fd039488ad0463 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 6 Feb 2020 13:55:16 +0100 Subject: [PATCH 392/419] bash is not required in build --- scripts/cmake/vcpkg_build_make.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/cmake/vcpkg_build_make.cmake b/scripts/cmake/vcpkg_build_make.cmake index 900634b2aae075..933f77297a8a67 100644 --- a/scripts/cmake/vcpkg_build_make.cmake +++ b/scripts/cmake/vcpkg_build_make.cmake @@ -73,7 +73,7 @@ function(vcpkg_build_make) find_program(MAKE mingw32-make make REQUIRED) set(BASH "${MSYS_ROOT}/usr/bin/bash.exe") # Set make command and install command - set(MAKE_BASH "${BASH}" --noprofile --norc -c) + #set(MAKE_BASH "${BASH}" --noprofile --norc -c) set(MAKE_COMMAND "${MAKE}") message(STATUS ${MAKE_COMMAND}) # Must use absolute path to call make in windows From e12370fef08fe83fb4af1fbf7454b80849c75438 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 6 Feb 2020 13:56:45 +0100 Subject: [PATCH 393/419] bit of cleanup - run autoconf only once - dont copy files on !windows platforms - bit of path cleanup --- scripts/cmake/vcpkg_configure_make.cmake | 173 ++++++++++------------- 1 file changed, 72 insertions(+), 101 deletions(-) diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index 69297db1f237cb..0c531854429ae5 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -262,16 +262,16 @@ function(vcpkg_configure_make) file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}") if(WIN32) - string(REPLACE " " "\\\ " _VCPKG_PREFIX "${CURRENT_PACKAGES_DIR}") + string(REPLACE " " "\\\ " _VCPKG_PREFIX ${CURRENT_PACKAGES_DIR}) #string(REGEX REPLACE "([a-zA-Z]):/" "/\\1/" _VCPKG_PREFIX "${_VCPKG_PREFIX}") set(_VCPKG_INSTALLED ${CURRENT_INSTALLED_DIR}) - string(REPLACE " " "\ " _VCPKG_INSTALLED_PKGCONF "${CURRENT_INSTALLED_DIR}") - string(REGEX REPLACE "([a-zA-Z]):/" "/\\1/" _VCPKG_INSTALLED_PKGCONF "${_VCPKG_INSTALLED_PKGCONF}") - string(REPLACE "\\" "/" _VCPKG_INSTALLED_PKGCONF "${_VCPKG_INSTALLED_PKGCONF}") + string(REPLACE " " "\ " _VCPKG_INSTALLED_PKGCONF ${CURRENT_INSTALLED_DIR}) + string(REGEX REPLACE "([a-zA-Z]):/" "/\\1/" _VCPKG_INSTALLED_PKGCONF ${_VCPKG_INSTALLED_PKGCONF}) + string(REPLACE "\\" "/" _VCPKG_INSTALLED_PKGCONF ${_VCPKG_INSTALLED_PKGCONF}) set(EXTRA_QUOTES "\\\"") else() - string(REPLACE " " "\ " _VCPKG_PREFIX "${CURRENT_PACKAGES_DIR}") - string(REPLACE " " "\ " _VCPKG_INSTALLED "${CURRENT_INSTALLED_DIR}") + string(REPLACE " " "\ " _VCPKG_PREFIX ${CURRENT_PACKAGES_DIR}) + string(REPLACE " " "\ " _VCPKG_INSTALLED ${CURRENT_INSTALLED_DIR}) set(EXTRA_QUOTES) endif() @@ -298,7 +298,8 @@ function(vcpkg_configure_make) else() set(_csc_OPTIONS ${_csc_OPTIONS} --enable-static --disable-shared) endif() - + file(RELATIVE_PATH RELATIVE_BUILD_PATH "${CURRENT_BUILDTREES_DIR}" "${_csc_SOURCE_PATH}") + if(CMAKE_HOST_WIN32) set(base_cmd ${BASH} --noprofile --norc) @@ -321,21 +322,15 @@ function(vcpkg_configure_make) list(JOIN _csc_OPTIONS " " _csc_OPTIONS) list(JOIN _csc_OPTIONS_RELEASE " " _csc_OPTIONS_RELEASE) list(JOIN _csc_OPTIONS_DEBUG " " _csc_OPTIONS_DEBUG) - - file(RELATIVE_PATH RELATIVE_BUILD_PATH "${CURRENT_BUILDTREES_DIR}" "${_csc_SOURCE_PATH}") - + set(rel_command - ${base_cmd} -c "${COMPILER_CC} eval ../${RELATIVE_BUILD_PATH}/configure \"${BUILD_TARGET} ${HOST_TYPE} ${_csc_OPTIONS} ${_csc_OPTIONS_RELEASE}\"") + ${base_cmd} -c "${COMPILER_CC} eval ./../${RELATIVE_BUILD_PATH}/configure \"${BUILD_TARGET} ${HOST_TYPE} ${_csc_OPTIONS} ${_csc_OPTIONS_RELEASE}\"") set(dbg_command - ${base_cmd} -c "${COMPILER_CC} eval ../${RELATIVE_BUILD_PATH}/configure \"${BUILD_TARGET} ${HOST_TYPE} ${_csc_OPTIONS} ${_csc_OPTIONS_DEBUG}\"") + ${base_cmd} -c "${COMPILER_CC} eval ./../${RELATIVE_BUILD_PATH}/configure \"${BUILD_TARGET} ${HOST_TYPE} ${_csc_OPTIONS} ${_csc_OPTIONS_DEBUG}\"") else() - set(base_cmd ./) - set(rel_command - "${base_cmd}configure;${_csc_OPTIONS};${_csc_OPTIONS_RELEASE}" - ) - set(dbg_command - "${base_cmd}configure;${_csc_OPTIONS};${_csc_OPTIONS_DEBUG}") + set(rel_command "./../${RELATIVE_BUILD_PATH}/configure" ${_csc_OPTIONS} ${_csc_OPTIONS_RELEASE}) + set(dbg_command "./../${RELATIVE_BUILD_PATH}/configure" ${_csc_OPTIONS} ${_csc_OPTIONS_DEBUG}) endif() @@ -364,14 +359,37 @@ function(vcpkg_configure_make) string(APPEND C_FLAGS_GLOBAL " -fPIC") string(APPEND CXX_FLAGS_GLOBAL " -fPIC") endif() - + + set(SRC_DIR "${_csc_SOURCE_PATH}/${_csc_PROJECT_SUBPATH}") + if (_csc_AUTOCONFIG) + message(STATUS "Generating configure for ${TARGET_TRIPLET}") + if (CMAKE_HOST_WIN32) + vcpkg_execute_required_process( + COMMAND ${base_cmd} -c "autoreconf -vfi" + WORKING_DIRECTORY "${SRC_DIR}" + LOGNAME autoconf-${TARGET_TRIPLET} + ) + else() + vcpkg_execute_required_process( + COMMAND autoreconf -vfi + WORKING_DIRECTORY "${SRC_DIR}" + LOGNAME autoconf-${TARGET_TRIPLET} + ) + endif() + message(STATUS "Finished configure for ${TARGET_TRIPLET}") + endif() + # Configure debug if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug" AND NOT _csc_NO_DEBUG) if(_csc_PKG_CONFIG_PATHS_DEBUG) set(BACKUP_ENV_PKG_CONFIG_PATH_DEBUG $ENV{PKG_CONFIG_PATH}) foreach(_path IN LISTS _csc_PKG_CONFIG_PATHS_DEBUG) file(TO_NATIVE_PATH "${_path}" _path) - set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}${VCPKG_HOST_PATH_SEPARATOR}${_path}") + if(ENV{PKG_CONFIG_PATH}) + set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}${VCPKG_HOST_PATH_SEPARATOR}${_path}") + else() + set(ENV{PKG_CONFIG_PATH} "${_path}") + endif() endforeach() endif() @@ -388,8 +406,7 @@ function(vcpkg_configure_make) set(TMP_LDFLAGS "${LD_FLAGS_GLOBAL} ${VCPKG_LINKER_FLAGS_DEBUG}") string(REGEX REPLACE "[ \t]+/" " -" TMP_LDFLAGS "${TMP_LDFLAGS}") set(ENV{LDFLAGS} ${TMP_LDFLAGS}) - set(ENV{VCPKG_PKG_PREFIX} ${_VCPKG_INSTALLED_PKGCONF}/debug) - set(ENV{PKG_CONFIG} "${PKGCONFIG} --define-variable=prefix=$(VCPKG_PKG_PREFIX)") + set(ENV{PKG_CONFIG} "${PKGCONFIG} --define-variable=prefix=${_VCPKG_INSTALLED}/debug") else() set(ENV{CFLAGS} "${C_FLAGS_GLOBAL} ${VCPKG_C_FLAGS_DEBUG}") set(ENV{CXXFLAGS} "${CXX_FLAGS_GLOBAL} ${VCPKG_CXX_FLAGS_DEBUG}") @@ -400,19 +417,19 @@ function(vcpkg_configure_make) set(ENV{PKG_CONFIG} "${PKGCONFIG} --define-variable=prefix=${_VCPKG_INSTALLED}/debug") endif() - set(OBJ_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") - set(PRJ_DIR "${OBJ_DIR}/${_csc_PROJECT_SUBPATH}") + set(TAR_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + set(PRJ_DIR "${TAR_DIR}/${_csc_PROJECT_SUBPATH}") - file(MAKE_DIRECTORY "${OBJ_DIR}") + file(MAKE_DIRECTORY "${TAR_DIR}") - if (NOT CMAKE_HOST_WIN32) - file(GLOB_RECURSE SOURCE_FILES ${_csc_SOURCE_PATH}/*) - foreach(ONE_SOUCRCE_FILE ${SOURCE_FILES}) - get_filename_component(DST_DIR ${ONE_SOUCRCE_FILE} PATH) - string(REPLACE "${_csc_SOURCE_PATH}" "${OBJ_DIR}" DST_DIR "${DST_DIR}") - file(COPY ${ONE_SOUCRCE_FILE} DESTINATION ${DST_DIR}) - endforeach() - endif() + # if (NOT CMAKE_HOST_WIN32) + # file(GLOB_RECURSE SOURCE_FILES ${_csc_SOURCE_PATH}/*) + # foreach(ONE_SOUCRCE_FILE ${SOURCE_FILES}) + # get_filename_component(DST_DIR ${ONE_SOUCRCE_FILE} PATH) + # string(REPLACE "${_csc_SOURCE_PATH}" "${OBJ_DIR}" DST_DIR "${DST_DIR}") + # file(COPY ${ONE_SOUCRCE_FILE} DESTINATION ${DST_DIR}) + # endforeach() + # endif() if (_csc_PRERUN_SHELL) message(STATUS "Prerun shell with ${TARGET_TRIPLET}-dbg") @@ -422,25 +439,7 @@ function(vcpkg_configure_make) LOGNAME prerun-${TARGET_TRIPLET}-dbg ) endif() - - if (_csc_AUTOCONFIG) - message(STATUS "Generating configure with ${TARGET_TRIPLET}-dbg") - if (CMAKE_HOST_WIN32) - vcpkg_execute_required_process( - COMMAND ${base_cmd} -c "autoreconf -vfi" - WORKING_DIRECTORY "${_csc_SOURCE_PATH}/${_csc_PROJECT_SUBPATH}" - LOGNAME autoconf-${TARGET_TRIPLET}-dbg - ) - else() - vcpkg_execute_required_process( - COMMAND autoreconf -vfi - WORKING_DIRECTORY "${PRJ_DIR}" - LOGNAME autoconf-${TARGET_TRIPLET}-dbg - ) - endif() - endif() - if (NOT _csc_SKIP_CONFIGURE) if(_csc_CONFIGURE_PATCHES) vcpkg_apply_patches(SOURCE_PATH "${PRJ_DIR}" PATCHES "${_csc_CONFIGURE_PATCHES}") @@ -448,10 +447,11 @@ function(vcpkg_configure_make) message(STATUS "Configuring ${TARGET_TRIPLET}-dbg") vcpkg_execute_required_process( COMMAND ${dbg_command} - WORKING_DIRECTORY ${PRJ_DIR} + WORKING_DIRECTORY "${PRJ_DIR}" LOGNAME config-${TARGET_TRIPLET}-dbg ) endif() + if(_csc_PKG_CONFIG_PATHS_DEBUG) set(ENV{PKG_CONFIG_PATH} "${BACKUP_ENV_PKG_CONFIG_PATH_DEBUG}") endif() @@ -463,7 +463,11 @@ function(vcpkg_configure_make) set(BACKUP_ENV_PKG_CONFIG_PATH_RELEASE $ENV{PKG_CONFIG_PATH}) foreach(_path IN LISTS _csc_PKG_CONFIG_PATHS_RELEASE) file(TO_NATIVE_PATH "${_path}" _path) - set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}${VCPKG_HOST_PATH_SEPARATOR}${_path}") + if(ENV{PKG_CONFIG_PATH}) + set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}${VCPKG_HOST_PATH_SEPARATOR}${_path}") + else() + set(ENV{PKG_CONFIG_PATH} "${_path}") + endif() endforeach() endif() @@ -480,8 +484,7 @@ function(vcpkg_configure_make) set(TMP_LDFLAGS "${LD_FLAGS_GLOBAL} ${VCPKG_LINKER_FLAGS_RELEASE}") string(REGEX REPLACE "[ \t]+/" " -" TMP_LDFLAGS "${TMP_LDFLAGS}") set(ENV{LDFLAGS} ${TMP_LDFLAGS}) - set(ENV{VCPKG_PKG_PREFIX} ${_VCPKG_INSTALLED_PKGCONF}) - set(ENV{PKG_CONFIG} "${PKGCONFIG} --define-variable=prefix=$(VCPKG_PKG_PREFIX)") + set(ENV{PKG_CONFIG} "${PKGCONFIG} --define-variable=prefix=${_VCPKG_INSTALLED}") else() set(ENV{CFLAGS} "${C_FLAGS_GLOBAL} ${VCPKG_C_FLAGS_RELEASE}") set(ENV{CXXFLAGS} "${CXX_FLAGS_GLOBAL} ${VCPKG_CXX_FLAGS_RELEASE}") @@ -492,52 +495,20 @@ function(vcpkg_configure_make) set(ENV{PKG_CONFIG} "${PKGCONFIG} --define-variable=prefix=${_VCPKG_INSTALLED}") endif() - if (_csc_NO_DEBUG) - set(TAR_TRIPLET_DIR ${TARGET_TRIPLET}) - set(OBJ_DIR ${CURRENT_BUILDTREES_DIR}/${TAR_TRIPLET_DIR}) - else() - set(TAR_TRIPLET_DIR ${TARGET_TRIPLET}-rel) - set(OBJ_DIR ${CURRENT_BUILDTREES_DIR}/${TAR_TRIPLET_DIR}) - endif() - set(PRJ_DIR ${OBJ_DIR}/${_csc_PROJECT_SUBPATH}) + set(TAR_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") + set(PRJ_DIR "${TAR_DIR}/${_csc_PROJECT_SUBPATH}") - file(MAKE_DIRECTORY ${OBJ_DIR}) + file(MAKE_DIRECTORY ${TAR_DIR}) - if (NOT CMAKE_HOST_WIN32) - ##COPY SOURCES - file(GLOB_RECURSE SOURCE_FILES ${_csc_SOURCE_PATH}/*) - foreach(ONE_SOUCRCE_FILE ${SOURCE_FILES}) - get_filename_component(DST_DIR ${ONE_SOUCRCE_FILE} PATH) - string(REPLACE "${_csc_SOURCE_PATH}" "${OBJ_DIR}" DST_DIR "${DST_DIR}") - file(COPY ${ONE_SOUCRCE_FILE} DESTINATION ${DST_DIR}) - endforeach() - endif() - - if (_csc_PRERUN_SHELL) - message(STATUS "Prerun shell with ${TAR_TRIPLET_DIR}") - vcpkg_execute_required_process( - COMMAND ${base_cmd}${_csc_PRERUN_SHELL} - WORKING_DIRECTORY ${PRJ_DIR} - LOGNAME prerun-${TAR_TRIPLET_DIR} - ) - endif() - - if (_csc_AUTOCONFIG) - message(STATUS "Generating configure with ${TAR_TRIPLET_DIR}") - if (CMAKE_HOST_WIN32) - vcpkg_execute_required_process( - COMMAND ${base_cmd} -c "autoreconf -vfi" - WORKING_DIRECTORY ${_csc_SOURCE_PATH}/${_csc_PROJECT_SUBPATH} - LOGNAME autoconf-${TAR_TRIPLET_DIR} - ) - else() - vcpkg_execute_required_process( - COMMAND autoreconf -vfi - WORKING_DIRECTORY ${PRJ_DIR} - LOGNAME autoconf-${TAR_TRIPLET_DIR} - ) - endif() - endif() + # if (NOT CMAKE_HOST_WIN32) + # ##COPY SOURCES + # file(GLOB_RECURSE SOURCE_FILES ${_csc_SOURCE_PATH}/*) + # foreach(ONE_SOUCRCE_FILE ${SOURCE_FILES}) + # get_filename_component(DST_DIR ${ONE_SOUCRCE_FILE} PATH) + # string(REPLACE "${_csc_SOURCE_PATH}" "${OBJ_DIR}" DST_DIR "${DST_DIR}") + # file(COPY ${ONE_SOUCRCE_FILE} DESTINATION ${DST_DIR}) + # endforeach() + # endif() if (NOT _csc_SKIP_CONFIGURE) if(_csc_CONFIGURE_PATCHES) @@ -546,8 +517,8 @@ function(vcpkg_configure_make) message(STATUS "Configuring ${TAR_TRIPLET_DIR}") vcpkg_execute_required_process( COMMAND ${rel_command} - WORKING_DIRECTORY ${PRJ_DIR} - LOGNAME config-${TAR_TRIPLET_DIR} + WORKING_DIRECTORY "${PRJ_DIR}" + LOGNAME config-${TARGET_TRIPLET}-rel ) endif() From 650f50795d745c02b5ea7443324695ba8c367a76 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 6 Feb 2020 14:20:38 +0100 Subject: [PATCH 394/419] add option --- ports/xlib/portfile.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ports/xlib/portfile.cmake b/ports/xlib/portfile.cmake index 03481ca24d8580..2a9791cd92d1c1 100644 --- a/ports/xlib/portfile.cmake +++ b/ports/xlib/portfile.cmake @@ -13,6 +13,9 @@ vcpkg_from_gitlab( set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") +if(VCPKG_TARGET_IS_WINDOWS) + set(OPTIONS --enable-malloc0returnsnull=no) +endif() vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} AUTOCONFIG @@ -21,7 +24,7 @@ vcpkg_configure_make( #AUTO_HOST #AUTO_DST #PRERUN_SHELL "export ACLOCAL=\"aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/\"" - #OPTIONS + OPTIONS ${OPTIONS} #OPTIONS_DEBUG #OPTIONS_RELEASE PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" From ab41b6f1fb5e10ff7586d9a5194f5f780723ad15 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 6 Feb 2020 14:20:54 +0100 Subject: [PATCH 395/419] add dependency on libxslt --- ports/xcb/CONTROL | 2 +- ports/xproto/CONTROL | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/xcb/CONTROL b/ports/xcb/CONTROL index 02e17a8304f75c..f8e97e2e4274d2 100644 --- a/ports/xcb/CONTROL +++ b/ports/xcb/CONTROL @@ -2,4 +2,4 @@ Source: xcb Version: 1.13.1 Homepage: https://xcb.freedesktop.org/ Description: C interface to the X Window System protocol, which replaces the traditional Xlib interface. -Build-Depends: xcb-proto, xcb-util-m4, xorg-macros, xproto, bzip2, xau, pthread-stubs, xdmcp +Build-Depends: xcb-proto, xcb-util-m4, xorg-macros, xproto, bzip2, xau, pthread-stubs, xdmcp, libxslt diff --git a/ports/xproto/CONTROL b/ports/xproto/CONTROL index 5f167687438906..1b9a5c3a1196e5 100644 --- a/ports/xproto/CONTROL +++ b/ports/xproto/CONTROL @@ -2,4 +2,4 @@ Source: xproto Version: 2019.2 Homepage: https://gitlab.freedesktop.org/xorg/proto/xorgproto Description: X Window System unified protocol definitions -Build-Depends: xorg-macros +Build-Depends: xorg-macros, libxslt From 96702a1abedceb99647f9d895d1ed38be87f9f4f Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 6 Feb 2020 14:21:07 +0100 Subject: [PATCH 396/419] add dep xstlproc --- ports/xproto/portfile.cmake | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/ports/xproto/portfile.cmake b/ports/xproto/portfile.cmake index f4f1ea726b8c7e..2a3ee07857d660 100644 --- a/ports/xproto/portfile.cmake +++ b/ports/xproto/portfile.cmake @@ -17,6 +17,28 @@ if(NOT VCPKG_TARGET_IS_WINDOWS) set(OPTIONS --enable-legacy) # has an build error on windows so I assume it is unsupported. endif() +if(NOT XLSTPROC) + if(WIN32) + set(HOST_TRIPLETS x64-windows x64-windows-static x86-windows x86-windows-static) + elseif(APPLE) + set(HOST_TRIPLETS x64-osx) + elseif(UNIX) + set(HOST_TRIPLETS x64-linux) + endif() + foreach(HOST_TRIPLET ${HOST_TRIPLETS}) + find_program(XLSTPROC NAMES xsltproc${VCPKG_HOST_EXECUTABLE_SUFFIX} PATHS "${CURRENT_INSTALLED_DIR}/../${HOST_TRIPLET}/tools/libxslt") + if(XLSTPROC) + break() + endif() + endforeach() +endif() +if(NOT XLSTPROC) + message(FATAL_ERROR "${PORT} requires xlstproc for the host system. Please install libxslt within vcpkg or your system package manager!") +endif() +get_filename_component(XLSTPROC_DIR "${XLSTPROC}" DIRECTORY) +file(TO_NATIVE_PATH "${XLSTPROC_DIR}" XLSTPROC_DIR_NATIVE) +vcpkg_add_to_path("${XLSTPROC_DIR}") +set(ENV{XSLTPROC} ${XLSTPROC}) vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} AUTOCONFIG @@ -25,7 +47,7 @@ vcpkg_configure_make( #AUTO_HOST #AUTO_DST #PRERUN_SHELL "export ACLOCAL=\"aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/\"" - OPTIONS ${OPTIONS} + OPTIONS ${OPTIONS} --with-xmlto=no --with-fop=no #OPTIONS_DEBUG #OPTIONS_RELEASE PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" From 8ef461c2217f94dc511cea34d0f98715d9522d06 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 6 Feb 2020 14:21:20 +0100 Subject: [PATCH 397/419] reorder commands --- scripts/cmake/vcpkg_build_make.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/cmake/vcpkg_build_make.cmake b/scripts/cmake/vcpkg_build_make.cmake index 933f77297a8a67..9e6137f2eb20be 100644 --- a/scripts/cmake/vcpkg_build_make.cmake +++ b/scripts/cmake/vcpkg_build_make.cmake @@ -77,16 +77,16 @@ function(vcpkg_build_make) set(MAKE_COMMAND "${MAKE}") message(STATUS ${MAKE_COMMAND}) # Must use absolute path to call make in windows - set(MAKE_OPTS "${_bc_MAKE_OPTIONS} -j ${VCPKG_CONCURRENCY}") - set(INSTALL_OPTS "install -j ${VCPKG_CONCURRENCY} --trace") + set(MAKE_OPTS ${_bc_MAKE_OPTIONS} -j ${VCPKG_CONCURRENCY} --trace -f makefile all) + set(INSTALL_OPTS -j ${VCPKG_CONCURRENCY} --trace install ) else() # Compiler requriements set(MAKE_BASH) find_program(MAKE make REQUIRED) set(MAKE_COMMAND ${MAKE}) # Set make command and install command - set(MAKE_OPTS -j ${VCPKG_CONCURRENCY} -f makefile all ${_bc_MAKE_OPTIONS}) - set(INSTALL_OPTS install) + set(MAKE_OPTS ${_bc_MAKE_OPTIONS} -j ${VCPKG_CONCURRENCY} -f makefile all) + set(INSTALL_OPTS -j ${VCPKG_CONCURRENCY} --trace install) endif() elseif (_VCPKG_MAKE_GENERATOR STREQUAL "nmake") set(MAKE_BASH) From 87e054f762da2670ab16fcac84493e0300088606 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 6 Feb 2020 15:56:52 +0100 Subject: [PATCH 398/419] patch xproto a bit --- ports/xproto/portfile.cmake | 4 +++- ports/xproto/winsock2.patch | 12 ++++++++++++ ports/xproto/xmd.h.patch | 31 +++++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 ports/xproto/winsock2.patch create mode 100644 ports/xproto/xmd.h.patch diff --git a/ports/xproto/portfile.cmake b/ports/xproto/portfile.cmake index 2a3ee07857d660..a012801c1d922e 100644 --- a/ports/xproto/portfile.cmake +++ b/ports/xproto/portfile.cmake @@ -8,7 +8,9 @@ vcpkg_from_gitlab( REF f61f9a3ee1aa77ebcc67730cda9bfde88e4e9c5f # 2019.2 SHA512 52540660d22e80a40c16c0f36fe66d76ce738a32a31c294126f0ec4519cc696f553ab46abf889487295b3e2e32feff94be4ce2a1e74dd66d964a1ff903a58e1e HEAD_REF master # branch name - #PATCHES example.patch #patch name + PATCHES + xmd.h.patch #patch name + winsock2.patch # include winsock2.h before windows.h ) set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") diff --git a/ports/xproto/winsock2.patch b/ports/xproto/winsock2.patch new file mode 100644 index 00000000000000..b489dfd188fdfa --- /dev/null +++ b/ports/xproto/winsock2.patch @@ -0,0 +1,12 @@ +diff --git a/include/X11/Xwindows.h b/include/X11/Xwindows.h +index 70e1debd5..f70ecf994 100644 +--- a/include/X11/Xwindows.h ++++ b/include/X11/Xwindows.h +@@ -72,6 +72,7 @@ The Open Group. + #define ATOM wATOM + #define BYTE wBYTE + #define FreeResource wFreeResource ++#include "Xwinsock.h" // Make sure winsock2 is included before windows.h + #include + #undef NOMINMAX + #undef Status diff --git a/ports/xproto/xmd.h.patch b/ports/xproto/xmd.h.patch new file mode 100644 index 00000000000000..19703e95efeb05 --- /dev/null +++ b/ports/xproto/xmd.h.patch @@ -0,0 +1,31 @@ +diff --git a/include/X11/Xmd.h b/include/X11/Xmd.h +index 492465e6c..a7fbbbcdd 100644 +--- a/include/X11/Xmd.h ++++ b/include/X11/Xmd.h +@@ -64,7 +64,7 @@ SOFTWARE. + defined(__s390x__) || \ + defined(__amd64__) || defined(amd64) || \ + defined(__powerpc64__) +-# if !defined(__ILP32__) /* amd64-x32 is 32bit */ ++# if !defined(__ILP32__) && !(defined(_WIN32) || defined(WIN32)) /* amd64-x32 is 32bit */ + # define LONG64 /* 32/64-bit architecture */ + # endif /* !__ILP32__ */ + # endif +@@ -93,7 +93,7 @@ SOFTWARE. + */ + # define B32 /* bitfield not needed on architectures with native 32-bit type */ + # define B16 /* bitfield not needed on architectures with native 16-bit type */ +-# ifdef LONG64 ++# if defined(LONG64) || !(defined(_WIN32) || defined(WIN32)) + typedef long INT64; + typedef int INT32; + # else +@@ -103,7 +103,7 @@ typedef short INT16; + + typedef signed char INT8; + +-# ifdef LONG64 ++# if defined(LONG64) || !(defined(_WIN32) || defined(WIN32)) + typedef unsigned long CARD64; + typedef unsigned int CARD32; + # else From f5bb7c3f24802445ce38e3f89ca8bd616c2a7780 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 6 Feb 2020 15:57:10 +0100 Subject: [PATCH 399/419] remove flags from xdmcp --- ports/xdmcp/portfile.cmake | 2 -- 1 file changed, 2 deletions(-) diff --git a/ports/xdmcp/portfile.cmake b/ports/xdmcp/portfile.cmake index 9ed28688744787..dbfb631a927ba9 100644 --- a/ports/xdmcp/portfile.cmake +++ b/ports/xdmcp/portfile.cmake @@ -13,8 +13,6 @@ vcpkg_from_gitlab( set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") if(VCPKG_TARGET_IS_WINDOWS) set(OPTIONS --disable-dependency-tracking) - list(APPEND VCPKG_CXX_FLAGS /D__ILP32__) - list(APPEND VCPKG_C_FLAGS /D__ILP32__) endif() vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} From 7d0a6981f211b6db62bb0f6e6751765628c0d901 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 6 Feb 2020 15:57:28 +0100 Subject: [PATCH 400/419] set xsltproc into the enviromnent --- ports/xcb/portfile.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/xcb/portfile.cmake b/ports/xcb/portfile.cmake index 8b631f3bbbf684..e7ce2a7931daf0 100644 --- a/ports/xcb/portfile.cmake +++ b/ports/xcb/portfile.cmake @@ -44,6 +44,7 @@ endif() get_filename_component(XLSTPROC_DIR "${XLSTPROC}" DIRECTORY) file(TO_NATIVE_PATH "${XLSTPROC_DIR}" XLSTPROC_DIR_NATIVE) vcpkg_add_to_path("${XLSTPROC_DIR}") +set(ENV{XLSTPROC} "${XLSTPROC}") get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) file(TO_NATIVE_PATH "${PYTHON3_DIR}" PYTHON3_DIR_NATIVE) From 5c3b0da9bdba1cd154434893fc3fe9198d4f03f6 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 6 Feb 2020 16:34:47 +0100 Subject: [PATCH 401/419] addded xaw patch --- ports/xaw/getpagesize.patch | 14 ++++++++++++++ ports/xaw/portfile.cmake | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 ports/xaw/getpagesize.patch diff --git a/ports/xaw/getpagesize.patch b/ports/xaw/getpagesize.patch new file mode 100644 index 00000000000000..54bee1761f052b --- /dev/null +++ b/ports/xaw/getpagesize.patch @@ -0,0 +1,14 @@ +diff --git a/src/OS.c b/src/OS.c +index 4c69005..cd0c517 100644 +--- a/src/OS.c ++++ b/src/OS.c +@@ -37,6 +37,9 @@ _XawGetPageSize(void) + #endif + + #ifdef HAVE_GETPAGESIZE ++# if defined(_WIN32) ++extern int getpagesize(void); ++# endif + if (pagesize == -1) + pagesize = getpagesize(); + #endif diff --git a/ports/xaw/portfile.cmake b/ports/xaw/portfile.cmake index 913f9dc838898c..43dc10489e31c1 100644 --- a/ports/xaw/portfile.cmake +++ b/ports/xaw/portfile.cmake @@ -7,7 +7,7 @@ vcpkg_from_gitlab( REF 8c82c47a770274c50944f002b97369c4e30872d8 # 1.0.13 SHA512 15b7afc706fe50c55391846892961e3286165e43513009664cfca7c443f9f9eafa32e17e8ba8089a0ae2d568aab4117f7e5ff696052ee58f6da78e3d9ad7e721 HEAD_REF master # branch name - #PATCHES example.patch #patch name + PATCHES getpagesize.patch #patch name ) set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") From b840f601b42de03ad99a76d89c79c484fe3a5f9f Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 6 Feb 2020 16:34:57 +0100 Subject: [PATCH 402/419] patch missing include --- ports/xcb/portfile.cmake | 1 + ports/xcb/time.patch | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 ports/xcb/time.patch diff --git a/ports/xcb/portfile.cmake b/ports/xcb/portfile.cmake index e7ce2a7931daf0..920bca98a7e50b 100644 --- a/ports/xcb/portfile.cmake +++ b/ports/xcb/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_gitlab( SHA512 625939b67d129f681503a2f784daa75897b31b09daba0b9ea72457c9dffdab34a644c0b73068282de01ddfdcd5fc29242e4db5367d39b795984374846c1319c8 HEAD_REF master # branch name PATCHES makefile.patch #without the patch target xproto.c is missing target XCBPROTO_XCBINCLUDEDIR + time.patch # missing include ) set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") diff --git a/ports/xcb/time.patch b/ports/xcb/time.patch new file mode 100644 index 00000000000000..3ce5f485218566 --- /dev/null +++ b/ports/xcb/time.patch @@ -0,0 +1,12 @@ +diff --git a/src/xcb_auth.c b/src/xcb_auth.c +index 29e2b6f84..26eebbb0c 100644 +--- a/src/xcb_auth.c ++++ b/src/xcb_auth.c +@@ -34,6 +34,7 @@ + #include + #include + #include ++#include + + #ifdef __INTERIX + /* _don't_ ask. interix has INADDR_LOOPBACK in here. */ From cd7f823aafaaeabe913b495099cc8410939e8fa0 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 6 Feb 2020 16:35:09 +0100 Subject: [PATCH 403/419] patch xproto --- ports/xproto/portfile.cmake | 3 +- ports/xproto/windows-long64.patch | 48 +++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 ports/xproto/windows-long64.patch diff --git a/ports/xproto/portfile.cmake b/ports/xproto/portfile.cmake index a012801c1d922e..f6095f05c87483 100644 --- a/ports/xproto/portfile.cmake +++ b/ports/xproto/portfile.cmake @@ -9,7 +9,8 @@ vcpkg_from_gitlab( SHA512 52540660d22e80a40c16c0f36fe66d76ce738a32a31c294126f0ec4519cc696f553ab46abf889487295b3e2e32feff94be4ce2a1e74dd66d964a1ff903a58e1e HEAD_REF master # branch name PATCHES - xmd.h.patch #patch name + #xmd.h.patch #patch name + windows-long64.patch winsock2.patch # include winsock2.h before windows.h ) diff --git a/ports/xproto/windows-long64.patch b/ports/xproto/windows-long64.patch new file mode 100644 index 00000000000000..5d8b74396bddfa --- /dev/null +++ b/ports/xproto/windows-long64.patch @@ -0,0 +1,48 @@ +diff --git a/include/X11/Xwinsock.h b/include/X11/Xwinsock.h +index 624047d..e8d5653 100644 +--- a/include/X11/Xwinsock.h ++++ b/include/X11/Xwinsock.h +@@ -47,6 +47,10 @@ The Open Group. + #define _NO_BOOL_TYPEDEF + #define BOOL WINBOOL + #define INT32 wINT32 ++#ifdef __x86_64__ ++#define INT64 wINT64 ++#define LONG64 wLONG64 ++#endif + #undef Status + #define Status wStatus + #define ATOM wATOM +@@ -58,6 +62,8 @@ The Open Group. + #undef BYTE + #undef BOOL + #undef INT32 ++#undef INT64 ++#undef LONG64 + #undef ATOM + #undef FreeResource + #undef CreateWindowA +diff --git a/include/X11/meson.build b/include/X11/meson.build +index 1c33c64..703ab19 100644 +--- a/include/X11/meson.build ++++ b/include/X11/meson.build +@@ -1,7 +1,8 @@ + fd_set_maybe_headers = [ 'sys/param.h', + 'sys/types.h', + 'sys/time.h', +- 'sys/select.h' ++ 'sys/select.h', ++ 'winsock2.h' + ] + fd_set_headers = '' + foreach h : fd_set_maybe_headers +@@ -15,6 +16,8 @@ if cc.has_member('fd_set', 'fds_bits', prefix: fd_set_headers) + fds_bits = 'fds_bits' + elif cc.has_member('fd_set', '__fds_bits', prefix: fd_set_headers) + fds_bits = '__fds_bits' ++elif cc.has_member('fd_set', 'fd_count', prefix: fd_set_headers) ++ fds_bits = 'fd_count' + else + error('Your fd_set is too weird.') + endif +-- \ No newline at end of file From 94dc8a7d91188b63d00249424b4465c78dd008ed Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 6 Feb 2020 16:35:19 +0100 Subject: [PATCH 404/419] patch xtrans --- ports/xtrans/portfile.cmake | 2 +- ports/xtrans/trans.patch | 201 ++++++++++++++++++++++++++++++++++++ 2 files changed, 202 insertions(+), 1 deletion(-) create mode 100644 ports/xtrans/trans.patch diff --git a/ports/xtrans/portfile.cmake b/ports/xtrans/portfile.cmake index 2c928390c82dc8..d8ac847b4ba254 100644 --- a/ports/xtrans/portfile.cmake +++ b/ports/xtrans/portfile.cmake @@ -8,7 +8,7 @@ vcpkg_from_gitlab( REF c4262efc9688e495261d8b23a12f956ab38e006f #v1.4 SHA512 137f0ffcae97f2375e5babbf21d336b67e7bf35f6a74377b14f035cdba66992d21f8d90f3c1dc243f8fd3d27d32af36c59af45443db59908969d0d65598865a2 HEAD_REF master # branch name - #PATCHES example.patch #patch name + #PATCHES trans.patch #patch name ) set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") diff --git a/ports/xtrans/trans.patch b/ports/xtrans/trans.patch new file mode 100644 index 00000000000000..6e5deb60188805 --- /dev/null +++ b/ports/xtrans/trans.patch @@ -0,0 +1,201 @@ +diff --git a/Xtrans.c b/Xtrans.c +index 0e09b25..790b4af 100644 +--- a/Xtrans.c ++++ b/Xtrans.c +@@ -660,11 +660,7 @@ TRANS(SetOption) (XtransConnInfo ciptr, int option, int arg) + #else + #if defined(WIN32) + { +-#ifdef WIN32 + u_long arg; +-#else +- int arg; +-#endif + arg = 1; + /* IBM TCP/IP understands this option too well: it causes TRANS(Read) to fail + * eventually with EWOULDBLOCK */ +diff --git a/Xtranslcl.c b/Xtranslcl.c +index 26b7f63..3e1f487 100644 +--- a/Xtranslcl.c ++++ b/Xtranslcl.c +@@ -72,8 +72,18 @@ from The Open Group. + + #include + #include +-#include ++#ifdef __MINGW32__ ++#define _POSIX ++#define __USE_MINGW_ALARM ++#endif ++#include ++#ifdef __MINGW32__ ++#undef _POSIX ++#undef __USE_MINGW_ALARM ++#endif ++#if !defined(__WIN32__) || defined(__CYGWIN__) + #include ++#endif + #include + #if defined(SVR4) || defined(__SVR4) + #include +@@ -81,9 +91,13 @@ from The Open Group. + #ifdef __sun + # include + #else +-# include ++# if !defined(__WIN32__) || defined(__CYGWIN__) ++# include ++# endif ++#endif ++#if !defined(__WIN32__) || defined(__CYGWIN__) ++# include + #endif +-#include + #include + + /* +@@ -93,9 +107,28 @@ from The Open Group. + * The X Server. + */ + +-#include ++#if !defined(__WIN32__) || defined(__CYGWIN__) ++# include ++#else ++# include ++# define ioctl ioctlsocket ++#endif + #ifndef X_NO_SYS_UN +-#include ++# if !defined(__WIN32__) || defined(__CYGWIN__) ++# include ++# else ++# include ++struct sockaddr_un { ++ short sun_family; ++ unsigned short sun_port; ++ struct in_addr sun_addr; ++/* This is a very generous path length. ++ * Most systems either use much less ++ * (around 108) or PATH_MAX. ++ */ ++ char sun_path[128]; ++}; ++# endif + #endif + + +@@ -157,7 +190,6 @@ TRANS(LocalSendFdInvalid)(XtransConnInfo ciptr, int fd, int do_close) + } + #endif + +- + static int + TRANS(FillAddrInfo)(XtransConnInfo ciptr, + const char *sun_path, const char *peer_sun_path) +@@ -369,6 +401,7 @@ TRANS(PTSOpenClient)(XtransConnInfo ciptr, const char *port) + return(-1); + } + ++#if !defined(__WIN32__) || defined(__CYGWIN__) + (void) grantpt(fd); + (void) unlockpt(fd); + +@@ -380,6 +413,7 @@ TRANS(PTSOpenClient)(XtransConnInfo ciptr, const char *port) + close(server); + return -1; + } ++#endif + + /* + * This is neccesary for the case where a program is setuid to non-root. +@@ -389,6 +423,7 @@ TRANS(PTSOpenClient)(XtransConnInfo ciptr, const char *port) + * cannot be changed back to its original condition, hence the fork(). + */ + ++#if !defined(__WIN32__) || defined(__CYGWIN__) + if(!(saved_pid=fork())) { + uid_t saved_euid; + +@@ -418,6 +453,7 @@ TRANS(PTSOpenClient)(XtransConnInfo ciptr, const char *port) + prmsg(1,"PTSOpenClient: Cannot chmod %s\n", slave); + return(-1); + } ++#endif + + /* + * write slave name to server +@@ -433,13 +469,17 @@ TRANS(PTSOpenClient)(XtransConnInfo ciptr, const char *port) + * wait for server to respond + */ + ++#if !defined(__WIN32__) || defined(__MINGW32__) || defined(__CYGWIN__) + savef = signal(SIGALRM, _dummy); + alarm_time = alarm (30); /* CONNECT_TIMEOUT */ ++#endif + + ret = read(fd, buf, 1); + ++#if !defined(__WIN32__) || defined(__MINGW32__) || defined(__CYGWIN__) + (void) alarm(alarm_time); + (void) signal(SIGALRM, savef); ++#endif + + if (ret != 1) { + prmsg(1, +@@ -529,6 +569,7 @@ TRANS(PTSOpenServer)(XtransConnInfo ciptr, const char *port) + return(-1); + } + ++#if !defined(__WIN32__) || defined(__CYGWIN__) + grantpt(fd); + unlockpt(fd); + +@@ -549,6 +590,7 @@ TRANS(PTSOpenServer)(XtransConnInfo ciptr, const char *port) + close(fd); + return(-1); + } ++#endif + + if( (server=open(server_path, O_RDWR)) < 0 ) { + prmsg(1, "PTSOpenServer: Unable to open server device %s\n", server_path); +diff --git a/Xtranssock.c b/Xtranssock.c +index b06579c..c9449a3 100644 +--- a/Xtranssock.c ++++ b/Xtranssock.c +@@ -2098,9 +2098,7 @@ TRANS(SocketRead) (XtransConnInfo ciptr, char *buf, int size) + #if defined(WIN32) + { + int ret = recv ((SOCKET)ciptr->fd, buf, size, 0); +-#ifdef WIN32 + if (ret == SOCKET_ERROR) errno = WSAGetLastError(); +-#endif + return ret; + } + #else +@@ -2238,9 +2236,7 @@ TRANS(SocketWrite) (XtransConnInfo ciptr, char *buf, int size) + #if defined(WIN32) + { + int ret = send ((SOCKET)ciptr->fd, buf, size, 0); +-#ifdef WIN32 + if (ret == SOCKET_ERROR) errno = WSAGetLastError(); +-#endif + return ret; + } + #else +diff --git a/transport.c b/transport.c +index b62fc7b..1bed1d2 100644 +--- a/transport.c ++++ b/transport.c +@@ -52,6 +52,11 @@ from The Open Group. + #define XTRANS_TRANSPORT_C /* used to flag Xtransint.h that it's being used + here, not just #included in another file */ + ++#if defined(_WIN32) && defined(IPv6) ++# include ++# define _WIN32_WINNT _WIN32_WINNT_VISTA ++#endif ++ + #include "Xtransint.h" + + #ifdef __clang__ \ No newline at end of file From 1a13cb3b08ba9ee599d5d58bbdd432d62e549899 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 6 Feb 2020 16:35:36 +0100 Subject: [PATCH 405/419] details --- scripts/cmake/vcpkg_configure_make.cmake | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index 0c531854429ae5..a10e1cb0c2d999 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -108,7 +108,7 @@ macro(_vcpkg_get_mingw_vars) if(NOT "${HOST_ARCH}" STREQUAL "${TARGET_ARCH}") list(APPEND MINGW_PACKAGES mingw-w64-cross-gcc) if(${HOST_ARCH} MATCHES "x64" AND ${TARGET_ARCH} MATCHES "x86") - set(MINGW_TOOLCHAIN i686) + set(MINGW_HOST i686) set(MINGW_TARGET i686-w64-mingw32) set(MINGW_NAME mingw64) elseif(${HOST_ARCH} MATCHES "x86|ARM64" AND ${TARGET_ARCH} MATCHES "x64") @@ -120,17 +120,17 @@ macro(_vcpkg_get_mingw_vars) endif() else() if(${TARGET_ARCH} MATCHES "x64") - set(MINGW_TOOLCHAIN x86_64) + set(MINGW_HOST_TYPE x86_64) set(MINGW_NAME mingw64) set(MINGW_TARGET x86_64-w64-mingw32) elseif(${TARGET_ARCH} MATCHES "x86|ARM64") - set(MINGW_TOOLCHAIN i686) + set(MINGW_HOST_TYPE i686) set(MINGW_NAME mingw32) set(MINGW_TARGET i686-w64-mingw32) endif() endif() - set(MINGW_TOOLCHAIN mingw-${MINGW_W}-${MINGW_TOOLCHAIN}) + set(MINGW_TOOLCHAIN mingw-${MINGW_W}-${MINGW_HOST_TYPE}) set(MINGW_PACKAGES_LIST gcc make pkg-config) foreach(_pack ${MINGW_PACKAGES_LIST}) @@ -200,7 +200,6 @@ function(vcpkg_configure_make) # Pre-processing windows configure requirements if (CMAKE_HOST_WIN32) - ## Please read https://github.com/orlp/dev-on-windows/wiki/Installing-GCC--&-MSYS2 set(VCPKG_POLICY_SKIP_DUMPBIN_CHECKS enabled PARENT_SCOPE) # since we cannot use dumpbin on the generated dll'ds vcpkg_find_acquire_program(YASM) @@ -222,7 +221,7 @@ function(vcpkg_configure_make) set(BUILD_TARGET "--build=${MINGW_TARGET} --target==${MINGW_TARGET}") set(HOST_TYPE --host=i686-w64-mingw32) elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL x64) - set(BUILD_TARGET "--build=${MINGW_TARGET} --target==${MINGW_TARGET}") + set(BUILD_TARGET "--build=${MINGW_TARGET} --target==${MINGW_TARGET}") set(HOST_TYPE --host=x86_64-w64-mingw64) elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL arm) set(BUILD_TARGET --target=arm-pc-mingw32) From e07ad03723ec9b26682e8825efda1bf926601a59 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 6 Feb 2020 16:35:58 +0100 Subject: [PATCH 406/419] working commit z/n --- ports/xlib/portfile.cmake | 129 +++++++++++++++++++++++++++++++++++++- 1 file changed, 128 insertions(+), 1 deletion(-) diff --git a/ports/xlib/portfile.cmake b/ports/xlib/portfile.cmake index 2a9791cd92d1c1..8fba6ac8114df3 100644 --- a/ports/xlib/portfile.cmake +++ b/ports/xlib/portfile.cmake @@ -14,8 +14,35 @@ vcpkg_from_gitlab( set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") if(VCPKG_TARGET_IS_WINDOWS) - set(OPTIONS --enable-malloc0returnsnull=no) + set(OPTIONS + --enable-malloc0returnsnull=no #Configre fails to run the test for some reason + --enable-loadable-i18n=no #Pointer conversion errors + ) endif() +if(NOT XLSTPROC) + if(WIN32) + set(HOST_TRIPLETS x64-windows x64-windows-static x86-windows x86-windows-static) + elseif(APPLE) + set(HOST_TRIPLETS x64-osx) + elseif(UNIX) + set(HOST_TRIPLETS x64-linux) + endif() + foreach(HOST_TRIPLET ${HOST_TRIPLETS}) + find_program(XLSTPROC NAMES xsltproc${VCPKG_HOST_EXECUTABLE_SUFFIX} PATHS "${CURRENT_INSTALLED_DIR}/../${HOST_TRIPLET}/tools/libxslt") + if(XLSTPROC) + break() + endif() + endforeach() +endif() +if(NOT XLSTPROC) + message(FATAL_ERROR "${PORT} requires xlstproc for the host system. Please install libxslt within vcpkg or your system package manager!") +endif() +get_filename_component(XLSTPROC_DIR "${XLSTPROC}" DIRECTORY) +file(TO_NATIVE_PATH "${XLSTPROC_DIR}" XLSTPROC_DIR_NATIVE) +vcpkg_add_to_path("${XLSTPROC_DIR}") +set(ENV{XLSTPROC} "${XLSTPROC}") + +vcpkg_find_acquire_program(PERL) vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} AUTOCONFIG @@ -45,3 +72,103 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) # # Handle copyright file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +# configure --help +# Optional Features: + # --disable-option-checking ignore unrecognized --enable/--with options + # --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + # --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + # --enable-dependency-tracking + # do not reject slow dependency extractors + # --disable-dependency-tracking + # speeds up one-time build + # --enable-silent-rules less verbose build output (undo: "make V=1") + # --disable-silent-rules verbose build output (undo: "make V=0") + # --enable-shared[=PKGS] build shared libraries [default=yes] + # --enable-static[=PKGS] build static libraries [default=yes] + # --enable-fast-install[=PKGS] + # optimize for fast installation [default=yes] + # --disable-libtool-lock avoid locking (might break parallel builds) + # --disable-largefile omit support for large files + # --disable-selective-werror + # Turn off selective compiler errors. (default: + # enabled) + # --enable-strict-compilation + # Enable all warnings from compiler and make them + # errors (default: disabled) + # --enable-specs Enable building the specs (default: yes) + # --enable-unix-transport Enable UNIX domain socket transport + # --enable-tcp-transport Enable TCP socket transport + # --enable-ipv6 Enable IPv6 support + # --enable-local-transport + # Enable os-specific local transport + # --enable-loadable-i18n Controls loadable i18n module support + # --disable-loadable-xcursor + # Controls loadable xcursor library support + # --disable-xthreads Disable Xlib support for Multithreading + # --disable-xcms Disable Xlib support for CMS *EXPERIMENTAL* + # --disable-xlocale Disable Xlib locale implementation *EXPERIMENTAL* + # --enable-xlocaledir Enable XLOCALEDIR environment variable support + # --disable-xf86bigfont Disable XF86BigFont extension support + # --disable-xkb Disable XKB support *EXPERIMENTAL* + # --disable-composecache Disable compose table cache support + # --enable-lint-library Create lint library (default: disabled) + # --enable-malloc0returnsnull + # malloc(0) returns NULL (default: auto) + +# Optional Packages: + # --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + # --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + # --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use + # both] + # --with-aix-soname=aix|svr4|both + # shared library versioning (aka "SONAME") variant to + # provide on AIX, [default=aix]. + # --with-gnu-ld assume the C compiler uses GNU ld [default=no] + # --with-sysroot[=DIR] Search for dependent libraries within DIR (or the + # compiler's sysroot if not specified). + # --with-xmlto Use xmlto to regenerate documentation (default: + # auto) + # --with-fop Use fop to regenerate documentation (default: no) + # --with-xsltproc Use xsltproc for the transformation of XML documents + # (default: auto) + # --with-perl Use perl for extracting information from files + # (default: auto) + # --with-launchd Build with support for Apple's launchd (default: + # auto) + # --with-keysymdefdir=DIR The location of keysymdef.h (defaults to xproto + # include dir) + # --with-lint Use a lint-style source code checker (default: + # disabled) + # --with-locale-lib-dir=DIR + # Directory where locale libraries files are installed + # (default: $libdir/X11/locale) + +# Some influential environment variables: + # CC C compiler command + # CFLAGS C compiler flags + # LDFLAGS linker flags, e.g. -L if you have libraries in a + # nonstandard directory + # LIBS libraries to pass to the linker, e.g. -l + # CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if + # you have headers in a nonstandard directory + # CPP C preprocessor + # LT_SYS_LIBRARY_PATH + # User-defined run-time library search path. + # PKG_CONFIG path to pkg-config utility + # PKG_CONFIG_PATH + # directories to add to pkg-config's search path + # PKG_CONFIG_LIBDIR + # path overriding pkg-config's built-in search path + # XMLTO Path to xmlto command + # FOP Path to fop command + # XSLTPROC Path to xsltproc command + # PERL Path to perl command + # BIGFONT_CFLAGS + # C compiler flags for BIGFONT, overriding pkg-config + # BIGFONT_LIBS + # linker flags for BIGFONT, overriding pkg-config + # LINT Path to a lint-style command + # LINT_FLAGS Flags for the lint-style command + # X11_CFLAGS C compiler flags for X11, overriding pkg-config + # X11_LIBS linker flags for X11, overriding pkg-config + From 999add539726e0dcfd00669efd0320f29660961d Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 6 Feb 2020 17:02:02 +0100 Subject: [PATCH 407/419] more patches. Seems like xlib only works for x86 due to a sizeof(char*) == 32 assumption which fails on x64 due to sizeof(char*) == 64 --- ports/xcb/portfile.cmake | 3 +-- ports/xcb/windefs.patch | 13 +++++++++++++ ports/xproto/portfile.cmake | 2 +- ports/xproto/xmd.h.patch | 36 +++++++++++++++++++----------------- 4 files changed, 34 insertions(+), 20 deletions(-) create mode 100644 ports/xcb/windefs.patch diff --git a/ports/xcb/portfile.cmake b/ports/xcb/portfile.cmake index 920bca98a7e50b..b4066204db42b0 100644 --- a/ports/xcb/portfile.cmake +++ b/ports/xcb/portfile.cmake @@ -9,13 +9,12 @@ vcpkg_from_gitlab( HEAD_REF master # branch name PATCHES makefile.patch #without the patch target xproto.c is missing target XCBPROTO_XCBINCLUDEDIR time.patch # missing include + windefs.patch # avoid pulling in conflicting definitions. ) set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") if(VCPKG_TARGET_IS_WINDOWS) set(OPTIONS --disable-dependency-tracking) - #list(APPEND VCPKG_CXX_FLAGS /D__ILP32__) - #list(APPEND VCPKG_C_FLAGS /D__ILP32__) endif() vcpkg_find_acquire_program(PYTHON3) diff --git a/ports/xcb/windefs.patch b/ports/xcb/windefs.patch new file mode 100644 index 00000000000000..86c7c9698ad674 --- /dev/null +++ b/ports/xcb/windefs.patch @@ -0,0 +1,13 @@ +diff --git a/src/xcb_windefs.h b/src/xcb_windefs.h +index df6026da3..8c8040c5a 100644 +--- a/src/xcb_windefs.h ++++ b/src/xcb_windefs.h +@@ -31,7 +31,7 @@ + #define WINVER 0x0501 /* required for getaddrinfo/freeaddrinfo defined only for WinXP and above */ + #endif + +-#include ++#include + #include + #include + diff --git a/ports/xproto/portfile.cmake b/ports/xproto/portfile.cmake index f6095f05c87483..1eae0bf45901c5 100644 --- a/ports/xproto/portfile.cmake +++ b/ports/xproto/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_from_gitlab( SHA512 52540660d22e80a40c16c0f36fe66d76ce738a32a31c294126f0ec4519cc696f553ab46abf889487295b3e2e32feff94be4ce2a1e74dd66d964a1ff903a58e1e HEAD_REF master # branch name PATCHES - #xmd.h.patch #patch name + xmd.h.patch #patch name windows-long64.patch winsock2.patch # include winsock2.h before windows.h ) diff --git a/ports/xproto/xmd.h.patch b/ports/xproto/xmd.h.patch index 19703e95efeb05..94cfcb0841063b 100644 --- a/ports/xproto/xmd.h.patch +++ b/ports/xproto/xmd.h.patch @@ -2,30 +2,32 @@ diff --git a/include/X11/Xmd.h b/include/X11/Xmd.h index 492465e6c..a7fbbbcdd 100644 --- a/include/X11/Xmd.h +++ b/include/X11/Xmd.h -@@ -64,7 +64,7 @@ SOFTWARE. - defined(__s390x__) || \ - defined(__amd64__) || defined(amd64) || \ - defined(__powerpc64__) --# if !defined(__ILP32__) /* amd64-x32 is 32bit */ -+# if !defined(__ILP32__) && !(defined(_WIN32) || defined(WIN32)) /* amd64-x32 is 32bit */ - # define LONG64 /* 32/64-bit architecture */ - # endif /* !__ILP32__ */ - # endif -@@ -93,7 +93,7 @@ SOFTWARE. - */ +@@ -94,7 +94,13 @@ SOFTWARE. # define B32 /* bitfield not needed on architectures with native 32-bit type */ # define B16 /* bitfield not needed on architectures with native 16-bit type */ --# ifdef LONG64 -+# if defined(LONG64) || !(defined(_WIN32) || defined(WIN32)) + # ifdef LONG64 ++# if !defined(_WIN32) || !defined(WIN32) ++_Static_assert( sizeof(long) * 8 == 64, "Error!"); typedef long INT64; ++# else ++_Static_assert( sizeof(long long) * 8 == 64, "Error!"); ++typedef long long INT64; ++# endif typedef int INT32; # else -@@ -103,7 +103,7 @@ typedef short INT16; - + typedef long INT32; +@@ -104,7 +110,14 @@ typedef short INT16; typedef signed char INT8; --# ifdef LONG64 -+# if defined(LONG64) || !(defined(_WIN32) || defined(WIN32)) + # ifdef LONG64 ++# if !defined(_WIN32) || !defined(WIN32) ++_Static_assert( sizeof(long) * 8 == 64, "Error!"); typedef unsigned long CARD64; ++# else ++_Static_assert( sizeof(long long) * 8 == 64, "Error!"); ++typedef unsigned long long CARD64; ++# endif ++ typedef unsigned int CARD32; # else + typedef unsigned long long CARD64; From 05afb75fd1e927f5873f5df9c451774a7cda3c35 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 6 Feb 2020 20:42:00 +0100 Subject: [PATCH 408/419] reorder configure patches after autoconf --- ports/elfutils/portfile.cmake | 2 +- scripts/cmake/vcpkg_configure_make.cmake | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/ports/elfutils/portfile.cmake b/ports/elfutils/portfile.cmake index 5d257d37d5be28..4a0d26730306b7 100644 --- a/ports/elfutils/portfile.cmake +++ b/ports/elfutils/portfile.cmake @@ -31,7 +31,7 @@ vcpkg_configure_make( --with-zlib=${CURRENT_INSTALLED_DIR}/debug --with-bzlib=${CURRENT_INSTALLED_DIR}/debug --with-lzma=${CURRENT_INSTALLED_DIR}/debug - CONFIGURE_PATCHES configure.dep.patch + CONFIGURE_PATCHES configure.dep.patch PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index a10e1cb0c2d999..809f49a594a63b 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -375,6 +375,9 @@ function(vcpkg_configure_make) LOGNAME autoconf-${TARGET_TRIPLET} ) endif() + if(_csc_CONFIGURE_PATCHES) + vcpkg_apply_patches(SOURCE_PATH "${SRC_DIR}" PATCHES "${_csc_CONFIGURE_PATCHES}") + endif() message(STATUS "Finished configure for ${TARGET_TRIPLET}") endif() @@ -440,9 +443,6 @@ function(vcpkg_configure_make) endif() if (NOT _csc_SKIP_CONFIGURE) - if(_csc_CONFIGURE_PATCHES) - vcpkg_apply_patches(SOURCE_PATH "${PRJ_DIR}" PATCHES "${_csc_CONFIGURE_PATCHES}") - endif() message(STATUS "Configuring ${TARGET_TRIPLET}-dbg") vcpkg_execute_required_process( COMMAND ${dbg_command} @@ -510,9 +510,6 @@ function(vcpkg_configure_make) # endif() if (NOT _csc_SKIP_CONFIGURE) - if(_csc_CONFIGURE_PATCHES) - vcpkg_apply_patches(SOURCE_PATH "${PRJ_DIR}" PATCHES "${_csc_CONFIGURE_PATCHES}") - endif() message(STATUS "Configuring ${TAR_TRIPLET_DIR}") vcpkg_execute_required_process( COMMAND ${rel_command} From 43ec800a5b1de5de08c5647816ae7e845b5f142a Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 6 Feb 2020 23:25:00 +0100 Subject: [PATCH 409/419] fix build error --- ports/font-util/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/font-util/portfile.cmake b/ports/font-util/portfile.cmake index c23ab35eff4b25..5c34e2d0b994fc 100644 --- a/ports/font-util/portfile.cmake +++ b/ports/font-util/portfile.cmake @@ -37,8 +37,8 @@ file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/xorg/") file(RENAME "${CURRENT_PACKAGES_DIR}/share/aclocal/" "${CURRENT_PACKAGES_DIR}/share/xorg/aclocal") file(RENAME "${CURRENT_PACKAGES_DIR}/share/fonts/" "${CURRENT_PACKAGES_DIR}/share/xorg/fonts") #file(RENAME "${CURRENT_PACKAGES_DIR}/share/font-util/" "${CURRENT_PACKAGES_DIR}/share/xorg/font-util") -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/man") -file(RENAME "${CURRENT_PACKAGES_DIR}/share/man/" "${CURRENT_PACKAGES_DIR}/share/${PORT}/man") +#file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/man") +#file(RENAME "${CURRENT_PACKAGES_DIR}/share/man/" "${CURRENT_PACKAGES_DIR}/share/${PORT}/man") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/") file(RENAME "${CURRENT_PACKAGES_DIR}/bin/" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/") From dadd7adb993b658b2ea1b1083067ecde19ba6d44 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 6 Feb 2020 23:25:19 +0100 Subject: [PATCH 410/419] fix options --- scripts/cmake/vcpkg_configure_make.cmake | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index 809f49a594a63b..a81e0404a0a95a 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -144,7 +144,7 @@ function(vcpkg_configure_make) cmake_parse_arguments(_csc "AUTOCONFIG;DISABLE_AUTO_HOST;DISABLE_AUTO_DST;NO_DEBUG;SKIP_CONFIGURE" "SOURCE_PATH;PROJECT_SUBPATH;GENERATOR;PRERUN_SHELL" - "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE;PKG_CONFIG_PATHS;PKG_CONFIG_PATHS_DEBUG;PKG_CONFIG_PATHS_RELEASE;CONFIGURE_PATCHES" + "OPTIONS_DEBUG;OPTIONS_RELEASE;OPTIONS;PKG_CONFIG_PATHS_DEBUG;PKG_CONFIG_PATHS_RELEASE;PKG_CONFIG_PATHS;CONFIGURE_PATCHES" ${ARGN} ) @@ -283,7 +283,7 @@ function(vcpkg_configure_make) "--includedir=${EXTRA_QUOTES}${_VCPKG_PREFIX}/include${EXTRA_QUOTES}" "--mandir=${EXTRA_QUOTES}${_VCPKG_PREFIX}/share/${PORT}${EXTRA_QUOTES}" "--docdir=${EXTRA_QUOTES}${_VCPKG_PREFIX}/share/${PORT}${EXTRA_QUOTES}") - set(_csc_OPTIONS_DEBUG ${_csc_OPTIONS_RELEASE} + set(_csc_OPTIONS_DEBUG ${_csc_OPTIONS_DEBUG} "--prefix=${EXTRA_QUOTES}${_VCPKG_PREFIX}/debug${EXTRA_QUOTES}" "--bindir=${EXTRA_QUOTES}${_VCPKG_PREFIX}/debug/bin${EXTRA_QUOTES}" "--sbindir=${EXTRA_QUOTES}${_VCPKG_PREFIX}/debug/bin${EXTRA_QUOTES}" @@ -326,11 +326,10 @@ function(vcpkg_configure_make) ${base_cmd} -c "${COMPILER_CC} eval ./../${RELATIVE_BUILD_PATH}/configure \"${BUILD_TARGET} ${HOST_TYPE} ${_csc_OPTIONS} ${_csc_OPTIONS_RELEASE}\"") set(dbg_command ${base_cmd} -c "${COMPILER_CC} eval ./../${RELATIVE_BUILD_PATH}/configure \"${BUILD_TARGET} ${HOST_TYPE} ${_csc_OPTIONS} ${_csc_OPTIONS_DEBUG}\"") - + else() set(rel_command "./../${RELATIVE_BUILD_PATH}/configure" ${_csc_OPTIONS} ${_csc_OPTIONS_RELEASE}) set(dbg_command "./../${RELATIVE_BUILD_PATH}/configure" ${_csc_OPTIONS} ${_csc_OPTIONS_DEBUG}) - endif() # Backup enviromnent variables From 86d6a83c29ea66567148a6c327af397b8ea93f49 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 6 Feb 2020 23:26:18 +0100 Subject: [PATCH 411/419] add libraries explicitly --- ports/xfont/portfile.cmake | 103 +++++++++++++++++++++++++++++++++++-- 1 file changed, 99 insertions(+), 4 deletions(-) diff --git a/ports/xfont/portfile.cmake b/ports/xfont/portfile.cmake index 541cbd2f661b7b..54a066bb729716 100644 --- a/ports/xfont/portfile.cmake +++ b/ports/xfont/portfile.cmake @@ -11,7 +11,17 @@ vcpkg_from_gitlab( ) set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") - +if(VCPKG_TARGET_IS_WINDOWS) + set(DEPS_DEBUG + "FREETYPE_LIBS=\"-L${CURRENT_INSTALLED_DIR}/debug/lib/ -lfreetype -lpng16d -lzlib -lbz2d\"") + set(DEPS_RELEASE + "FREETYPE_LIBS=\"-L${CURRENT_INSTALLED_DIR}/lib/ -lfreetype -lpng16 -lzlibd -lbz2\"") +else() + set(DEPS_DEBUG + "FREETYPE_LIBS=\"-L${CURRENT_INSTALLED_DIR}/debug/lib/ -lfreetype -lpng16d -lz -lbz2d\"") + set(DEPS_RELEASE + "FREETYPE_LIBS=\"-L${CURRENT_INSTALLED_DIR}/lib/ -lfreetype -lpng16 -lz -lbz2\"") +endif() vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} AUTOCONFIG @@ -20,9 +30,9 @@ vcpkg_configure_make( #AUTO_HOST #AUTO_DST #PRERUN_SHELL "export ACLOCAL=\"aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/\"" - #OPTIONS - #OPTIONS_DEBUG - #OPTIONS_RELEASE + #OPTIONS + OPTIONS_DEBUG ${DEPS_DEBUG} + OPTIONS_RELEASE ${DEPS_RELEASE} PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) @@ -36,3 +46,88 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) # # Handle copyright file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +# Optional Features: + # --disable-option-checking ignore unrecognized --enable/--with options + # --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + # --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + # --enable-silent-rules less verbose build output (undo: "make V=1") + # --disable-silent-rules verbose build output (undo: "make V=0") + # --enable-dependency-tracking + # do not reject slow dependency extractors + # --disable-dependency-tracking + # speeds up one-time build + # --enable-shared[=PKGS] build shared libraries [default=yes] + # --enable-static[=PKGS] build static libraries [default=yes] + # --enable-fast-install[=PKGS] + # optimize for fast installation [default=yes] + # --disable-libtool-lock avoid locking (might break parallel builds) + # --disable-selective-werror + # Turn off selective compiler errors. (default: + # enabled) + # --enable-strict-compilation + # Enable all warnings from compiler and make them + # errors (default: disabled) + # --enable-devel-docs Enable building the developer documentation + # (default: yes) + # --disable-freetype Build freetype backend (default: enabled) + # --disable-builtins Support builtin fonts (default: enabled) + # --disable-pcfformat Support PCF format bitmap fonts (default: enabled) + # --disable-bdfformat Support BDF format bitmap fonts (default: enabled) + # --enable-snfformat Support SNF format bitmap fonts (default: disabled) + # --disable-fc Support connections to xfs servers (default: + # enabled) + # --enable-unix-transport Enable UNIX domain socket transport + # --enable-tcp-transport Enable TCP socket transport + # --enable-ipv6 Enable IPv6 support + # --enable-local-transport + # Enable os-specific local transport + +# Optional Packages: + # --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + # --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + # --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use + # both] + # --with-aix-soname=aix|svr4|both + # shared library versioning (aka "SONAME") variant to + # provide on AIX, [default=aix]. + # --with-gnu-ld assume the C compiler uses GNU ld [default=no] + # --with-sysroot[=DIR] Search for dependent libraries within DIR (or the + # compiler's sysroot if not specified). + # --with-xmlto Use xmlto to regenerate documentation (default: + # auto) + # --with-fop Use fop to regenerate documentation (default: auto) + # --with-freetype-config=PROG + # Use FreeType configuration program PROG + # --with-bzip2 Use libbz2 to support bzip2 compressed bitmap fonts + # (default: no) + +# Some influential environment variables: + # CC C compiler command + # CFLAGS C compiler flags + # LDFLAGS linker flags, e.g. -L if you have libraries in a + # nonstandard directory + # LIBS libraries to pass to the linker, e.g. -l + # CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if + # you have headers in a nonstandard directory + # CPP C preprocessor + # LT_SYS_LIBRARY_PATH + # User-defined run-time library search path. + # PKG_CONFIG path to pkg-config utility + # PKG_CONFIG_PATH + # directories to add to pkg-config's search path + # PKG_CONFIG_LIBDIR + # path overriding pkg-config's built-in search path + # XMLTO Path to xmlto command + # FOP Path to fop command + # FREETYPE_CFLAGS + # C compiler flags for FREETYPE, overriding pkg-config + # FREETYPE_LIBS + # linker flags for FREETYPE, overriding pkg-config + # XFONT_CFLAGS + # C compiler flags for XFONT, overriding pkg-config + # XFONT_LIBS linker flags for XFONT, overriding pkg-config + +# Use these variables to override the choices made by `configure' or to help +# it to find libraries and programs with nonstandard names/locations. + +# Report bugs to . From eb924adf8c1cac2bba6e7d65b30369a8ab78458f Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 6 Feb 2020 23:35:11 +0100 Subject: [PATCH 412/419] add nettle port --- ports/nettle/CONTROL | 5 +++++ ports/nettle/portfile.cmake | 38 +++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 ports/nettle/CONTROL create mode 100644 ports/nettle/portfile.cmake diff --git a/ports/nettle/CONTROL b/ports/nettle/CONTROL new file mode 100644 index 00000000000000..1bacf4d21b8953 --- /dev/null +++ b/ports/nettle/CONTROL @@ -0,0 +1,5 @@ +Source: nettle +Version: 3.5.1 +Homepage: https://git.lysator.liu.se/nettle/nettle +Description: Nettle is a low-level cryptographic library that is designed to fit easily in more or less any context: In crypto toolkits for object-oriented languages (C++, Python, Pike, ...), in applications like LSH or GNUPG, or even in kernel space. +Supports: !uwp \ No newline at end of file diff --git a/ports/nettle/portfile.cmake b/ports/nettle/portfile.cmake new file mode 100644 index 00000000000000..343123d6e1a926 --- /dev/null +++ b/ports/nettle/portfile.cmake @@ -0,0 +1,38 @@ +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) + +## requires AUTOCONF, LIBTOOL and PKCONF +message(STATUS "----- ${PORT} requires autoconf, libtool and pkconf from the system package manager! \n ----- sudo apt-get install autogen autoconf libtool-----") + +vcpkg_from_gitlab( + GITLAB_URL https://git.lysator.liu.se/ + OUT_SOURCE_PATH SOURCE_PATH + REPO nettle/nettle + REF ee5d62898cf070f08beedc410a8d7c418588bd95 #v3.5.1 + SHA512 881912548f4abb21460f44334de11439749c8a055830849a8beb4332071d11d9196d9eecaeba5bf822819d242356083fba91eb8719a64f90e41766826e6d75e1 + HEAD_REF master # branch name + #PATCHES example.patch #patch name +) + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL ${SHELL_PATH} + OPTIONS + --disable-documentation + #OPTIONS_DEBUG + #OPTIONS_RELEASE + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" +) + +vcpkg_install_make() +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share/) + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +# # Post-build test for cmake libraries +# vcpkg_test_cmake(PACKAGE_NAME Xlib) From c50d75d9bdd9155d0bfe301d71125e3ebb8f3896 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 6 Feb 2020 23:35:51 +0100 Subject: [PATCH 413/419] change buildsystem to meson --- ports/pixman/CONTROL | 2 +- ports/pixman/portfile.cmake | 67 +++++++++++++++++++++++-------------- 2 files changed, 43 insertions(+), 26 deletions(-) diff --git a/ports/pixman/CONTROL b/ports/pixman/CONTROL index d081eaacfa2809..0b7bd0115492bb 100644 --- a/ports/pixman/CONTROL +++ b/ports/pixman/CONTROL @@ -1,4 +1,4 @@ Source: pixman -Version: 0.38.4-1 +Version: 0.38.4-2 Homepage: https://www.cairographics.org/releases Description: Pixman is a low-level software library for pixel manipulation, providing features such as image compositing and trapezoid rasterization. diff --git a/ports/pixman/portfile.cmake b/ports/pixman/portfile.cmake index 6e4f2f626f98df..095ee58709063f 100644 --- a/ports/pixman/portfile.cmake +++ b/ports/pixman/portfile.cmake @@ -14,34 +14,51 @@ vcpkg_extract_source_archive_ex( REF ${PIXMAN_VERSION} ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}/pixman) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/pixman - PREFER_NINJA +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" ) +vcpkg_install_meson() +vcpkg_fixup_pkgconfig() -vcpkg_install_cmake() - -vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-pixman TARGET_PATH share/unofficial-pixman) - -# Copy the appropriate header files. -file(COPY - "${SOURCE_PATH}/pixman/pixman.h" - "${SOURCE_PATH}/pixman/pixman-accessor.h" - "${SOURCE_PATH}/pixman/pixman-combine32.h" - "${SOURCE_PATH}/pixman/pixman-compiler.h" - "${SOURCE_PATH}/pixman/pixman-edge-imp.h" - "${SOURCE_PATH}/pixman/pixman-inlines.h" - "${SOURCE_PATH}/pixman/pixman-private.h" - "${SOURCE_PATH}/pixman/pixman-version.h" - DESTINATION ${CURRENT_PACKAGES_DIR}/include -) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +# file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}/pixman) + +# vcpkg_configure_cmake( + # SOURCE_PATH ${SOURCE_PATH}/pixman + # PREFER_NINJA +# ) + +# vcpkg_install_cmake() + +# #vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-pixman TARGET_PATH share/unofficial-pixman) + +# # Copy the appropriate header files. +# file(COPY + # "${SOURCE_PATH}/pixman/pixman.h" + # "${SOURCE_PATH}/pixman/pixman-accessor.h" + # "${SOURCE_PATH}/pixman/pixman-combine32.h" + # "${SOURCE_PATH}/pixman/pixman-compiler.h" + # "${SOURCE_PATH}/pixman/pixman-edge-imp.h" + # "${SOURCE_PATH}/pixman/pixman-inlines.h" + # "${SOURCE_PATH}/pixman/pixman-private.h" + # "${SOURCE_PATH}/pixman/pixman-version.h" + # DESTINATION ${CURRENT_PACKAGES_DIR}/include +# ) -# Handle copyright -file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/pixman) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/pixman/COPYING ${CURRENT_PACKAGES_DIR}/share/pixman/copyright) +# # Handle copyright +# file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/pixman) +# file(RENAME ${CURRENT_PACKAGES_DIR}/share/pixman/COPYING ${CURRENT_PACKAGES_DIR}/share/pixman/copyright) -vcpkg_copy_pdbs() +# vcpkg_copy_pdbs() +# vcpkg_fixup_pkgconfig() -vcpkg_test_cmake(PACKAGE_NAME unofficial-pixman) +# vcpkg_test_cmake(PACKAGE_NAME unofficial-pixman) From c27e3a82b0a6193186b4b7114ca9042046c74c9f Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 6 Feb 2020 23:37:26 +0100 Subject: [PATCH 414/419] make nettle install --- ports/nettle/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/nettle/portfile.cmake b/ports/nettle/portfile.cmake index 343123d6e1a926..5664583550423b 100644 --- a/ports/nettle/portfile.cmake +++ b/ports/nettle/portfile.cmake @@ -33,6 +33,6 @@ vcpkg_install_make() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share/) # # Handle copyright -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYINGv3" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) # # Post-build test for cmake libraries # vcpkg_test_cmake(PACKAGE_NAME Xlib) From 5adb8fb0153f7c699a4698e2217196670180730b Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 6 Feb 2020 23:37:37 +0100 Subject: [PATCH 415/419] update xserver --- ports/qt5-base/cmake/qt_parse_prl.cmake | 138 ++++++++++++++++++++++++ ports/xserver/CONTROL | 2 +- ports/xserver/portfile.cmake | 7 +- 3 files changed, 144 insertions(+), 3 deletions(-) create mode 100644 ports/qt5-base/cmake/qt_parse_prl.cmake diff --git a/ports/qt5-base/cmake/qt_parse_prl.cmake b/ports/qt5-base/cmake/qt_parse_prl.cmake new file mode 100644 index 00000000000000..aa3799123e8d6a --- /dev/null +++ b/ports/qt5-base/cmake/qt_parse_prl.cmake @@ -0,0 +1,138 @@ +function(_qt5_parse_prl) + cmake_parse_arguments(_qt_prl "" "CONFIGURATION;TARGET;PRL_FILE;LIB_FILE;OUT_DEPS;OUT_FLAGS" "" ${ARGN}) + if(NOT _qt_prl_CONFIGURATION) + message(FATAL_ERROR "qt_parse_prl requires parameter CONFIGURATION") + endif() + if(NOT _qt_prl_TARGET) + message(FATAL_ERROR "qt_parse_prl requires parameter TARGET") + endif() + if(NOT _qt_prl_PRL_FILE AND NOT _qt_prl_LIB_FILE) + message(FATAL_ERROR "qt_parse_prl requires parameter PRL_FILE or LIB_FILE") + endif() + if(NOT _qt_prl_OUT_DEPS) + message(FATAL_ERROR "qt_parse_prl requires parameter OUT_DEPS") + endif() + if(NOT _qt_prl_OUT_FLAGS) + message(FATAL_ERROR "qt_parse_prl requires parameter OUT_FLAGS") + endif() + + if(_qt_prl_LIB_FILE) + set(_parsed_prl "${_qt_prl_LIB_FILE}") + string(REGEX REPLACE "\.(lib|a)$" ".prl" _parsed_prl "${_parsed_prl}") + else() + set(_parsed_prl "${_qt_prl_PRL_FILE}") + endif() + + message(STATUS "Reading file: ${_parsed_prl}") + if(NOT EXISTS "${_parsed_prl}") + message(FATAL_ERROR "Could not find PRL file: ${_parsed_prl}") + endif() + file(STRINGS "${_parsed_prl}" _static_depends REGEX "^QMAKE_PRL_LIBS[ \t]+=[ \t]+.+$") + message(STATUS "QMAKE_PRL_LIBS as read : ${_static_depends}\n\n") + string(REGEX REPLACE "QMAKE_PRL_LIBS[ \t]+=[ \t]+" "" _static_depends "${_static_depends}") + string(REGEX REPLACE " -L\\$\\$([^ ]+)" [[ ;-L$$\1; ]] _static_depends "${_static_depends}") # - L Normal Case + if(WIN32) + string(REGEX REPLACE "-L\\\"([^\\\"]+)\\\"" " ;-L\"\\1\"; " _static_depends "${_static_depends}") # -L Tricky Case with spaces + string(REGEX REPLACE [[\"?[A-Z]:\\\\Program Files( \(x86\))*\\\\Windows Kits\\\\[0-9]+\\\\lib\\\\[0-9|.]+\\\\um\\\\x64(\\\\|/)([^\"]+)\"?]] ";\\3;" _static_depends "${_static_depends}") + # Every path with a space in it should be handled now! + else() + string(REGEX REPLACE " -l([^ ]+)" [[;-l\1;]] _static_depends "${_static_depends}") # - l case on targets other than windows + endif() + string(REGEX REPLACE "[\t ]+[^\\\"]([^( |\\\")]+)[^\\\"]([\t ]+|[\t ]*$)" ";\\0; " _static_depends "${_static_depends}") + string(REGEX REPLACE "[\t ]*;[\t ]*" ";" _static_depends "${_static_depends}") # remove unnecessary whitespaces + string(REGEX REPLACE "(;[\t ]*;)+" ";" _static_depends "${_static_depends}") # remove empty elements from the list + message(STATUS "QMAKE_PRL_LIBS as a list : ${_static_depends}\n\n") + + #Logic Backported from Qt 5.14 + if("${_qt_prl_CONFIGURATION}" STREQUAL "DEBUG") + set(_prl_location "${_qt5Core_install_prefix}/debug/lib/${LIB_LOCATION}") + else() + set(_prl_location "${_qt5Core_install_prefix}/lib/${LIB_LOCATION}") + endif() + string(REPLACE "$$[QT_INSTALL_LIBS]/" "${_prl_location}" _static_depends "${_static_depends}") + string(REGEX REPLACE "[ \t]+" ";" _standard_libraries "${CMAKE_CXX_STANDARD_LIBRARIES}") + foreach(_flag IN LISTS _static_depends) + if(_flag MATCHES "^-l(.*)$") + # Handle normal libraries passed as -lfoo + set(_lib "${CMAKE_MATCH_1}") + foreach(_standard_library ${_standard_libraries}) + if(_standard_library MATCHES "^${_lib}(\.lib)?$") + set(_lib_is_default_linked TRUE) + break() + endif() + endforeach() + if (_lib_is_default_linked) + unset(_lib_is_default_linked) + elseif(_lib MATCHES "^pthread$") + find_package(Threads REQUIRED) + list(APPEND _lib_deps Threads::Threads) + else() + if(_search_paths) + find_library(_Qt5Core_${Configuration}_${_lib}_PATH ${_lib} HINTS ${_search_paths} NO_DEFAULT_PATH) + endif() + find_library(_Qt5Core_${Configuration}_${_lib}_PATH ${_lib}) + mark_as_advanced(_Qt5Core_${Configuration}_${_lib}_PATH) + if(_Qt5Core_${Configuration}_${_lib}_PATH) + list(APPEND _lib_deps + ${_Qt5Core_${Configuration}_${_lib}_PATH} + ) + else() + message(FATAL_ERROR "Library not found: ${_lib}") + endif() + endif() + elseif(EXISTS "${_flag}") + # The flag is an absolute path to an existing library + list(APPEND _lib_deps "${_flag}") + elseif(_flag MATCHES "^-L(.*)$") + # Handle -Lfoo flags by putting their paths in the search path used by find_library above + list(APPEND _search_paths "${CMAKE_MATCH_1}") + elseif(_flag MATCHES "\\.(lib|a|so)$") #Library name only. No -l. Probably missing some cases + #message(STATUS "Added to link deps (${Configuration}): ${_flag}") + list(APPEND _lib_deps ${_flag}) # changed from _link_flags + else() + # Handle all remaining flags by simply passing them to the linker + #message(STATUS "Added to link flags (${Configuration}): ${_flag}") + list(APPEND _lib_flags ${_flag}) # changed from _link_flags + endif() + endforeach() + + message(STATUS "${_qt_prl_TARGET} links (via PRL ${_qt_prl_CONFIGURATION}): ${_lib_deps}") + message(STATUS "${_qt_prl_TARGET} has linker flags (via PRL): ${_lib_flags}") + #get_target_property(_test_interface ${_qt_prl_TARGET} INTERFACE_LINK_LIBRARIES) + #message(STATUS "INTERFACE_LINK_LIBRARIES of target before ${_qt_prl_TARGET}: ${_test_interface} ") + set(_prl_out_libs) + foreach(_prl_lib IN LISTS _lib_deps) + if("${_qt_prl_CONFIGURATION}" STREQUAL "DEBUG") + #message(STATUS "DEBUG: ${_prl_lib}") + #set_property(TARGET ${_qt_prl_TARGET} APPEND PROPERTY INTERFACE_LINK_LIBRARIES "\$<\$:${_prl_lib}>") + list(APPEND _prl_out_libs "\$<\$:${_prl_lib}>") + else() + #message(STATUS "RELEASE: ${_prl_lib}") + #set_property(TARGET ${_qt_prl_TARGET} APPEND PROPERTY INTERFACE_LINK_LIBRARIES "\$<\$>:${_prl_lib}>") + list(APPEND _prl_out_libs "\$<\$>:${_prl_lib}>") + endif() + endforeach() + set(${_qt_prl_OUT_DEPS} ${_prl_out_libs} PARENT_SCOPE) + unset(_prl_lib) + + set(_prl_out_flags) + foreach(_prl_flag IN LISTS _lib_flags) + if("${_qt_prl_CONFIGURATION}" STREQUAL "DEBUG") + #set_property(TARGET ${_qt_prl_TARGET} APPEND PROPERTY INTERFACE_LINK_LIBRARIES "\$<\$:${_prl_flag}>") + list(APPEND _prl_out_flags "\$<\$:${_prl_flag}>") + else() + #set_property(TARGET ${_qt_prl_TARGET} APPEND PROPERTY INTERFACE_LINK_LIBRARIES "\$<\$>:${_prl_flag}>") + list(APPEND _prl_out_flags "\$<\$>:${_prl_flag}>") + endif() + endforeach() + set(${_qt_prl_OUT_FLAGS} ${_prl_out_flags} PARENT_SCOPE) + unset(_prl_flag) + + #get_target_property(_test_interface ${_qt_prl_TARGET} INTERFACE_LINK_LIBRARIES) + #message(STATUS "INTERFACE_LINK_LIBRARIES of target after ${_qt_prl_TARGET}: ${_test_interface} ") +endfunction() +#For testing; Run with cmake -P qt_parse_prl.cmake +set(prlfile "${CMAKE_CURRENT_LIST_DIR}/../../../installed/x64-windows-static/debug/lib/Qt5Cored.lib") +_qt5_parse_prl(CONFIGURATION "DEBUG" TARGET "Qt5::Qt5Core" LIB_FILE "${prlfile}" OUT_DEPS DEPS OUT_FLAGS FLAGS) +message(STATUS "DEPS: ${DEPS}") +message(STATUS "FLAGS: ${FLAGS}") \ No newline at end of file diff --git a/ports/xserver/CONTROL b/ports/xserver/CONTROL index 2cdd8c70c1af77..c00e05413d242d 100644 --- a/ports/xserver/CONTROL +++ b/ports/xserver/CONTROL @@ -2,4 +2,4 @@ Source: xserver Version: 1.20.7 Homepage: https://gitlab.freedesktop.org/xorg/xserver Description: C interface to the X Window System protocol, which replaces the traditional Xlib interface. -Build-Depends: xcb-proto, xcb-util-m4, xorg-macros, xproto, xtrans, x11 +Build-Depends: xcb-proto, xcb-util-m4, xorg-macros, xproto, xtrans, x11, pixman, xkbcommon, xkbfile, xfont, nettle diff --git a/ports/xserver/portfile.cmake b/ports/xserver/portfile.cmake index 4bfb126e42a2cd..c21b323ee7e9e2 100644 --- a/ports/xserver/portfile.cmake +++ b/ports/xserver/portfile.cmake @@ -10,8 +10,11 @@ vcpkg_from_gitlab( ) set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") -vcpkg_acquire_msys(MSYS_ROOT PACKAGES pkg-config) -vcpkg_add_to_path("${MSYS_ROOT}/usr/bin") + +if(WIN32) + vcpkg_acquire_msys(MSYS_ROOT PACKAGES pkg-config) + vcpkg_add_to_path("${MSYS_ROOT}/usr/bin") +endif() vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" From 4bd7d09e4b9d37541979ffb83bf84e1b0d3f22f7 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 7 Feb 2020 00:59:30 +0100 Subject: [PATCH 416/419] make xkbcomp work --- ports/xkbcomp/CONTROL | 5 ++++ ports/xkbcomp/configure.patch | 13 +++++++++++ ports/xkbcomp/portfile.cmake | 43 +++++++++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+) create mode 100644 ports/xkbcomp/CONTROL create mode 100644 ports/xkbcomp/configure.patch create mode 100644 ports/xkbcomp/portfile.cmake diff --git a/ports/xkbcomp/CONTROL b/ports/xkbcomp/CONTROL new file mode 100644 index 00000000000000..941b3e09975145 --- /dev/null +++ b/ports/xkbcomp/CONTROL @@ -0,0 +1,5 @@ +Source: xkbcomp +Version: 1.4.2 +Homepage: https://gitlab.freedesktop.org/xorg/app/xkbcomp +Description: XKB keyboard description compiler +Build-Depends: x11, xkbfile, xproto \ No newline at end of file diff --git a/ports/xkbcomp/configure.patch b/ports/xkbcomp/configure.patch new file mode 100644 index 00000000000000..dda38f97aedc64 --- /dev/null +++ b/ports/xkbcomp/configure.patch @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index ccee8f19a..74a9c84ca 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -47,7 +47,7 @@ fi + + AC_CHECK_FUNCS([strdup strcasecmp]) + +-REQUIRED_MODULES="x11 xkbfile xproto >= 7.0.17" ++REQUIRED_MODULES="x11 xkbfile x11-xcb xau xdmcp xproto >= 7.0.17" + + # Checks for pkg-config packages + PKG_CHECK_MODULES(XKBCOMP, [$REQUIRED_MODULES]) diff --git a/ports/xkbcomp/portfile.cmake b/ports/xkbcomp/portfile.cmake new file mode 100644 index 00000000000000..27f98baf44dfc1 --- /dev/null +++ b/ports/xkbcomp/portfile.cmake @@ -0,0 +1,43 @@ +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) +message(STATUS "----- ${PORT} requires autoconf, libtool and pkconf from the system package manager! -----") + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO app/xkbcomp + REF 2abe23d23d3755335c10ff573e4e1f93b682e9d9 # 1.4.2 + SHA512 43b47775afa0be884ec66446d3f12728225e83bbacdf56b6a00790672f783a351c779bbbf2482bd0276dc48347adca8db2e3dc061e56d262713e32a8251c66a7 + HEAD_REF master # branch name + PATCHES configure.patch #patch name +) + +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + #SKIP_CONFIGURE + #NO_DEBUG + #AUTO_HOST + #AUTO_DST + #PRERUN_SHELL "export ACLOCAL=\"aclocal -I ${CURRENT_INSTALLED_DIR}/share/xorg-macros/aclocal/\"" + OPTIONS + #"XKBCOMP_LIBS=\"-L${CURRENT_INSTALLED_DIR}/debug/lib -lX11 -lX11-xcb -lxkbfile\"" + #OPTIONS_DEBUG + #OPTIONS_RELEASE + PKG_CONFIG_PATHS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + PKG_CONFIG_PATHS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}") +file(RENAME "${CURRENT_PACKAGES_DIR}/bin/xkbcomp${VCPKG_TARGET_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/xkbcomp${VCPKG_TARGET_EXECUTABLE_SUFFIX}") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/bin") \ No newline at end of file From 6867887e2d65697a88bd01434bb6dbb0f85d184c Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 7 Feb 2020 00:59:40 +0100 Subject: [PATCH 417/419] make nettle work --- ports/nettle/portfile.cmake | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/ports/nettle/portfile.cmake b/ports/nettle/portfile.cmake index 5664583550423b..7c997e8a0a4225 100644 --- a/ports/nettle/portfile.cmake +++ b/ports/nettle/portfile.cmake @@ -30,9 +30,18 @@ vcpkg_configure_make( ) vcpkg_install_make() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share/) - +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share/") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # # Handle copyright file(INSTALL "${SOURCE_PATH}/COPYINGv3" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) # # Post-build test for cmake libraries # vcpkg_test_cmake(PACKAGE_NAME Xlib) + +set(TOOLS nettle-hash nettle-lfib-stream nettle-pbkdf2 sexp-conv) +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}") +foreach(tool ${TOOLS}) + file(RENAME "${CURRENT_PACKAGES_DIR}/bin/${tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/${tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}") +endforeach() +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR VCPKG_TARGET_IS_LINUX) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() \ No newline at end of file From 3f4f18e172f5d3fe1c797ed9168b6f7c4a82ab07 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 7 Feb 2020 00:59:49 +0100 Subject: [PATCH 418/419] add deps --- ports/xserver/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/xserver/CONTROL b/ports/xserver/CONTROL index c00e05413d242d..427414342cc9d6 100644 --- a/ports/xserver/CONTROL +++ b/ports/xserver/CONTROL @@ -2,4 +2,4 @@ Source: xserver Version: 1.20.7 Homepage: https://gitlab.freedesktop.org/xorg/xserver Description: C interface to the X Window System protocol, which replaces the traditional Xlib interface. -Build-Depends: xcb-proto, xcb-util-m4, xorg-macros, xproto, xtrans, x11, pixman, xkbcommon, xkbfile, xfont, nettle +Build-Depends: xcb-proto, xcb-util-m4, xorg-macros, xproto, xtrans, x11, pixman, xkbcommon, xkbfile, xfont, nettle, xkbcomp From 5ea671834f81463f5dba2345761ef1e59c8b10e0 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 7 Feb 2020 01:00:02 +0100 Subject: [PATCH 419/419] add remark for lookup how to build on windows --- ports/xlib/portfile.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/xlib/portfile.cmake b/ports/xlib/portfile.cmake index 8fba6ac8114df3..1f64f5bb949ae9 100644 --- a/ports/xlib/portfile.cmake +++ b/ports/xlib/portfile.cmake @@ -18,7 +18,8 @@ if(VCPKG_TARGET_IS_WINDOWS) --enable-malloc0returnsnull=no #Configre fails to run the test for some reason --enable-loadable-i18n=no #Pointer conversion errors ) -endif() + + #https://gitlab.freedesktop.org/xorg/xserver/merge_requests/191/diffs if(NOT XLSTPROC) if(WIN32) set(HOST_TRIPLETS x64-windows x64-windows-static x86-windows x86-windows-static)