174546 2017-07-15 11:09:09 -0700 [CMake] Include most CMake modules from WebKitCommon.cmake 2017-07-17 15:50:45 -0700 1 1 1 Unclassified WebKit WebKitGTK Other PC Linux RESOLVED FIXED P2 Normal --- 1 mcatanzaro mcatanzaro achristensen annulen bugs-noreply commit-queue mcatanzaro oldest_to_newest 1329214 0 mcatanzaro 2017-07-15 11:09:09 -0700 When creating WebCoreMacros.cmake, I forgot to move some includes from WebKitMacros.cmake: include(CMakeParseArguments) include(ProcessorCount) ProcessorCount(PROCESSOR_COUNT) 1329238 1 annulen 2017-07-15 14:30:34 -0700 "include" command of cmake (just like #include in C preprocessor) has no protection against multiple inclusion of the same file ("module"). Some built-in modules implement ad-hoc protection, but not all of them. It can be a better idea to include built-in cmake modules in shared cmake files instead of moving them down to "subprojects", and maybe even move them all to the root CMakeLists.txt or to new file like Source/cmake/Includes.cmake 1329293 2 mcatanzaro 2017-07-15 20:43:21 -0700 I hate CMake.... 1329347 3 annulen 2017-07-16 02:09:40 -0700 Another way is to introduce wrapper for include() that will implement protection, so that it can be used everywhere without limits 1329653 4 315689 mcatanzaro 2017-07-17 12:10:39 -0700 Created attachment 315689 Patch 1329755 5 315689 commit-queue 2017-07-17 15:50:43 -0700 Comment on attachment 315689 Patch Clearing flags on attachment: 315689 Committed r219580: <http://trac.webkit.org/changeset/219580> 1329756 6 commit-queue 2017-07-17 15:50:45 -0700 All reviewed patches have been landed. Closing bug. 315689 2017-07-17 12:10:39 -0700 2017-07-17 15:50:43 -0700 Patch bug-174546-20170717141038.patch text/plain 7196 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMjE5NTYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWM0MWNiMGNmY2Q3YWNj ODUzZmFhMTNkYjRhNTNkYWZlMzc1NGUzMy4uODRhZjA0MDUxN2UwYTYxOGExYzE0YTUzODc5Zjdj Y2I3NDAwNTc0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDE3LTA3LTE3ICBNaWNo YWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AaWdhbGlhLmNvbT4KKworICAgICAgICBbQ01ha2Vd IEluY2x1ZGUgbW9zdCBDTWFrZSBtb2R1bGVzIGZyb20gV2ViS2l0Q29tbW9uLmNtYWtlCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzQ1NDYKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYkNvcmVNYWNy b3MuY21ha2U6CisKIDIwMTctMDctMTcgIEtvbnN0YW50aW4gVG9rYXJldiAgPGFubnVsZW5AeWFu ZGV4LnJ1PgogCiAgICAgICAgIFtDTWFrZV0gQ3JlYXRlIHRhcmdldHMgYmVmb3JlIFdFQktJVF9J TkNMVURFX0NPTkZJR19GSUxFU19JRl9FWElTVFMgaXMgY2FsbGVkCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGUzZDJj MDFhYWVjYmI3ODM0ZTI4MTdkMGJlNjVlZmEyZTg1NGE2NjMuLjU3NmNjZjE1MGFjN2ZiYjY1N2Jj MjNhOTIwODA3NGM2YTQ4NmI0ZmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTctMDct MTcgIE1pY2hhZWwgQ2F0YW56YXJvICA8bWNhdGFuemFyb0BpZ2FsaWEuY29tPgorCisgICAgICAg IFtDTWFrZV0gSW5jbHVkZSBtb3N0IENNYWtlIG1vZHVsZXMgZnJvbSBXZWJLaXRDb21tb24uY21h a2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NDU0 NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogQ01h a2VMaXN0cy50eHQ6CisKIDIwMTctMDctMTcgIEtvbnN0YW50aW4gVG9rYXJldiAgPGFubnVsZW5A eWFuZGV4LnJ1PgogCiAgICAgICAgIFtDTWFrZV0gQ3JlYXRlIHRhcmdldHMgYmVmb3JlIFdFQktJ VF9JTkNMVURFX0NPTkZJR19GSUxFU19JRl9FWElTVFMgaXMgY2FsbGVkCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9XZWJDb3JlTWFjcm9zLmNtYWtlIGIvU291cmNlL1dlYkNvcmUvV2ViQ29y ZU1hY3Jvcy5jbWFrZQppbmRleCBhMzI1OGVkNTVjMGU3MWRjMjMxZDZjYmQyYTEwYWRkMjVlMGYx YmZlLi5lOTE1NDczMWQzNzAyZGI1YjE2ZmMzOGRhOWMzNTQ2YTljMjQ1ZjMxIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlTWFjcm9zLmNtYWtlCisrKyBiL1NvdXJjZS9XZWJDb3Jl L1dlYkNvcmVNYWNyb3MuY21ha2UKQEAgLTExNyw2ICsxMTcsNyBAQCBmdW5jdGlvbihHRU5FUkFU RV9CSU5ESU5HUyB0YXJnZXQpCiAgICAgaWYgKGFyZ19TVVBQTEVNRU5UQUxfREVQRklMRSkKICAg ICAgICAgbGlzdChBUFBFTkQgYXJncyAtLXN1cHBsZW1lbnRhbERlcGVuZGVuY3lGaWxlICR7YXJn X1NVUFBMRU1FTlRBTF9ERVBGSUxFfSkKICAgICBlbmRpZiAoKQorICAgIFByb2Nlc3NvckNvdW50 KFBST0NFU1NPUl9DT1VOVCkKICAgICBpZiAoUFJPQ0VTU09SX0NPVU5UKQogICAgICAgICBsaXN0 KEFQUEVORCBhcmdzIC0tbnVtT2ZKb2JzICR7UFJPQ0VTU09SX0NPVU5UfSkKICAgICBlbmRpZiAo KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DTWFrZUxpc3RzLnR4dCBiL1NvdXJjZS9XZWJL aXQvQ01ha2VMaXN0cy50eHQKaW5kZXggOGJhMDBjNDczMjE2ZGM4YTgzODRhOTNhMjMxMzA0NGRh OWJjNGUwMC4uZmFmODdlOGEzZTBkNzViYWQwODc0Y2JkNWM3OTg1ODczMDgxMDJlNSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9DTWFrZUxpc3RzLnR4dAorKysgYi9Tb3VyY2UvV2ViS2l0L0NN YWtlTGlzdHMudHh0CkBAIC0xLDUgKzEsNCBAQAotaW5jbHVkZShDaGVja0NYWFNvdXJjZUNvbXBp bGVzKQotaW5jbHVkZShDaGVja0Z1bmN0aW9uRXhpc3RzKQoraW5jbHVkZShXZWJLaXRDb21tb24p CiAKIHNldF9wcm9wZXJ0eShESVJFQ1RPUlkgLiBQUk9QRVJUWSBGT0xERVIgIldlYktpdDIiKQog CmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvT3B0aW9uc0NvbW1vbi5jbWFrZSBiL1NvdXJjZS9j bWFrZS9PcHRpb25zQ29tbW9uLmNtYWtlCmluZGV4IDgxM2QwZWVmMWIxOWIxMzcxODAwMzE4NTQz NTNhYjhmZDkxMTczZDcuLjYxMDhiOWI3ZTlmN2MxOWYxM2I4YjdiM2NjMjM4N2Q3OTE5ZWE5NTUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9jbWFrZS9PcHRpb25zQ29tbW9uLmNtYWtlCisrKyBiL1NvdXJj ZS9jbWFrZS9PcHRpb25zQ29tbW9uLmNtYWtlCkBAIC0xMjcsNyArMTI3LDYgQEAgaWYgKFdURl9D UFVfQVJNNjRfQ09SVEVYQTUzKQogICAgIGlmIChOT1QgV1RGX0NQVV9BUk02NCkKICAgICAgICAg bWVzc2FnZShGQVRBTF9FUlJPUiAiV1RGX0NQVV9BUk02NF9DT1JURVhBNTMgc2V0IHdpdGhvdXQg V1RGX0NQVV9BUk02NCIpCiAgICAgZW5kaWYgKCkKLSAgICBpbmNsdWRlKFRlc3RDWFhBY2NlcHRz RmxhZykKICAgICBDSEVDS19DWFhfQUNDRVBUU19GTEFHKC1tZml4LWNvcnRleC1hNTMtODM1NzY5 IENYWF9BQ0NFUFRTX01GSVhfQ09SVEVYX0E1M184MzU3NjkpCiAgICAgaWYgKENYWF9BQ0NFUFRT X01GSVhfQ09SVEVYX0E1M184MzU3NjkpCiAgICAgICAgIHNldChDTUFLRV9DX0ZMQUdTICIke0NN QUtFX0NfRkxBR1N9IC1tZml4LWNvcnRleC1hNTMtODM1NzY5IikKQEAgLTE0OCw3ICsxNDcsNiBA QCBpZiAoV1RGX0NQVV9BUk0pCiAgICAgaW50IG1haW4oKSB7fQogICAgIikKIAotICAgIGluY2x1 ZGUoQ2hlY2tDWFhTb3VyY2VDb21waWxlcykKICAgICBDSEVDS19DWFhfU09VUkNFX0NPTVBJTEVT KCIke0FSTV9USFVNQjJfVEVTVF9TT1VSQ0V9IiBBUk1fVEhVTUIyX0RFVEVDVEVEKQogICAgIGlm IChOT1QgQVJNX1RIVU1CMl9ERVRFQ1RFRCkKICAgICAgICAgc2V0KEFSTV9UUkFESVRJT05BTF9E RVRFQ1RFRCBUUlVFKQpAQCAtMTU4LDcgKzE1Niw2IEBAIGlmIChXVEZfQ1BVX0FSTSkKIGVuZGlm ICgpCiAKICMgVXNlIGxkLmdvbGQgaWYgaXQgaXMgYXZhaWxhYmxlIGFuZCBpc24ndCBkaXNhYmxl ZCBleHBsaWNpdGx5Ci1pbmNsdWRlKENNYWtlRGVwZW5kZW50T3B0aW9uKQogQ01BS0VfREVQRU5E RU5UX09QVElPTihVU0VfTERfR09MRCAiVXNlIEdOVSBnb2xkIGxpbmtlciIgT04KICAgICAgICAg ICAgICAgICAgICAgICAgIk5PVCBDWFhfQUNDRVBUU19NRklYX0NPUlRFWF9BNTNfODM1NzY5O05P VCBBUk1fVFJBRElUSU9OQUxfREVURUNURUQ7Tk9UIFdJTjMyO05PVCBBUFBMRSIgT0ZGKQogaWYg KFVTRV9MRF9HT0xEKQpAQCAtMTc0LDcgKzE3MSw2IEBAIGVuZGlmICgpCiAKIHNldChFTkFCTEVf REVCVUdfRklTU0lPTl9ERUZBVUxUIE9GRikKIGlmIChVU0VfTERfR09MRCBBTkQgQ01BS0VfQlVJ TERfVFlQRSBTVFJFUVVBTCAiRGVidWciKQotICAgIGluY2x1ZGUoVGVzdENYWEFjY2VwdHNGbGFn KQogICAgIENIRUNLX0NYWF9BQ0NFUFRTX0ZMQUcoLWdzcGxpdC1kd2FyZiBDWFhfQUNDRVBUU19H U1BMSVRfRFdBUkYpCiAgICAgaWYgKENYWF9BQ0NFUFRTX0dTUExJVF9EV0FSRikKICAgICAgICAg c2V0KEVOQUJMRV9ERUJVR19GSVNTSU9OX0RFRkFVTFQgT04pCkBAIC0yMzUsMTIgKzIzMSw2IEBA IGlmIChOT1QgUE9SVCBTVFJFUVVBTCAiR1RLIikKIGVuZGlmICgpCiAKICMgTWFjcm9zIGZvciBk ZXRlcm1pbmluZyBIQVZFIHZhbHVlcy4KLWluY2x1ZGUoQ2hlY2tJbmNsdWRlRmlsZSkKLWluY2x1 ZGUoQ2hlY2tGdW5jdGlvbkV4aXN0cykKLWluY2x1ZGUoQ2hlY2tTeW1ib2xFeGlzdHMpCi1pbmNs dWRlKENoZWNrU3RydWN0SGFzTWVtYmVyKQotaW5jbHVkZShDaGVja1R5cGVTaXplKQotCiBtYWNy byhfSEFWRV9DSEVDS19JTkNMVURFIF92YXJpYWJsZSBfaGVhZGVyKQogICAgIGNoZWNrX2luY2x1 ZGVfZmlsZSgke19oZWFkZXJ9ICR7X3ZhcmlhYmxlfV92YWx1ZSkKICAgICBTRVRfQU5EX0VYUE9T RV9UT19CVUlMRCgke192YXJpYWJsZX0gJHtfdmFyaWFibGV9X3ZhbHVlKQpkaWZmIC0tZ2l0IGEv U291cmNlL2NtYWtlL1dlYktpdENvbW1vbi5jbWFrZSBiL1NvdXJjZS9jbWFrZS9XZWJLaXRDb21t b24uY21ha2UKaW5kZXggZjJhZGM0YzFiNTJmNWRkZTBmZDBlYTdiMWFlYjBiMjhmYmJiZjI5OC4u OWEyOThkMzUzNTVlMDU1MDdhNWQ1MDY1ZTc2MmVhMTMyNmQ0MDkzNCAxMDA2NDQKLS0tIGEvU291 cmNlL2NtYWtlL1dlYktpdENvbW1vbi5jbWFrZQorKysgYi9Tb3VyY2UvY21ha2UvV2ViS2l0Q29t bW9uLmNtYWtlCkBAIC0zNiw2ICszNiwxOSBAQCBpZiAoTk9UIEhBU19SVU5fV0VCS0lUX0NPTU1P TikKICAgICAjIEhlbHBlciBtYWNyb3MgYW5kIGZlYXR1cmUgZGVmaW5lcwogICAgICMgLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0KIAorICAgICMgVG8gcHJldmVudCBtdWx0aXBsZSBpbmNsdXNpb24sIG1v c3QgbW9kdWxlcyBzaG91bGQgYmUgaW5jbHVkZWQgb25jZSBoZXJlLgorICAgIGluY2x1ZGUoQ2hl Y2tDWFhTb3VyY2VDb21waWxlcykKKyAgICBpbmNsdWRlKENoZWNrRnVuY3Rpb25FeGlzdHMpCisg ICAgaW5jbHVkZShDaGVja0luY2x1ZGVGaWxlKQorICAgIGluY2x1ZGUoQ2hlY2tTeW1ib2xFeGlz dHMpCisgICAgaW5jbHVkZShDaGVja1N0cnVjdEhhc01lbWJlcikKKyAgICBpbmNsdWRlKENoZWNr VHlwZVNpemUpCisgICAgaW5jbHVkZShDTWFrZURlcGVuZGVudE9wdGlvbikKKyAgICBpbmNsdWRl KENNYWtlUGFyc2VBcmd1bWVudHMpCisgICAgaW5jbHVkZShQcm9jZXNzb3JDb3VudCkKKyAgICBp bmNsdWRlKFRlc3RDWFhBY2NlcHRzRmxhZykKKworICAgIGluY2x1ZGUoV2ViS2l0UGFja2FnaW5n KQogICAgIGluY2x1ZGUoV2ViS2l0TWFjcm9zKQogICAgIGluY2x1ZGUoV2ViS2l0RlMpCiAgICAg aW5jbHVkZShXZWJLaXRGZWF0dXJlcykKZGlmZiAtLWdpdCBhL1NvdXJjZS9jbWFrZS9XZWJLaXRN YWNyb3MuY21ha2UgYi9Tb3VyY2UvY21ha2UvV2ViS2l0TWFjcm9zLmNtYWtlCmluZGV4IDlkNTQ0 M2YyN2U3NDY0ZTE0NjY2MWU4MTFlODdiNzJkNDVmZjEwNzAuLjFhOWU3ZGU0YmFmYTIxYjhhYzM3 OTk2NDZhOTNmOTc5OThiMDc0MjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9jbWFrZS9XZWJLaXRNYWNy b3MuY21ha2UKKysrIGIvU291cmNlL2NtYWtlL1dlYktpdE1hY3Jvcy5jbWFrZQpAQCAtMiwxMCAr Miw2IEBACiAjIGV4Y2x1c2l2ZWx5IG5lZWRlZCBpbiBvbmx5IG9uZSBzdWJkaXJlY3Rvcnkgb2Yg U291cmNlIChlLmcuIG9ubHkgbmVlZGVkIGJ5CiAjIFdlYkNvcmUpLCB0aGVuIHB1dCBpdCB0aGVy ZSBpbnN0ZWFkLgogCi1pbmNsdWRlKENNYWtlUGFyc2VBcmd1bWVudHMpCi1pbmNsdWRlKFByb2Nl c3NvckNvdW50KQotUHJvY2Vzc29yQ291bnQoUFJPQ0VTU09SX0NPVU5UKQotCiBtYWNybyhXRUJL SVRfSU5DTFVERV9DT05GSUdfRklMRVNfSUZfRVhJU1RTKQogICAgIHNldChfZmlsZSAke0NNQUtF X0NVUlJFTlRfU09VUkNFX0RJUn0vUGxhdGZvcm0ke1BPUlR9LmNtYWtlKQogICAgIGlmIChFWElT VFMgJHtfZmlsZX0pCmRpZmYgLS1naXQgYS9DTWFrZUxpc3RzLnR4dCBiL0NNYWtlTGlzdHMudHh0 CmluZGV4IDQ4YzJkNWZkZmEzYWNkZWY4Y2I4MGQxMTU2MDk1N2RjYjExMDBhM2IuLmU2ZTE5OGZi ZjdkZTZlMGExYmM5ZWE3ZjZhOGFlMWQ1MmY4ZGZlZTQgMTAwNjQ0Ci0tLSBhL0NNYWtlTGlzdHMu dHh0CisrKyBiL0NNYWtlTGlzdHMudHh0CkBAIC0xNTAsMTEgKzE1MCw2IEBAIGlmIChFTkFCTEVf QVBJX1RFU1RTKQogZW5kaWYgKCkKIAogIyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQotIyBEZWZpbmUg cGFja2FnaW5nCi0jIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCi1pbmNsdWRlKFdlYktpdFBhY2thZ2lu ZykKLQotIyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogIyBBZGQgbW9kdWxlIGRpcmVjdG9yaWVzCiAj IC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tCiBhZGRfc3ViZGlyZWN0b3J5KFNvdXJjZSkKZGlmZiAtLWdp dCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCAwODZhZDcwOGJiNTBlYWRlMTU3ZmE0OGRl N2IxNGI5ZDVmYjJiMmZiLi45MWIzN2RlOWM4ZWNhNWQ3N2NlNzhhYWIxNzlhNjcwZjE1Yjk0Mjlj IDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAK KzIwMTctMDctMTcgIE1pY2hhZWwgQ2F0YW56YXJvICA8bWNhdGFuemFyb0BpZ2FsaWEuY29tPgor CisgICAgICAgIFtDTWFrZV0gSW5jbHVkZSBtb3N0IENNYWtlIG1vZHVsZXMgZnJvbSBXZWJLaXRD b21tb24uY21ha2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE3NDU0NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogQ01ha2VMaXN0cy50eHQ6CisgICAgICAgICogU291cmNlL2NtYWtlL09wdGlvbnNDb21t b24uY21ha2U6CisgICAgICAgICogU291cmNlL2NtYWtlL1dlYktpdENvbW1vbi5jbWFrZToKKyAg ICAgICAgKiBTb3VyY2UvY21ha2UvV2ViS2l0TWFjcm9zLmNtYWtlOgorCiAyMDE3LTA3LTE3ICBL b25zdGFudGluIFRva2FyZXYgIDxhbm51bGVuQHlhbmRleC5ydT4KIAogICAgICAgICBbQ01ha2Vd IENyZWF0ZSB0YXJnZXRzIGJlZm9yZSBXRUJLSVRfSU5DTFVERV9DT05GSUdfRklMRVNfSUZfRVhJ U1RTIGlzIGNhbGxlZAo=