174545 2017-07-15 10:14:19 -0700 [CMake] Raise minimum CMake requirement 2017-07-16 07:28:18 -0700 1 1 1 Unclassified WebKit WebKitGTK Other PC Linux RESOLVED FIXED P2 Normal --- 1 mcatanzaro mcatanzaro annulen bugs-noreply commit-queue fujii mcatanzaro oldest_to_newest 1329207 0 mcatanzaro 2017-07-15 10:14:19 -0700 We can raise our CMake required version now, and remove some old code. 1329237 1 annulen 2017-07-15 13:33:23 -0700 FWIW, raising requirement to 3.1 would allow us to use target_sources command, that can enable us to make target-specific setup in PlatformXXX.cmake files (now all such code has to be in shared CMakeLists.txt files) 1329298 2 mcatanzaro 2017-07-15 20:49:18 -0700 We can go as high as 3.5 (Ubuntu 16.04). Let's stick with 3.3 for now, though. That was the version I was planning to upgrade to to get access to a new generator expression. Turns out I won't be using it after all... but it's also the minimum version needed to remove all of our CMake version conditionals. So why not? Using target_sources will be a great next step. Note this will break our Debian stable bot, but that's due to be upgraded to Stretch anyway. 1329306 3 315586 mcatanzaro 2017-07-15 20:53:02 -0700 Created attachment 315586 Patch 1329381 4 315586 commit-queue 2017-07-16 07:28:16 -0700 Comment on attachment 315586 Patch Clearing flags on attachment: 315586 Committed r219547: <http://trac.webkit.org/changeset/219547> 1329382 5 commit-queue 2017-07-16 07:28:18 -0700 All reviewed patches have been landed. Closing bug. 315586 2017-07-15 20:53:02 -0700 2017-07-16 07:28:16 -0700 Patch bug-174545-20170715225301.patch text/plain 7044 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMjE5NTM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDAzN2ZjYjlkYmVmZjYz NzZkOWFkMjAxMmI4OTUyNTExMDgwYjUxMS4uMDhhY2VjZTUwNWI0ODQ4NWJjMTdmMjM0ZjMzYjIw NTc3MWFkNjJjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDE3LTA3LTE1ICBNaWNo YWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AaWdhbGlhLmNvbT4KKworICAgICAgICBbQ01ha2Vd IFJhaXNlIG1pbmltdW0gQ01ha2UgcmVxdWlyZW1lbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NDU0NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViQ29yZU1hY3Jvcy5jbWFrZToKKwogMjAxNy0w Ny0xNSAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgogCiAgICAgICAg IENsZWFuIHVwIGxpbmUtaGVpZ2h0IGFuZCBtaW5pbXVtRm9udFNpemUgZnVuY3Rpb25zCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlTWFjcm9zLmNtYWtlIGIvU291cmNlL1dlYkNv cmUvV2ViQ29yZU1hY3Jvcy5jbWFrZQppbmRleCA3MTc1YmViYjViM2JkMjIyNTMwOTliYWE5ZWVm YzU0YTUyNDRmYzliLi5hMzI1OGVkNTVjMGU3MWRjMjMxZDZjYmQyYTEwYWRkMjVlMGYxYmZlIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlTWFjcm9zLmNtYWtlCisrKyBiL1NvdXJj ZS9XZWJDb3JlL1dlYkNvcmVNYWNyb3MuY21ha2UKQEAgLTE2MywxMyArMTYzLDkgQEAgZnVuY3Rp b24oR0VORVJBVEVfQklORElOR1MgdGFyZ2V0KQogICAgIGlmIChTSE9XX0JJTkRJTkdTX0dFTkVS QVRJT05fUFJPR1JFU1MpCiAgICAgICAgIGxpc3QoQVBQRU5EIGFyZ3MgLS1zaG93UHJvZ3Jlc3Mp CiAgICAgZW5kaWYgKCkKLSAgICBpZiAoJHtDTUFLRV9WRVJTSU9OfSBWRVJTSU9OX0xFU1MgMy4y KQotICAgICAgICBzZXRfc291cmNlX2ZpbGVzX3Byb3BlcnRpZXMoJHtnZW5fc291cmNlc30gJHtn ZW5faGVhZGVyc30gUFJPUEVSVElFUyBHRU5FUkFURUQgMSkKLSAgICBlbHNlICgpCi0gICAgICAg IGxpc3QoQVBQRU5EIGFjdF9hcmdzIEJZUFJPRFVDVFMgJHtnZW5fc291cmNlc30gJHtnZW5faGVh ZGVyc30pCi0gICAgICAgIGlmIChTSE9XX0JJTkRJTkdTX0dFTkVSQVRJT05fUFJPR1JFU1MpCi0g ICAgICAgICAgICBsaXN0KEFQUEVORCBhY3RfYXJncyBVU0VTX1RFUk1JTkFMKQotICAgICAgICBl bmRpZiAoKQorICAgIGxpc3QoQVBQRU5EIGFjdF9hcmdzIEJZUFJPRFVDVFMgJHtnZW5fc291cmNl c30gJHtnZW5faGVhZGVyc30pCisgICAgaWYgKFNIT1dfQklORElOR1NfR0VORVJBVElPTl9QUk9H UkVTUykKKyAgICAgICAgbGlzdChBUFBFTkQgYWN0X2FyZ3MgVVNFU19URVJNSU5BTCkKICAgICBl bmRpZiAoKQogICAgIGFkZF9jdXN0b21fdGFyZ2V0KCR7dGFyZ2V0fQogICAgICAgICBDT01NQU5E ICR7UEVSTF9FWEVDVVRBQkxFfSAke2JpbmRpbmdfZ2VuZXJhdG9yfSAke2FyZ3N9CkBAIC0yMjks MTAgKzIyNSw2IEBAIG1hY3JvKEdFTkVSQVRFX1NFVFRJTkdTX01BQ1JPUyBfaW5maWxlIF9vdXRm aWxlKQogICAgICAgICAke0RFUklWRURfU09VUkNFU19XRUJDT1JFX0RJUn0vSW50ZXJuYWxTZXR0 aW5nc0dlbmVyYXRlZC5pZGwKICAgICApCiAgICAgc2V0KF9hcmdzIEJZUFJPRFVDVFMgJHtfZXh0 cmFfb3V0cHV0fSkKLSAgICBpZiAoJHtDTUFLRV9WRVJTSU9OfSBWRVJTSU9OX0xFU1MgMy4yKQot ICAgICAgICBzZXRfc291cmNlX2ZpbGVzX3Byb3BlcnRpZXMoJHtfZXh0cmFfb3V0cHV0fSBQUk9Q RVJUSUVTIEdFTkVSQVRFRCAxKQotICAgICAgICBzZXQoX2FyZ3MpCi0gICAgZW5kaWYgKCkKICAg ICBhZGRfY3VzdG9tX2NvbW1hbmQoCiAgICAgICAgIE9VVFBVVCAke0RFUklWRURfU09VUkNFU19X RUJDT1JFX0RJUn0vJHtfb3V0ZmlsZX0KICAgICAgICAgTUFJTl9ERVBFTkRFTkNZICR7X2luZmls ZX0KZGlmZiAtLWdpdCBhL1NvdXJjZS9jbWFrZS9PcHRpb25zQ29tbW9uLmNtYWtlIGIvU291cmNl L2NtYWtlL09wdGlvbnNDb21tb24uY21ha2UKaW5kZXggNjJlMTg1Yjc4MzgxOGVkODVjOTZkNjk0 YjgyMTE2ZGYxMjI4MTM0OC4uODEzZDBlZWYxYjE5YjEzNzE4MDAzMTg1NDM1M2FiOGZkOTExNzNk NyAxMDA2NDQKLS0tIGEvU291cmNlL2NtYWtlL09wdGlvbnNDb21tb24uY21ha2UKKysrIGIvU291 cmNlL2NtYWtlL09wdGlvbnNDb21tb24uY21ha2UKQEAgLTIzNCwxNCArMjM0LDYgQEAgaWYgKE5P VCBQT1JUIFNUUkVRVUFMICJHVEsiKQogICAgIHNldChMSUJFWEVDX0lOU1RBTExfRElSICIke0NN QUtFX0lOU1RBTExfUFJFRklYfS9iaW4iIENBQ0hFIFBBVEggIkFic29sdXRlIHBhdGggdG8gaW5z dGFsbCBleGVjdXRhYmxlcyBleGVjdXRlZCBieSB0aGUgbGlicmFyeSIpCiBlbmRpZiAoKQogCi0j IFRoZSBOaW5qYSBnZW5lcmF0b3IgZG9lcyBub3QgeWV0IGtub3cgaG93IHRvIGJ1aWxkIGFyY2hp dmVzIGluIHBpZWNlcywgYW5kIHNvIHJlc3BvbnNlCi0jIGZpbGVzIG11c3QgYmUgdXNlZCB0byBk ZWFsIHdpdGggdmVyeSBsb25nIGxpbmtlciBjb21tYW5kIGxpbmVzLgotIyBDTWFrZSBkb2VzIHRo aXMgYXV0b21hdGljYWxseSwgYnV0IHRoZSBjb25kaXRpb24gd2FzIHdyb25nIG9uIExpbnV4IHVu dGlsIENNYWtlIDMuMi4KLSMgU2VlIGh0dHBzOi8vY21ha2Uub3JnL0J1Zy92aWV3LnBocD9pZD0x NDg5MgotaWYgKChDTUFLRV9IT1NUX1NZU1RFTV9OQU1FIFNUUkVRVUFMICJMaW51eCIpIEFORCAo Q01BS0VfVkVSU0lPTiBWRVJTSU9OX0xFU1MgMy4yKSkKLSAgICBzZXQoQ01BS0VfTklOSkFfRk9S Q0VfUkVTUE9OU0VfRklMRSAxKQotZW5kaWYgKCkKLQogIyBNYWNyb3MgZm9yIGRldGVybWluaW5n IEhBVkUgdmFsdWVzLgogaW5jbHVkZShDaGVja0luY2x1ZGVGaWxlKQogaW5jbHVkZShDaGVja0Z1 bmN0aW9uRXhpc3RzKQpkaWZmIC0tZ2l0IGEvU291cmNlL2NtYWtlL09wdGlvbnNHVEsuY21ha2Ug Yi9Tb3VyY2UvY21ha2UvT3B0aW9uc0dUSy5jbWFrZQppbmRleCBkMGUzNjgyNzNkYjY1NTU2NGJm YmFjZGYwODQ4NzVmZjdlNjAwY2NlLi40OTI5NDlkODIxMTRkNWU3OGE0MWZmMGRmZjMzNWYxOTgz NGVkNTE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvY21ha2UvT3B0aW9uc0dUSy5jbWFrZQorKysgYi9T b3VyY2UvY21ha2UvT3B0aW9uc0dUSy5jbWFrZQpAQCAtNDc0LDI0ICs0NzQsMyBAQCBtYWNybyhB RERfV0hPTEVfQVJDSElWRV9UT19MSUJSQVJJRVMgX2xpc3RfbmFtZSkKICAgICAgICAgc2V0KCR7 X2xpc3RfbmFtZX0gIiR7JHtfbGlzdF9uYW1lfV9UTVB9IikKICAgICBlbmRpZiAoKQogZW5kbWFj cm8oKQotCi1pZiAoQ01BS0VfTUFKT1JfVkVSU0lPTiBMRVNTIDMpCi0gICAgIyBCZWZvcmUgQ01h a2UgMyBpdCB3YXMgbmVjZXNzYXJ5IHRvIHVzZSBhIGJ1aWxkIHNjcmlwdCBpbnN0ZWFkIG9mIHVz aW5nIGNtYWtlIC0tYnVpbGQgZGlyZWN0bHkKLSAgICAjIHRvIHByZXNlcnZlIGNvbG9ycyBhbmQg cHJldHR5LXByaW50aW5nLgotCi0gICAgYnVpbGRfY29tbWFuZChDT01NQU5EX0xJTkVfVE9fQlVJ TEQpCi0gICAgIyBidWlsZF9jb21tYW5kIHVuY29uZGl0aW9uYWxseSBhZGRzIC1pIChpZ25vcmUg ZXJyb3JzKSBmb3IgbWFrZSwgYW5kIHRoZXJlJ3MKLSAgICAjIG5vIHJlYXNvbmFibGUgd2F5IHRv IHR1cm4gdGhhdCBvZmYsIHNvIHdlIGp1c3QgcmVwbGFjZSBpdCB3aXRoIC1rLCB3aGljaCBoYXMK LSAgICAjIHRoZSBzYW1lIGVmZmVjdCwgZXhjZXB0IHRoYXQgdGhlIHJldHVybiBjb2RlIHdpbGwg aW5kaWNhdGUgdGhhdCBhbiBlcnJvciBvY2N1cnJlZC4KLSAgICAjIFNlZTogaHR0cDovL3d3dy5j bWFrZS5vcmcvY21ha2UvaGVscC92My4wL2NvbW1hbmQvYnVpbGRfY29tbWFuZC5odG1sCi0gICAg c3RyaW5nKFJFUExBQ0UgIiAtaSIgIiAtayIgQ09NTUFORF9MSU5FX1RPX0JVSUxEICR7Q09NTUFO RF9MSU5FX1RPX0JVSUxEfSkKLSAgICBmaWxlKFdSSVRFCi0gICAgICAgICR7Q01BS0VfQklOQVJZ X0RJUn0ke0NNQUtFX0ZJTEVTX0RJUkVDVE9SWX0vYnVpbGQuc2gKLSAgICAgICAgIiMhL2Jpbi9z aFxuIgotICAgICAgICAiJHtDT01NQU5EX0xJTkVfVE9fQlVJTER9ICRAIgotICAgICkKLSAgICBm aWxlKENPUFkgJHtDTUFLRV9CSU5BUllfRElSfSR7Q01BS0VfRklMRVNfRElSRUNUT1JZfS9idWls ZC5zaAotICAgICAgICBERVNUSU5BVElPTiAke0NNQUtFX0JJTkFSWV9ESVJ9Ci0gICAgICAgIEZJ TEVfUEVSTUlTU0lPTlMgT1dORVJfUkVBRCBPV05FUl9XUklURSBPV05FUl9FWEVDVVRFIEdST1VQ X1JFQUQgR1JPVVBfRVhFQ1VURQotICAgICkKLWVuZGlmICgpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv Y21ha2UvT3B0aW9uc0pTQ09ubHkuY21ha2UgYi9Tb3VyY2UvY21ha2UvT3B0aW9uc0pTQ09ubHku Y21ha2UKaW5kZXggMmFjZDMzMzQ3YjU4ODJjMDc3Yjc2ZjgzNTQ1ZTU4ODY4ZjdkNzA5MC4uMjZi ZTNmNWExNGM0YTM4YzA0NmE5Yjc1NWI5YWVkOWVjY2I1YTUzMyAxMDA2NDQKLS0tIGEvU291cmNl L2NtYWtlL09wdGlvbnNKU0NPbmx5LmNtYWtlCisrKyBiL1NvdXJjZS9jbWFrZS9PcHRpb25zSlND T25seS5jbWFrZQpAQCAtODksMjUgKzg5LDMgQEAgaWYgKE5PVCBBUFBMRSkKIGVsc2UgKCkKICAg ICBzZXQoSUNVX0xJQlJBUklFUyBsaWJpY3Vjb3JlLmR5bGliKQogZW5kaWYgKCkKLQotIyBGcm9t IE9wdGlvbnNHVEsuY21ha2UKLWlmIChDTUFLRV9NQUpPUl9WRVJTSU9OIExFU1MgMykKLSAgICAj IEJlZm9yZSBDTWFrZSAzIGl0IHdhcyBuZWNlc3NhcnkgdG8gdXNlIGEgYnVpbGQgc2NyaXB0IGlu c3RlYWQgb2YgdXNpbmcgY21ha2UgLS1idWlsZCBkaXJlY3RseQotICAgICMgdG8gcHJlc2VydmUg Y29sb3JzIGFuZCBwcmV0dHktcHJpbnRpbmcuCi0KLSAgICBidWlsZF9jb21tYW5kKENPTU1BTkRf TElORV9UT19CVUlMRCkKLSAgICAjIGJ1aWxkX2NvbW1hbmQgdW5jb25kaXRpb25hbGx5IGFkZHMg LWkgKGlnbm9yZSBlcnJvcnMpIGZvciBtYWtlLCBhbmQgdGhlcmUncwotICAgICMgbm8gcmVhc29u YWJsZSB3YXkgdG8gdHVybiB0aGF0IG9mZiwgc28gd2UganVzdCByZXBsYWNlIGl0IHdpdGggLWss IHdoaWNoIGhhcwotICAgICMgdGhlIHNhbWUgZWZmZWN0LCBleGNlcHQgdGhhdCB0aGUgcmV0dXJu IGNvZGUgd2lsbCBpbmRpY2F0ZSB0aGF0IGFuIGVycm9yIG9jY3VycmVkLgotICAgICMgU2VlOiBo dHRwOi8vd3d3LmNtYWtlLm9yZy9jbWFrZS9oZWxwL3YzLjAvY29tbWFuZC9idWlsZF9jb21tYW5k Lmh0bWwKLSAgICBzdHJpbmcoUkVQTEFDRSAiIC1pIiAiIC1rIiBDT01NQU5EX0xJTkVfVE9fQlVJ TEQgJHtDT01NQU5EX0xJTkVfVE9fQlVJTER9KQotICAgIGZpbGUoV1JJVEUKLSAgICAgICAgJHtD TUFLRV9CSU5BUllfRElSfSR7Q01BS0VfRklMRVNfRElSRUNUT1JZfS9idWlsZC5zaAotICAgICAg ICAiIyEvYmluL3NoXG4iCi0gICAgICAgICIke0NPTU1BTkRfTElORV9UT19CVUlMRH0gJEAiCi0g ICAgKQotICAgIGZpbGUoQ09QWSAke0NNQUtFX0JJTkFSWV9ESVJ9JHtDTUFLRV9GSUxFU19ESVJF Q1RPUll9L2J1aWxkLnNoCi0gICAgICAgIERFU1RJTkFUSU9OICR7Q01BS0VfQklOQVJZX0RJUn0K LSAgICAgICAgRklMRV9QRVJNSVNTSU9OUyBPV05FUl9SRUFEIE9XTkVSX1dSSVRFIE9XTkVSX0VY RUNVVEUgR1JPVVBfUkVBRCBHUk9VUF9FWEVDVVRFCi0gICAgKQotZW5kaWYgKCkKZGlmZiAtLWdp dCBhL0NNYWtlTGlzdHMudHh0IGIvQ01ha2VMaXN0cy50eHQKaW5kZXggN2M2OWMzOWJiNzMyMWQ5 MTVkYjFhZmE5NmI0ZGZiMjFhYTc3YjUwNy4uNDhjMmQ1ZmRmYTNhY2RlZjhjYjgwZDExNTYwOTU3 ZGNiMTEwMGEzYiAxMDA2NDQKLS0tIGEvQ01ha2VMaXN0cy50eHQKKysrIGIvQ01ha2VMaXN0cy50 eHQKQEAgLTEsMTEgKzEsNiBAQAotY21ha2VfbWluaW11bV9yZXF1aXJlZChWRVJTSU9OIDIuOC4x MikKK2NtYWtlX21pbmltdW1fcmVxdWlyZWQoVkVSU0lPTiAzLjMpCiBwcm9qZWN0KFdlYktpdCkK IAotIyBUaGlzIHNob3VsZCBiZSByZW1vdmVkIG9uY2Ugd2UgcmVxdWlyZSBDTWFrZSAzLjMuCi1p ZiAoUE9MSUNZIENNUDAwNTgpCi0gICAgY21ha2VfcG9saWN5KFNFVCBDTVAwMDU4IE5FVykKLWVu ZGlmICgpCi0KIHNldChDTUFLRV9NT0RVTEVfUEFUSCAiJHtDTUFLRV9TT1VSQ0VfRElSfS9Tb3Vy Y2UvY21ha2UiKQogCiBzZXQoRU5BQkxFX1dFQkNPUkUgT04pCmRpZmYgLS1naXQgYS9DaGFuZ2VM b2cgYi9DaGFuZ2VMb2cKaW5kZXggYjEyNzE5ZjJjZjVlMDZjMTMyZTVlNGQwYmY4YmYyMGM0NDVj YWUxZC4uYzMwM2VkODRjNGZiYjEzOWM4YzRmODU5YWE4ODI1NzMwMmUxNzg5ZCAxMDA2NDQKLS0t IGEvQ2hhbmdlTG9nCisrKyBiL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE3LTA3LTE1 ICBNaWNoYWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AaWdhbGlhLmNvbT4KKworICAgICAgICBb Q01ha2VdIFJhaXNlIG1pbmltdW0gQ01ha2UgcmVxdWlyZW1lbnQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NDU0NQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogQ01ha2VMaXN0cy50eHQ6CisgICAgICAg ICogU291cmNlL2NtYWtlL09wdGlvbnNDb21tb24uY21ha2U6CisgICAgICAgICogU291cmNlL2Nt YWtlL09wdGlvbnNHVEsuY21ha2U6CisgICAgICAgICogU291cmNlL2NtYWtlL09wdGlvbnNKU0NP bmx5LmNtYWtlOgorCiAyMDE3LTA3LTE0ICBNaWNoYWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9A aWdhbGlhLmNvbT4KIAogICAgICAgICBbQ01ha2VdIFVuY2xlYXIgZGlzdGluY3Rpb24gYmV0d2Vl biBXZWJLaXRIZWxwZXJzIGFuZCBXZWJLaXRNYWNyb3MK