diff options
| author | Jose Fonseca <jfonseca@vmware.com> | 2020-05-11 19:58:31 +0100 |
|---|---|---|
| committer | Jose Fonseca <jfonseca@vmware.com> | 2020-05-11 19:58:31 +0100 |
| commit | b56f34cfbddefa08c7f17ef6bf408b27ff96fc3d (patch) | |
| tree | 0ba811ca12cdab8b33fbefaf3fae3c43d7731e9f | |
| parent | 91ffbd13abdeed46578ebce3f3fa45d574b9952a (diff) | |
cmake: Avoid pkg-config on Windows.
It's not very reliable. In particular, when doing MinGW cross
compilation pkg-config will mistakenly pickup the host headers,
regardless MinGW has those headers or not.
Part-of: <https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/286>
| -rw-r--r-- | CMakeLists.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7e126fcf1..70cbfa52d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -172,6 +172,7 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux") pkg_check_modules(XCB QUIET xcb) pkg_check_modules(XCB_DRI2 QUIET xcb-dri2) pkg_check_modules(GLPROTO QUIET glproto) + pkg_check_modules(LIBVULKAN QUIET vulkan) ELSEIF(${CMAKE_SYSTEM_NAME} MATCHES "Windows") if (PIGLIT_USE_WAFFLE) set(PIGLIT_HAS_WGL True) @@ -179,8 +180,6 @@ ELSEIF(${CMAKE_SYSTEM_NAME} MATCHES "Windows") endif() ENDIF() -pkg_check_modules(LIBVULKAN QUIET vulkan) - IF(PIGLIT_HAS_GLX) option(PIGLIT_BUILD_GLX_TESTS "Build tests that require GLX" ON) ELSE() |