diff options
| author | David Heidelberg <david.heidelberg@collabora.com> | 2023-02-26 14:25:49 +0100 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2024-04-12 12:05:54 +0000 |
| commit | 99eade7cdbdd6f6cf43414f71d73bdab537e7d41 (patch) | |
| tree | 7d36831480263ebd1b72ef54f1a8ea4b9cc8dc55 | |
| parent | dd6f7eaf82e8dd442da28b346c236141cbcce0b1 (diff) | |
cmake: respect indentation
Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/898>
| -rw-r--r-- | CMakeLists.txt | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5563fe0e2..3b8b8b1fd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -183,17 +183,15 @@ ELSEIF(${CMAKE_SYSTEM_NAME} MATCHES "Windows") ENDIF() if(PIGLIT_BUILD_VK_TESTS) + if (NOT LIBVULKAN_FOUND) + message(FATAL_ERROR "libvulkan required by vulkan tests not found") + endif() -if (NOT LIBVULKAN_FOUND) - message(FATAL_ERROR "libvulkan required by vulkan tests not found") -endif() - -find_program(GLSLANG_VALIDATOR NAMES glslangValidator) - -if (NOT GLSLANG_VALIDATOR) - message(FATAL_ERROR "glslangValidator required by vulkan tests not found") -endif() + find_program(GLSLANG_VALIDATOR NAMES glslangValidator) + if (NOT GLSLANG_VALIDATOR) + message(FATAL_ERROR "glslangValidator required by vulkan tests not found") + endif() endif(PIGLIT_BUILD_VK_TESTS) IF(PIGLIT_HAS_GLX) @@ -426,11 +424,11 @@ if(PIGLIT_HAS_POSIX_TIMER_NOTIFY_THREAD) endif() if(GBM_FOUND) -FIND_LIBRARY(HAVE_LIBCACA NAMES caca) -if(HAVE_LIBCACA) - set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} caca) - add_definitions(-DPIGLIT_HAS_LIBCACA) -endif(HAVE_LIBCACA) + FIND_LIBRARY(HAVE_LIBCACA NAMES caca) + if(HAVE_LIBCACA) + set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} caca) + add_definitions(-DPIGLIT_HAS_LIBCACA) + endif(HAVE_LIBCACA) endif(GBM_FOUND) if(PIGLIT_USE_WAFFLE AND ${CMAKE_SYSTEM_NAME} STREQUAL "Linux") @@ -475,7 +473,7 @@ check_function_exists(ffs HAVE_FFS) check_function_exists(strchrnul HAVE_STRCHRNUL) check_function_exists(strndup HAVE_STRNDUP) if(NOT MINGW) -check_function_exists(fopen_s HAVE_FOPEN_S) + check_function_exists(fopen_s HAVE_FOPEN_S) endif() check_function_exists(setrlimit HAVE_SETRLIMIT) @@ -509,7 +507,7 @@ else() endif() if(CMAKE_SYSTEM_NAME STREQUAL "Linux") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--enable-new-dtags") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--enable-new-dtags") endif(CMAKE_SYSTEM_NAME STREQUAL "Linux") SET(CMAKE_INSTALL_RPATH "${PIGLIT_INSTALL_FULL_LIBDIR}/lib") |