From 9c04f64f2db964c10fe8175faf606faaa3d18ec7 Mon Sep 17 00:00:00 2001 From: Charles Giessen Date: Wed, 16 Feb 2022 12:26:07 -0700 Subject: [PATCH] Remove BUILD_LOADER build option No reason to have this since the tests depend on the loader being built to function. --- BUILD.md | 1 - CMakeLists.txt | 6 +----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/BUILD.md b/BUILD.md index 215c4f0a..c60c7c60 100644 --- a/BUILD.md +++ b/BUILD.md @@ -213,7 +213,6 @@ on/off options currently supported by this repository: | Option | Platform | Default | Description | | ---------------------------- | -------- | ------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| BUILD_LOADER | All | `ON` | Controls whether or not the loader is built. | | BUILD_TESTS | All | `OFF` | Controls whether or not the loader tests are built. | | BUILD_WSI_XCB_SUPPORT | Linux | `ON` | Build the loader with the XCB entry points enabled. Without this, the XCB headers should not be needed, but the extension `VK_KHR_xcb_surface` won't be available. | | BUILD_WSI_XLIB_SUPPORT | Linux | `ON` | Build the loader with the Xlib entry points enabled. Without this, the X11 headers should not be needed, but the extension `VK_KHR_xlib_surface` won't be available. | diff --git a/CMakeLists.txt b/CMakeLists.txt index e3c7c94c..595fcabd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -240,8 +240,6 @@ if(WIN32) option(ENABLE_WIN10_ONECORE "Link the loader with OneCore umbrella libraries" OFF) endif() -option(BUILD_LOADER "Build loader" ON) - add_library(platform_wsi_defines INTERFACE) if(WIN32) target_compile_definitions(platform_wsi_defines INTERFACE VK_USE_PLATFORM_WIN32_KHR) @@ -366,9 +364,7 @@ if(NOT TARGET uninstall) set_target_properties(uninstall PROPERTIES FOLDER ${LOADER_HELPER_FOLDER}) endif() -if(BUILD_LOADER) - add_subdirectory(loader) -endif() +add_subdirectory(loader) if(BUILD_TESTS) # Set gtest build configuration