170797 2017-04-12 17:39:31 -0700 [WinCairo] Assign WEBKIT_LIBRARIES_DIR to CMAKE_PREFIX_PATH 2017-04-13 10:54:25 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 don.olmstead don.olmstead achristensen commit-queue don.olmstead fujii lforschler oldest_to_newest 1296890 0 don.olmstead 2017-04-12 17:39:31 -0700 Currently WinCairo cannot use find_package for any of the third party libraries that have build in support within CMake (cURL, ZLIB, etc). CMAKE_PREFIX_PATH can be used to set a search path for those libraries. By adding WEBKIT_LIBRARIES_DIR to the CMAKE_PREFIX_PATH find_package works as expected. This also requires setting a global hint for CMake to look into lib32/lib64 directories to match the current directory structure. This also means that the explicit including of WEBKIT_LIBRARIES_DIR within the WebKit specific finds (Cairo) are not necessary. 1296892 1 don.olmstead 2017-04-12 17:41:17 -0700 Just a heads up that FIND_LIBRARY_USE_LIB32_PATHS doesn't appear to be available until CMake 3.7. This means the same ideas cannot currently be applied to AppleWin. WinCairo only does 64 bit builds so this limitation isn't there. 1296895 2 306957 don.olmstead 2017-04-12 17:59:10 -0700 Created attachment 306957 Patch with CMake changes 1296950 3 achristensen 2017-04-12 22:28:07 -0700 (In reply to Don Olmstead from comment #1) > Just a heads up that FIND_LIBRARY_USE_LIB32_PATHS doesn't appear to be > available until CMake 3.7. This means the same ideas cannot currently be > applied to AppleWin. WinCairo only does 64 bit builds so this limitation > isn't there. Then we shouldn't use it yet. 1297018 4 don.olmstead 2017-04-13 10:18:33 -0700 (In reply to Alex Christensen from comment #3) > (In reply to Don Olmstead from comment #1) > > Just a heads up that FIND_LIBRARY_USE_LIB32_PATHS doesn't appear to be > > available until CMake 3.7. This means the same ideas cannot currently be > > applied to AppleWin. WinCairo only does 64 bit builds so this limitation > > isn't there. > > Then we shouldn't use it yet. When do the AppleWin bots get updated? Our WinCairo buildbot has CMake 3.7.2 and should soon have 3.8.0 installed on it. I foresee us requiring at least 3.8.0 for WinCairo development in the near future as we're about ready to update the libraries and find_package(OpenSSL) does not properly detect libressl on Windows until 3.8.0. 1297022 5 306957 achristensen 2017-04-13 10:25:41 -0700 Comment on attachment 306957 Patch with CMake changes Let's assume updating anything in the AppleWin build tools takes a really long time. 1297036 6 306957 commit-queue 2017-04-13 10:54:24 -0700 Comment on attachment 306957 Patch with CMake changes Clearing flags on attachment: 306957 Committed r215326: <http://trac.webkit.org/changeset/215326> 1297037 7 commit-queue 2017-04-13 10:54:25 -0700 All reviewed patches have been landed. Closing bug. 306957 2017-04-12 17:59:10 -0700 2017-04-13 10:54:24 -0700 Patch with CMake changes bug170797.diff text/plain 2660 don.olmstead ZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCBlYjNmOGI0Li5jMGJkYjU5 IDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAK KzIwMTctMDQtMTIgIERvbiBPbG1zdGVhZCAgPGRvbi5vbG1zdGVhZEBhbS5zb255LmNvbT4KKwor ICAgICAgICBbV2luQ2Fpcm9dIEFzc2lnbiBXRUJLSVRfTElCUkFSSUVTX0RJUiB0byBDTUFLRV9Q UkVGSVhfUEFUSAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTcwNzk3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBTb3VyY2UvY21ha2UvRmluZENhaXJvLmNtYWtlOgorICAgICAgICAqIFNvdXJjZS9jbWFr ZS9PcHRpb25zV2luLmNtYWtlOgorCiAyMDE3LTA0LTExICBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJz ZWtAaWdhbGlhLmNvbT4KIAogICAgICAgICBbQ01ha2VdIE9wZW5XZWJSVEMgbGlicmFyaWVzIHBh dGggaXNuJ3QgcHJvcGVybHkgZGVkdWNlZApkaWZmIC0tZ2l0IGEvU291cmNlL2NtYWtlL0ZpbmRD YWlyby5jbWFrZSBiL1NvdXJjZS9jbWFrZS9GaW5kQ2Fpcm8uY21ha2UKaW5kZXggMjc3ZjZhZi4u ZDAxMzBhZCAxMDA2NDQKLS0tIGEvU291cmNlL2NtYWtlL0ZpbmRDYWlyby5jbWFrZQorKysgYi9T b3VyY2UvY21ha2UvRmluZENhaXJvLmNtYWtlCkBAIC0zNSw3ICszNSw2IEBAIGZpbmRfcGF0aChD QUlST19JTkNMVURFX0RJUlMKICAgICBOQU1FUyBjYWlyby5oCiAgICAgSElOVFMgJHtQQ19DQUlS T19JTkNMVURFRElSfQogICAgICAgICAgICR7UENfQ0FJUk9fSU5DTFVERV9ESVJTfQotICAgICAg ICAgICR7V0VCS0lUX0xJQlJBUklFU19JTkNMVURFX0RJUn0vY2Fpcm8KICAgICBQQVRIX1NVRkZJ WEVTIGNhaXJvCiApCiAKQEAgLTQzLDcgKzQyLDYgQEAgZmluZF9saWJyYXJ5KENBSVJPX0xJQlJB UklFUwogICAgIE5BTUVTIGNhaXJvCiAgICAgSElOVFMgJHtQQ19DQUlST19MSUJESVJ9CiAgICAg ICAgICAgJHtQQ19DQUlST19MSUJSQVJZX0RJUlN9Ci0gICAgICAgICAgJHtXRUJLSVRfTElCUkFS SUVTX0xJTktfRElSfQogKQogCiBpZiAoQ0FJUk9fSU5DTFVERV9ESVJTKQpkaWZmIC0tZ2l0IGEv U291cmNlL2NtYWtlL09wdGlvbnNXaW4uY21ha2UgYi9Tb3VyY2UvY21ha2UvT3B0aW9uc1dpbi5j bWFrZQppbmRleCBlNzE1OTgwLi5kODY5OTg5IDEwMDY0NAotLS0gYS9Tb3VyY2UvY21ha2UvT3B0 aW9uc1dpbi5jbWFrZQorKysgYi9Tb3VyY2UvY21ha2UvT3B0aW9uc1dpbi5jbWFrZQpAQCAtODcs MTAgKzg3LDE0IEBAIGlmIChOT1QgV0VCS0lUX0xJQlJBUklFU19ESVIpCiAgICAgZW5kaWYgKCkK IGVuZGlmICgpCiAKK3NldChDTUFLRV9QUkVGSVhfUEFUSCAke1dFQktJVF9MSUJSQVJJRVNfRElS fSkKKwogc2V0KFdFQktJVF9MSUJSQVJJRVNfSU5DTFVERV9ESVIgIiR7V0VCS0lUX0xJQlJBUklF U19ESVJ9L2luY2x1ZGUiKQogCiBpbmNsdWRlX2RpcmVjdG9yaWVzKCIke0NNQUtFX0JJTkFSWV9E SVJ9L0Rlcml2ZWRTb3VyY2VzL0ZvcndhcmRpbmdIZWFkZXJzIiAiJHtDTUFLRV9CSU5BUllfRElS fS9EZXJpdmVkU291cmNlcyIgIiR7V0VCS0lUX0xJQlJBUklFU19JTkNMVURFX0RJUn0iKQogaWYg KCR7TVNWQ19DWFhfQVJDSElURUNUVVJFX0lEfSBTVFJFUVVBTCAiWDg2IikKKyAgICBzZXRfcHJv cGVydHkoR0xPQkFMIFBST1BFUlRZIEZJTkRfTElCUkFSWV9VU0VfTElCMzJfUEFUSFMgT04pCisg ICAgc2V0X3Byb3BlcnR5KEdMT0JBTCBQUk9QRVJUWSBGSU5EX0xJQlJBUllfVVNFX0xJQjY0X1BB VEhTIE9GRikKICAgICBzZXQoV0VCS0lUX0xJQlJBUklFU19MSU5LX0RJUiAiJHtXRUJLSVRfTElC UkFSSUVTX0RJUn0vbGliMzIiKQogICAgICMgRklYTUU6IFJlbW92ZSAke1dFQktJVF9MSUJSQVJJ RVNfTElOS19ESVJ9IHdoZW4gZmluZF9saWJyYXJ5IGlzIHVzZWQgZm9yIGV2ZXJ5dGhpbmcKICAg ICBsaW5rX2RpcmVjdG9yaWVzKCIke0NNQUtFX0JJTkFSWV9ESVJ9L2xpYjMyIiAiJHtXRUJLSVRf TElCUkFSSUVTX0xJTktfRElSfSIpCkBAIC05OCw2ICsxMDIsOCBAQCBpZiAoJHtNU1ZDX0NYWF9B UkNISVRFQ1RVUkVfSUR9IFNUUkVRVUFMICJYODYiKQogICAgIHNldChDTUFLRV9MSUJSQVJZX09V VFBVVF9ESVJFQ1RPUlkgJHtDTUFLRV9CSU5BUllfRElSfS9saWIzMikKICAgICBzZXQoQ01BS0Vf UlVOVElNRV9PVVRQVVRfRElSRUNUT1JZICR7Q01BS0VfQklOQVJZX0RJUn0vYmluMzIpCiBlbHNl ICgpCisgICAgc2V0X3Byb3BlcnR5KEdMT0JBTCBQUk9QRVJUWSBGSU5EX0xJQlJBUllfVVNFX0xJ QjMyX1BBVEhTIE9GRikKKyAgICBzZXRfcHJvcGVydHkoR0xPQkFMIFBST1BFUlRZIEZJTkRfTElC UkFSWV9VU0VfTElCNjRfUEFUSFMgT04pCiAgICAgc2V0KFdFQktJVF9MSUJSQVJJRVNfTElOS19E SVIgIiR7V0VCS0lUX0xJQlJBUklFU19ESVJ9L2xpYjY0IikKICAgICAjIEZJWE1FOiBSZW1vdmUg JHtXRUJLSVRfTElCUkFSSUVTX0xJTktfRElSfSB3aGVuIGZpbmRfbGlicmFyeSBpcyB1c2VkIGZv ciBldmVyeXRoaW5nCiAgICAgbGlua19kaXJlY3RvcmllcygiJHtDTUFLRV9CSU5BUllfRElSfS9s aWI2NCIgIiR7V0VCS0lUX0xJQlJBUklFU19MSU5LX0RJUn0iKQo=