From 2e64ac90d8b71bf1afe4ae4af87096a3888ff3be Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Tue, 12 Feb 2019 10:01:07 +0100 Subject: [PATCH] cmake: also write FIXME on the configure.cmake for 'use' Since most of the times it means we need to link with some other stuff Change-Id: I06262d4403225bca7a5e68d47145fefcf6702e5a Reviewed-by: Simon Hausmann --- src/corelib/configure.cmake | 3 ++- src/gui/configure.cmake | 40 ++++++++++++++++++------------- src/network/configure.cmake | 12 ++++++---- util/cmake/configurejson2cmake.py | 2 ++ 4 files changed, 35 insertions(+), 22 deletions(-) diff --git a/src/corelib/configure.cmake b/src/corelib/configure.cmake index 2f5c543e56d..3bb08eba8a5 100644 --- a/src/corelib/configure.cmake +++ b/src/corelib/configure.cmake @@ -82,7 +82,8 @@ clock_gettime(CLOCK_MONOTONIC, &ts); /* END TEST: */ return 0; } -") +"# FIXME: use: librt +) # cloexec qt_config_compile_test(cloexec diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake index 57c5083d475..46fb2f993da 100644 --- a/src/gui/configure.cmake +++ b/src/gui/configure.cmake @@ -107,7 +107,8 @@ DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, __uuidof(IDWriteFactory2), /* END TEST: */ return 0; } -") +"# FIXME: use: directwrite +) # drm_atomic qt_config_compile_test(drm_atomic @@ -126,13 +127,12 @@ drmModeAtomicReq *request; /* END TEST: */ return 0; } -") +"# FIXME: use: drm +) # egl-x11 qt_config_compile_test(egl_x11 LABEL "EGL on X11" - LIBRARIES X11::X11 -CODE "// Check if EGL is compatible with X. Some EGL implementations, typically on // embedded devices, are not intended to be used together with X. EGL support // has to be disabled in plugins like xcb in this case since the native display, @@ -156,7 +156,8 @@ XCloseDisplay(dpy); /* END TEST: */ return 0; } -") +"# FIXME: use: egl xcb_xlib +) # egl-brcm qt_config_compile_test(egl_brcm @@ -173,7 +174,8 @@ vc_dispmanx_display_open(0); /* END TEST: */ return 0; } -") +"# FIXME: use: egl bcm_host +) # egl-egldevice qt_config_compile_test(egl_egldevice @@ -193,7 +195,8 @@ EGLOutputLayerEXT layer = 0; /* END TEST: */ return 0; } -") +"# FIXME: use: egl +) # egl-mali qt_config_compile_test(egl_mali @@ -211,7 +214,8 @@ fbdev_window *w = 0; /* END TEST: */ return 0; } -") +"# FIXME: use: egl +) # egl-mali-2 qt_config_compile_test(egl_mali_2 @@ -228,7 +232,8 @@ mali_native_window *w = 0; /* END TEST: */ return 0; } -") +"# FIXME: use: egl +) # egl-viv qt_config_compile_test(egl_viv @@ -252,6 +257,7 @@ fbGetDisplayByIndex(0); return 0; } "# FIXME: qmake: ['DEFINES += EGL_API_FB=1', '!integrity: DEFINES += LINUX=1'] +# FIXME: use: egl ) # egl-openwfd @@ -268,7 +274,8 @@ wfdEnumerateDevices(nullptr, 0, nullptr); /* END TEST: */ return 0; } -") +"# FIXME: use: egl +) # egl-rcar qt_config_compile_test(egl_rcar @@ -286,7 +293,8 @@ PVRGrfxServerInit(); /* END TEST: */ return 0; } -") +"# FIXME: use: egl opengl_es2 +) # evdev qt_config_compile_test(evdev @@ -357,8 +365,6 @@ ioctl(fd, FBIOGET_VSCREENINFO, &vinfo); # opengles3 qt_config_compile_test(opengles3 LABEL "OpenGL ES 3.0" - LIBRARIES OpenGL::GL - CODE "#ifdef __APPLE__ # include #else @@ -379,13 +385,12 @@ glMapBufferRange(GL_ARRAY_BUFFER, 0, 0, GL_MAP_READ_BIT); /* END TEST: */ return 0; } -") +"# FIXME: use: opengl_es2 +) # opengles31 qt_config_compile_test(opengles31 LABEL "OpenGL ES 3.1" - LIBRARIES OpenGL::GL - CODE " #include @@ -398,7 +403,8 @@ glProgramUniform1i(0, 0, 0); /* END TEST: */ return 0; } -") +"# FIXME: use: opengl_es2 +) diff --git a/src/network/configure.cmake b/src/network/configure.cmake index 3bc73701da1..6bafd659c49 100644 --- a/src/network/configure.cmake +++ b/src/network/configure.cmake @@ -33,7 +33,8 @@ freeifaddrs(list); /* END TEST: */ return 0; } -") +"# FIXME: use: network +) # ipv6ifname qt_config_compile_test(ipv6ifname @@ -54,7 +55,8 @@ if_freenameindex(if_nameindex()); /* END TEST: */ return 0; } -") +"# FIXME: use: network +) # linux-netlink qt_config_compile_test(linux_netlink @@ -103,7 +105,8 @@ socklen_t sctpInitMsgSize = sizeof(sctpInitMsg); /* END TEST: */ return 0; } -") +"# FIXME: use: network +) # dtls qt_config_compile_test(dtls @@ -121,7 +124,8 @@ int main(int argc, char **argv) /* END TEST: */ return 0; } -") +"# FIXME: use: openssl +) diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py index 6e6c402b079..7efeb88522b 100755 --- a/util/cmake/configurejson2cmake.py +++ b/util/cmake/configurejson2cmake.py @@ -610,6 +610,8 @@ def parseTest(ctx, test, data, cm_fh): cm_fh.write('"' + sourceCode + '"') if "qmake" in details: cm_fh.write("# FIXME: qmake: {}\n".format(details["qmake"])) + if "use" in data: + cm_fh.write("# FIXME: use: {}\n".format(data["use"])) cm_fh.write(")\n\n") elif data["type"] == "x86Simd":