openharmony/third_party_vulkan-loader
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_vulkan-loader synced 2024-11-23 07:10:23 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
3645fef378
third_party_vulkan-loader/CMakeLists.txt

214 lines
8.1 KiB
CMake
Raw Normal View History

build: Insert copyright in cmake files
2018-06-26 20:36:20 +00:00
# ~~~
# Copyright (c) 2014-2018 Valve Corporation
# Copyright (c) 2014-2018 LunarG, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# ~~~
Revert "build: Update cmake_minimum_required(VERSION 3.11.3)" This reverts PR 184 and its commit 124130ec3b181b2bb8a3c1cb0abe6d7259f995e2. Change-Id: Ie55ef1a3a2aa1322cf960866e1bde7fa4e7b29fd
2019-05-10 19:58:36 +00:00
cmake_minimum_required(VERSION 3.4)
macos: Specify deployment target version This allows using the build on macOS 10.12 even if built on 10.13. Change-Id: I21939163551bb9a0d0088513a23dc5d2cf7f5206
2018-04-18 17:46:21 +00:00
build: CMakeLists.txt cleanup, part 1 This is a first pass reorganization of CMake files in this repo. It consists primarily of dead code/variable removal, simplification, and reformatting by latest cmake-format. bump to cmake_minimum_required(3.4) for ccache simplify excessive use of generator expressions clarify why CMAKE_OSX_DEPLOYMENT_TARGET is pre-project(). clarify setting Windows install prefix if needed remove unused DisplayServer variable remove obsolete argument to endif() remove unneeded ccache property RULE_LAUNCH_LINK ccache doesn't affect linking, so the property is meaningless. remove unneeded CMAKE_VERBOSE_MAKEFILE hardcode. remove extra CMAKE_MODULE_PATH remove extra cmake_minimum_required change PYTHON_CMD to PYTHON_EXECUTABLE change CMAKE_SYSTEM_NAME to UNIX/APPLE/WIN32 Use consistent platform identification. Note that UNIX evaluates true for OSX, so whenever the code intends "Linux only", we use (UNIX AND NOT APPLE). remove unneeded TARGET_NAMES variable remove unneeded VK_LAYER_RPATH variable change 'ln -sf' to 'cmake -E create_symlink' reorder dependencies for clarity rearrange order of macro arguments rename run_vk_xml_generate to GenerateFromVkXml rename add_vk_layer to AddVkLayer Borrowing from the Google style guide, use camel-case to more easily identify locally-defined macros/functions. remove unneeded WRAP_SRCS variable remove unneeded TEST_SRCS variable move check of VulkanRegistry_FOUND move SCRIPTS_DIR closer to point of use move include(FindPkgConfig) earlier move CMAKE_MACOSX_RPATH earlier move option() eariler move GenerateFromVkXml invocations earlier Move invocations to be closer to the definition of the macro. Minor edits to comments. move API_NAME earlier remove unused BUILDTGT_DIR variable move add_executable() earlier combine if(WIN32) trees .cmake-format.py 0.4.1 reformat using cmake-format 0.4.1 Change-Id: Ia251e932dbc9a8f2655201bb12248dea8c940c30
2018-09-20 18:12:14 +00:00
# Apple: Must be set before enable_language() or project() as it may influence configuration of the toolchain and flags.
macos: Specify deployment target version This allows using the build on macOS 10.12 even if built on 10.13. Change-Id: I21939163551bb9a0d0088513a23dc5d2cf7f5206
2018-04-18 17:46:21 +00:00
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.12" CACHE STRING "Minimum OS X deployment version")
repo: Change project name to Vulkan-Loader
2018-05-13 16:59:16 +00:00
project(Vulkan-Loader)
build: CMakeLists.txt cleanup, part 1 This is a first pass reorganization of CMake files in this repo. It consists primarily of dead code/variable removal, simplification, and reformatting by latest cmake-format. bump to cmake_minimum_required(3.4) for ccache simplify excessive use of generator expressions clarify why CMAKE_OSX_DEPLOYMENT_TARGET is pre-project(). clarify setting Windows install prefix if needed remove unused DisplayServer variable remove obsolete argument to endif() remove unneeded ccache property RULE_LAUNCH_LINK ccache doesn't affect linking, so the property is meaningless. remove unneeded CMAKE_VERBOSE_MAKEFILE hardcode. remove extra CMAKE_MODULE_PATH remove extra cmake_minimum_required change PYTHON_CMD to PYTHON_EXECUTABLE change CMAKE_SYSTEM_NAME to UNIX/APPLE/WIN32 Use consistent platform identification. Note that UNIX evaluates true for OSX, so whenever the code intends "Linux only", we use (UNIX AND NOT APPLE). remove unneeded TARGET_NAMES variable remove unneeded VK_LAYER_RPATH variable change 'ln -sf' to 'cmake -E create_symlink' reorder dependencies for clarity rearrange order of macro arguments rename run_vk_xml_generate to GenerateFromVkXml rename add_vk_layer to AddVkLayer Borrowing from the Google style guide, use camel-case to more easily identify locally-defined macros/functions. remove unneeded WRAP_SRCS variable remove unneeded TEST_SRCS variable move check of VulkanRegistry_FOUND move SCRIPTS_DIR closer to point of use move include(FindPkgConfig) earlier move CMAKE_MACOSX_RPATH earlier move option() eariler move GenerateFromVkXml invocations earlier Move invocations to be closer to the definition of the macro. Minor edits to comments. move API_NAME earlier remove unused BUILDTGT_DIR variable move add_executable() earlier combine if(WIN32) trees .cmake-format.py 0.4.1 reformat using cmake-format 0.4.1 Change-Id: Ia251e932dbc9a8f2655201bb12248dea8c940c30
2018-09-20 18:12:14 +00:00
tests: Set enable_testing in cmake file. This CL adds the enable_testing() cmake call and registers vk_loader_validation_tests as a test in cmake. This allows the test to be run when `ctest` is executed. Change-Id: I57fd579c7625fbf7bbd468a5716e3a68b601c1fd
2019-06-06 17:19:15 +00:00
enable_testing()
build: CMakeLists.txt cleanup, part 1 This is a first pass reorganization of CMake files in this repo. It consists primarily of dead code/variable removal, simplification, and reformatting by latest cmake-format. bump to cmake_minimum_required(3.4) for ccache simplify excessive use of generator expressions clarify why CMAKE_OSX_DEPLOYMENT_TARGET is pre-project(). clarify setting Windows install prefix if needed remove unused DisplayServer variable remove obsolete argument to endif() remove unneeded ccache property RULE_LAUNCH_LINK ccache doesn't affect linking, so the property is meaningless. remove unneeded CMAKE_VERBOSE_MAKEFILE hardcode. remove extra CMAKE_MODULE_PATH remove extra cmake_minimum_required change PYTHON_CMD to PYTHON_EXECUTABLE change CMAKE_SYSTEM_NAME to UNIX/APPLE/WIN32 Use consistent platform identification. Note that UNIX evaluates true for OSX, so whenever the code intends "Linux only", we use (UNIX AND NOT APPLE). remove unneeded TARGET_NAMES variable remove unneeded VK_LAYER_RPATH variable change 'ln -sf' to 'cmake -E create_symlink' reorder dependencies for clarity rearrange order of macro arguments rename run_vk_xml_generate to GenerateFromVkXml rename add_vk_layer to AddVkLayer Borrowing from the Google style guide, use camel-case to more easily identify locally-defined macros/functions. remove unneeded WRAP_SRCS variable remove unneeded TEST_SRCS variable move check of VulkanRegistry_FOUND move SCRIPTS_DIR closer to point of use move include(FindPkgConfig) earlier move CMAKE_MACOSX_RPATH earlier move option() eariler move GenerateFromVkXml invocations earlier Move invocations to be closer to the definition of the macro. Minor edits to comments. move API_NAME earlier remove unused BUILDTGT_DIR variable move add_executable() earlier combine if(WIN32) trees .cmake-format.py 0.4.1 reformat using cmake-format 0.4.1 Change-Id: Ia251e932dbc9a8f2655201bb12248dea8c940c30
2018-09-20 18:12:14 +00:00
add_definitions(-DAPI_NAME="Vulkan")
Starting to build framework.
2014-07-24 14:36:15 +00:00
Cmake: Move all find_packages to base CMakeLists.txt Change-Id: Id27307788c7c230e75d620f1bf5470b1450289f2
2016-12-07 23:13:35 +00:00
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
demos: Add Hologram snapshot as Smoke test/demo
2016-02-25 22:44:10 +00:00
find_package(PythonInterp 3 REQUIRED)
wsi: Do not enable Xlib support by default
2015-12-15 16:25:29 +00:00
build: Use Vulkan::Headers target to determine include paths Change-Id: I73b9b2bfd5e33a9da861937510029cb71f3b2648
2019-02-08 04:53:48 +00:00
if (TARGET Vulkan::Headers)
message(STATUS "Using Vulkan headers from Vulkan::Headers target")
get_target_property(VulkanRegistry_DIR Vulkan::Registry INTERFACE_INCLUDE_DIRECTORIES)
else()
find_package(VulkanHeaders)
if(NOT ${VulkanHeaders_FOUND})
message(FATAL_ERROR "Could not find Vulkan headers path. This can be fixed by setting VULKAN_HEADERS_INSTALL_DIR to an "
"installation of the Vulkan-Headers repository.")
endif()
if(NOT ${VulkanRegistry_FOUND})
message(FATAL_ERROR "Could not find Vulkan registry path. This can be fixed by setting VULKAN_HEADERS_INSTALL_DIR to an "
"installation of the Vulkan-Headers repository.")
endif()
# set up the Vulkan::Headers target for consistency
add_library(vulkan-headers INTERFACE)
target_include_directories(vulkan-headers INTERFACE "${VulkanHeaders_INCLUDE_DIRS}")
add_library(Vulkan::Headers ALIAS vulkan-headers)
build: CMakeLists.txt cleanup, part 1 This is a first pass reorganization of CMake files in this repo. It consists primarily of dead code/variable removal, simplification, and reformatting by latest cmake-format. bump to cmake_minimum_required(3.4) for ccache simplify excessive use of generator expressions clarify why CMAKE_OSX_DEPLOYMENT_TARGET is pre-project(). clarify setting Windows install prefix if needed remove unused DisplayServer variable remove obsolete argument to endif() remove unneeded ccache property RULE_LAUNCH_LINK ccache doesn't affect linking, so the property is meaningless. remove unneeded CMAKE_VERBOSE_MAKEFILE hardcode. remove extra CMAKE_MODULE_PATH remove extra cmake_minimum_required change PYTHON_CMD to PYTHON_EXECUTABLE change CMAKE_SYSTEM_NAME to UNIX/APPLE/WIN32 Use consistent platform identification. Note that UNIX evaluates true for OSX, so whenever the code intends "Linux only", we use (UNIX AND NOT APPLE). remove unneeded TARGET_NAMES variable remove unneeded VK_LAYER_RPATH variable change 'ln -sf' to 'cmake -E create_symlink' reorder dependencies for clarity rearrange order of macro arguments rename run_vk_xml_generate to GenerateFromVkXml rename add_vk_layer to AddVkLayer Borrowing from the Google style guide, use camel-case to more easily identify locally-defined macros/functions. remove unneeded WRAP_SRCS variable remove unneeded TEST_SRCS variable move check of VulkanRegistry_FOUND move SCRIPTS_DIR closer to point of use move include(FindPkgConfig) earlier move CMAKE_MACOSX_RPATH earlier move option() eariler move GenerateFromVkXml invocations earlier Move invocations to be closer to the definition of the macro. Minor edits to comments. move API_NAME earlier remove unused BUILDTGT_DIR variable move add_executable() earlier combine if(WIN32) trees .cmake-format.py 0.4.1 reformat using cmake-format 0.4.1 Change-Id: Ia251e932dbc9a8f2655201bb12248dea8c940c30
2018-09-20 18:12:14 +00:00
endif()
repo: Remove Vulkan-Headers submodule Change-Id: I84ec2f2c07482685a275ca2d1804359f09321bad
2018-05-31 20:18:40 +00:00
build: Add optional ccache support to cmake
2017-10-31 23:05:03 +00:00
option(USE_CCACHE "Use ccache" OFF)
build: Beautify cmake files Add .cmake-format.py Add cmake-format docs to CONTRIBUTING.md Minor edits to existing files Due to a bug in cmake-format, use this script to reformat: for i in CMakeLists.txt external/CMakeLists.txt loader/CMakeLists.txt tests/CMakeLists.txt tests/layers/CMakeLists.txt do sed --in-place='' 's/^ *#/#/' $i cmake-format --in-place $i done Change-Id: I8e59c77ae184c88485a97a015ac81d4f71ac4897
2018-06-30 18:07:29 +00:00
if(USE_CCACHE)
build: Add optional ccache support to cmake
2017-10-31 23:05:03 +00:00
find_program(CCACHE_FOUND ccache)
if(CCACHE_FOUND)
set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
build: CMakeLists.txt cleanup, part 1 This is a first pass reorganization of CMake files in this repo. It consists primarily of dead code/variable removal, simplification, and reformatting by latest cmake-format. bump to cmake_minimum_required(3.4) for ccache simplify excessive use of generator expressions clarify why CMAKE_OSX_DEPLOYMENT_TARGET is pre-project(). clarify setting Windows install prefix if needed remove unused DisplayServer variable remove obsolete argument to endif() remove unneeded ccache property RULE_LAUNCH_LINK ccache doesn't affect linking, so the property is meaningless. remove unneeded CMAKE_VERBOSE_MAKEFILE hardcode. remove extra CMAKE_MODULE_PATH remove extra cmake_minimum_required change PYTHON_CMD to PYTHON_EXECUTABLE change CMAKE_SYSTEM_NAME to UNIX/APPLE/WIN32 Use consistent platform identification. Note that UNIX evaluates true for OSX, so whenever the code intends "Linux only", we use (UNIX AND NOT APPLE). remove unneeded TARGET_NAMES variable remove unneeded VK_LAYER_RPATH variable change 'ln -sf' to 'cmake -E create_symlink' reorder dependencies for clarity rearrange order of macro arguments rename run_vk_xml_generate to GenerateFromVkXml rename add_vk_layer to AddVkLayer Borrowing from the Google style guide, use camel-case to more easily identify locally-defined macros/functions. remove unneeded WRAP_SRCS variable remove unneeded TEST_SRCS variable move check of VulkanRegistry_FOUND move SCRIPTS_DIR closer to point of use move include(FindPkgConfig) earlier move CMAKE_MACOSX_RPATH earlier move option() eariler move GenerateFromVkXml invocations earlier Move invocations to be closer to the definition of the macro. Minor edits to comments. move API_NAME earlier remove unused BUILDTGT_DIR variable move add_executable() earlier combine if(WIN32) trees .cmake-format.py 0.4.1 reformat using cmake-format 0.4.1 Change-Id: Ia251e932dbc9a8f2655201bb12248dea8c940c30
2018-09-20 18:12:14 +00:00
endif()
build: Add optional ccache support to cmake
2017-10-31 23:05:03 +00:00
endif()
build: Activate install target for Windows.
2018-05-25 17:37:20 +00:00
include(GNUInstallDirs)
build: CMakeLists.txt cleanup, part 1 This is a first pass reorganization of CMake files in this repo. It consists primarily of dead code/variable removal, simplification, and reformatting by latest cmake-format. bump to cmake_minimum_required(3.4) for ccache simplify excessive use of generator expressions clarify why CMAKE_OSX_DEPLOYMENT_TARGET is pre-project(). clarify setting Windows install prefix if needed remove unused DisplayServer variable remove obsolete argument to endif() remove unneeded ccache property RULE_LAUNCH_LINK ccache doesn't affect linking, so the property is meaningless. remove unneeded CMAKE_VERBOSE_MAKEFILE hardcode. remove extra CMAKE_MODULE_PATH remove extra cmake_minimum_required change PYTHON_CMD to PYTHON_EXECUTABLE change CMAKE_SYSTEM_NAME to UNIX/APPLE/WIN32 Use consistent platform identification. Note that UNIX evaluates true for OSX, so whenever the code intends "Linux only", we use (UNIX AND NOT APPLE). remove unneeded TARGET_NAMES variable remove unneeded VK_LAYER_RPATH variable change 'ln -sf' to 'cmake -E create_symlink' reorder dependencies for clarity rearrange order of macro arguments rename run_vk_xml_generate to GenerateFromVkXml rename add_vk_layer to AddVkLayer Borrowing from the Google style guide, use camel-case to more easily identify locally-defined macros/functions. remove unneeded WRAP_SRCS variable remove unneeded TEST_SRCS variable move check of VulkanRegistry_FOUND move SCRIPTS_DIR closer to point of use move include(FindPkgConfig) earlier move CMAKE_MACOSX_RPATH earlier move option() eariler move GenerateFromVkXml invocations earlier Move invocations to be closer to the definition of the macro. Minor edits to comments. move API_NAME earlier remove unused BUILDTGT_DIR variable move add_executable() earlier combine if(WIN32) trees .cmake-format.py 0.4.1 reformat using cmake-format 0.4.1 Change-Id: Ia251e932dbc9a8f2655201bb12248dea8c940c30
2018-09-20 18:12:14 +00:00
if(UNIX AND NOT APPLE) # i.e.: Linux
include(FindPkgConfig)
build: Activate install target for Windows.
2018-05-25 17:37:20 +00:00
endif()
macOS: Add macOS support
2017-12-12 15:33:01 +00:00
if(APPLE)
build: Beautify cmake files Add .cmake-format.py Add cmake-format docs to CONTRIBUTING.md Minor edits to existing files Due to a bug in cmake-format, use this script to reformat: for i in CMakeLists.txt external/CMakeLists.txt loader/CMakeLists.txt tests/CMakeLists.txt tests/layers/CMakeLists.txt do sed --in-place='' 's/^ *#/#/' $i cmake-format --in-place $i done Change-Id: I8e59c77ae184c88485a97a015ac81d4f71ac4897
2018-06-30 18:07:29 +00:00
# CMake versions 3 or later need CMAKE_MACOSX_RPATH defined. This avoids the CMP0042 policy message.
macOS: Add macOS support
2017-12-12 15:33:01 +00:00
set(CMAKE_MACOSX_RPATH 1)
endif()
build: CMakeLists.txt cleanup, part 1 This is a first pass reorganization of CMake files in this repo. It consists primarily of dead code/variable removal, simplification, and reformatting by latest cmake-format. bump to cmake_minimum_required(3.4) for ccache simplify excessive use of generator expressions clarify why CMAKE_OSX_DEPLOYMENT_TARGET is pre-project(). clarify setting Windows install prefix if needed remove unused DisplayServer variable remove obsolete argument to endif() remove unneeded ccache property RULE_LAUNCH_LINK ccache doesn't affect linking, so the property is meaningless. remove unneeded CMAKE_VERBOSE_MAKEFILE hardcode. remove extra CMAKE_MODULE_PATH remove extra cmake_minimum_required change PYTHON_CMD to PYTHON_EXECUTABLE change CMAKE_SYSTEM_NAME to UNIX/APPLE/WIN32 Use consistent platform identification. Note that UNIX evaluates true for OSX, so whenever the code intends "Linux only", we use (UNIX AND NOT APPLE). remove unneeded TARGET_NAMES variable remove unneeded VK_LAYER_RPATH variable change 'ln -sf' to 'cmake -E create_symlink' reorder dependencies for clarity rearrange order of macro arguments rename run_vk_xml_generate to GenerateFromVkXml rename add_vk_layer to AddVkLayer Borrowing from the Google style guide, use camel-case to more easily identify locally-defined macros/functions. remove unneeded WRAP_SRCS variable remove unneeded TEST_SRCS variable move check of VulkanRegistry_FOUND move SCRIPTS_DIR closer to point of use move include(FindPkgConfig) earlier move CMAKE_MACOSX_RPATH earlier move option() eariler move GenerateFromVkXml invocations earlier Move invocations to be closer to the definition of the macro. Minor edits to comments. move API_NAME earlier remove unused BUILDTGT_DIR variable move add_executable() earlier combine if(WIN32) trees .cmake-format.py 0.4.1 reformat using cmake-format 0.4.1 Change-Id: Ia251e932dbc9a8f2655201bb12248dea8c940c30
2018-09-20 18:12:14 +00:00
if(WIN32 AND CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
# Windows: if install locations not set by user, set install prefix to "<build_dir>\install".
set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install" CACHE PATH "default install path" FORCE)
endif()
# Enable IDE GUI folders. "Helper targets" that don't have interesting source code should set their FOLDER property to this
cmake: Move LVL temp/worker targets into subfolder This sets up cmake to locate the temporary or worker MSVC projects into a subfolder called lvl_cmake_targets. This simply unclutters the Visual Studio Solution Explorer projects pane, and does not affect functionality. Change-Id: I6933d05758d6f174a4f66ceaef51d43627210e4f
2018-02-01 16:27:03 +00:00
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
cmake: Fixup FOLDER properties
2018-06-14 22:53:01 +00:00
set(LOADER_HELPER_FOLDER "Helper Targets")
cmake: Move LVL temp/worker targets into subfolder This sets up cmake to locate the temporary or worker MSVC projects into a subfolder called lvl_cmake_targets. This simply unclutters the Visual Studio Solution Explorer projects pane, and does not affect functionality. Change-Id: I6933d05758d6f174a4f66ceaef51d43627210e4f
2018-02-01 16:27:03 +00:00
build: CMakeLists.txt cleanup, part 1 This is a first pass reorganization of CMake files in this repo. It consists primarily of dead code/variable removal, simplification, and reformatting by latest cmake-format. bump to cmake_minimum_required(3.4) for ccache simplify excessive use of generator expressions clarify why CMAKE_OSX_DEPLOYMENT_TARGET is pre-project(). clarify setting Windows install prefix if needed remove unused DisplayServer variable remove obsolete argument to endif() remove unneeded ccache property RULE_LAUNCH_LINK ccache doesn't affect linking, so the property is meaningless. remove unneeded CMAKE_VERBOSE_MAKEFILE hardcode. remove extra CMAKE_MODULE_PATH remove extra cmake_minimum_required change PYTHON_CMD to PYTHON_EXECUTABLE change CMAKE_SYSTEM_NAME to UNIX/APPLE/WIN32 Use consistent platform identification. Note that UNIX evaluates true for OSX, so whenever the code intends "Linux only", we use (UNIX AND NOT APPLE). remove unneeded TARGET_NAMES variable remove unneeded VK_LAYER_RPATH variable change 'ln -sf' to 'cmake -E create_symlink' reorder dependencies for clarity rearrange order of macro arguments rename run_vk_xml_generate to GenerateFromVkXml rename add_vk_layer to AddVkLayer Borrowing from the Google style guide, use camel-case to more easily identify locally-defined macros/functions. remove unneeded WRAP_SRCS variable remove unneeded TEST_SRCS variable move check of VulkanRegistry_FOUND move SCRIPTS_DIR closer to point of use move include(FindPkgConfig) earlier move CMAKE_MACOSX_RPATH earlier move option() eariler move GenerateFromVkXml invocations earlier Move invocations to be closer to the definition of the macro. Minor edits to comments. move API_NAME earlier remove unused BUILDTGT_DIR variable move add_executable() earlier combine if(WIN32) trees .cmake-format.py 0.4.1 reformat using cmake-format 0.4.1 Change-Id: Ia251e932dbc9a8f2655201bb12248dea8c940c30
2018-09-20 18:12:14 +00:00
if(UNIX)
build: Beautify cmake files Add .cmake-format.py Add cmake-format docs to CONTRIBUTING.md Minor edits to existing files Due to a bug in cmake-format, use this script to reformat: for i in CMakeLists.txt external/CMakeLists.txt loader/CMakeLists.txt tests/CMakeLists.txt tests/layers/CMakeLists.txt do sed --in-place='' 's/^ *#/#/' $i cmake-format --in-place $i done Change-Id: I8e59c77ae184c88485a97a015ac81d4f71ac4897
2018-06-30 18:07:29 +00:00
set(
FALLBACK_CONFIG_DIRS "/etc/xdg"
CACHE
STRING
"Search path to use when XDG_CONFIG_DIRS is unset or empty or the current process is SUID/SGID. Default is freedesktop compliant."
)
set(
FALLBACK_DATA_DIRS "/usr/local/share:/usr/share"
CACHE
STRING
"Search path to use when XDG_DATA_DIRS is unset or empty or the current process is SUID/SGID. Default is freedesktop compliant."
)
macOS: Add macOS support
2017-12-12 15:33:01 +00:00
endif()
loader: Configurable fallback search paths This makes it easier for non-FHS distributions to behave well when the loader is used by a SUID process or in an otherwise unusual environment.
2017-02-19 19:14:24 +00:00
build: CMakeLists.txt cleanup, part 1 This is a first pass reorganization of CMake files in this repo. It consists primarily of dead code/variable removal, simplification, and reformatting by latest cmake-format. bump to cmake_minimum_required(3.4) for ccache simplify excessive use of generator expressions clarify why CMAKE_OSX_DEPLOYMENT_TARGET is pre-project(). clarify setting Windows install prefix if needed remove unused DisplayServer variable remove obsolete argument to endif() remove unneeded ccache property RULE_LAUNCH_LINK ccache doesn't affect linking, so the property is meaningless. remove unneeded CMAKE_VERBOSE_MAKEFILE hardcode. remove extra CMAKE_MODULE_PATH remove extra cmake_minimum_required change PYTHON_CMD to PYTHON_EXECUTABLE change CMAKE_SYSTEM_NAME to UNIX/APPLE/WIN32 Use consistent platform identification. Note that UNIX evaluates true for OSX, so whenever the code intends "Linux only", we use (UNIX AND NOT APPLE). remove unneeded TARGET_NAMES variable remove unneeded VK_LAYER_RPATH variable change 'ln -sf' to 'cmake -E create_symlink' reorder dependencies for clarity rearrange order of macro arguments rename run_vk_xml_generate to GenerateFromVkXml rename add_vk_layer to AddVkLayer Borrowing from the Google style guide, use camel-case to more easily identify locally-defined macros/functions. remove unneeded WRAP_SRCS variable remove unneeded TEST_SRCS variable move check of VulkanRegistry_FOUND move SCRIPTS_DIR closer to point of use move include(FindPkgConfig) earlier move CMAKE_MACOSX_RPATH earlier move option() eariler move GenerateFromVkXml invocations earlier Move invocations to be closer to the definition of the macro. Minor edits to comments. move API_NAME earlier remove unused BUILDTGT_DIR variable move add_executable() earlier combine if(WIN32) trees .cmake-format.py 0.4.1 reformat using cmake-format 0.4.1 Change-Id: Ia251e932dbc9a8f2655201bb12248dea8c940c30
2018-09-20 18:12:14 +00:00
if(UNIX AND NOT APPLE) # i.e.: Linux
cmake: Add options for each of the linux wsi interfaces We default everything except XCB to off since that is the only one that has been well-tested up to now.
2016-02-20 16:13:28 +00:00
option(BUILD_WSI_XCB_SUPPORT "Build XCB WSI support" ON)
layers: Include all 4 Linux WSI interfaces Change-Id: I20b0d64c90e6da940f45b31abf0330b2a415655d
2016-04-12 19:35:51 +00:00
option(BUILD_WSI_XLIB_SUPPORT "Build Xlib WSI support" ON)
Cmake: Add files needed to build with Mir Change-Id: I640e45db5d586a379674fb209e38075ba7f0cf29
2016-12-07 17:19:21 +00:00
option(BUILD_WSI_WAYLAND_SUPPORT "Build Wayland WSI support" ON)
wsi: Moved definition of CreateXxxSurface extension to CMakefile Removed component-specific definitions
2015-11-25 20:26:15 +00:00
build: Beautify cmake files Add .cmake-format.py Add cmake-format docs to CONTRIBUTING.md Minor edits to existing files Due to a bug in cmake-format, use this script to reformat: for i in CMakeLists.txt external/CMakeLists.txt loader/CMakeLists.txt tests/CMakeLists.txt tests/layers/CMakeLists.txt do sed --in-place='' 's/^ *#/#/' $i cmake-format --in-place $i done Change-Id: I8e59c77ae184c88485a97a015ac81d4f71ac4897
2018-06-30 18:07:29 +00:00
if(BUILD_WSI_XCB_SUPPORT)
Cmake: Move all find_packages to base CMakeLists.txt Change-Id: Id27307788c7c230e75d620f1bf5470b1450289f2
2016-12-07 23:13:35 +00:00
find_package(XCB REQUIRED)
endif()
build: Beautify cmake files Add .cmake-format.py Add cmake-format docs to CONTRIBUTING.md Minor edits to existing files Due to a bug in cmake-format, use this script to reformat: for i in CMakeLists.txt external/CMakeLists.txt loader/CMakeLists.txt tests/CMakeLists.txt tests/layers/CMakeLists.txt do sed --in-place='' 's/^ *#/#/' $i cmake-format --in-place $i done Change-Id: I8e59c77ae184c88485a97a015ac81d4f71ac4897
2018-06-30 18:07:29 +00:00
if(BUILD_WSI_XLIB_SUPPORT)
Cmake: Move all find_packages to base CMakeLists.txt Change-Id: Id27307788c7c230e75d620f1bf5470b1450289f2
2016-12-07 23:13:35 +00:00
find_package(X11 REQUIRED)
endif()
build: Beautify cmake files Add .cmake-format.py Add cmake-format docs to CONTRIBUTING.md Minor edits to existing files Due to a bug in cmake-format, use this script to reformat: for i in CMakeLists.txt external/CMakeLists.txt loader/CMakeLists.txt tests/CMakeLists.txt tests/layers/CMakeLists.txt do sed --in-place='' 's/^ *#/#/' $i cmake-format --in-place $i done Change-Id: I8e59c77ae184c88485a97a015ac81d4f71ac4897
2018-06-30 18:07:29 +00:00
if(BUILD_WSI_WAYLAND_SUPPORT)
Cmake: Move all find_packages to base CMakeLists.txt Change-Id: Id27307788c7c230e75d620f1bf5470b1450289f2
2016-12-07 23:13:35 +00:00
find_package(Wayland REQUIRED)
CMake: GH1989, add wayland include dir to cmake On some Linux distributions (e.g openSUSE) the wayland headers are in a subdirectory. Adding WAYLAND_CLIENT_INCLUDE_DIR to include_directories in CMakeLists.txt will fix this issue.
2017-08-21 22:36:45 +00:00
include_directories(${WAYLAND_CLIENT_INCLUDE_DIR})
Cmake: Move all find_packages to base CMakeLists.txt Change-Id: Id27307788c7c230e75d620f1bf5470b1450289f2
2016-12-07 23:13:35 +00:00
endif()
repo: Make loader build work on Linux
2018-05-09 20:07:11 +00:00
endif()
build: Add CMake flag to suppress LVL content Add CMake flag INSTALL_LVL_FILES (default ON) that when set to OFF, suppresses the installation of LVL artifacts when running "make install" on Linux. This flag doesn't have much use in the LVL repo because when turned off, CMake won't generate an install target in the makefiles. However, for the downstream VulkanTools and VulkanSamples repos, it can be useful to avoid installing LVL files on top of files that may have already been installed from a previous "make install" installation of the LVL repo. An example of such a use case would be the desire to have a more up-to-date version of LVL on the system than the one last merged into the downstream repo. This new flag is meant to address the need mentioned in LVL Pull Request #1844. Change-Id: I421f37ea4e885fbf0a268eff363a28f0537b1953
2017-06-12 17:23:57 +00:00
repo: Make loader build work on Linux
2018-05-09 20:07:11 +00:00
if(WIN32)
option(ENABLE_WIN10_ONECORE "Link the loader with OneCore umbrella libraries" OFF)
repo: Stop building dynamic and static loaders Add a cmake variable to select weather you want a dynamic or a static loader, rather than building both every time. This avoids the redundancy of building everything twice.
2018-05-17 18:01:41 +00:00
option(ENABLE_STATIC_LOADER "Build the loader as a static library" OFF)
Cmake: Move all find_packages to base CMakeLists.txt Change-Id: Id27307788c7c230e75d620f1bf5470b1450289f2
2016-12-07 23:13:35 +00:00
endif()
cmake: add find modules Add Find{DRM,UDev,XCB}.cmake. Require 2.8.11 for FOUND_VAR support in find_package_handle_standard_args().
2015-01-10 15:15:51 +00:00
build: CMakeLists.txt cleanup, part 1 This is a first pass reorganization of CMake files in this repo. It consists primarily of dead code/variable removal, simplification, and reformatting by latest cmake-format. bump to cmake_minimum_required(3.4) for ccache simplify excessive use of generator expressions clarify why CMAKE_OSX_DEPLOYMENT_TARGET is pre-project(). clarify setting Windows install prefix if needed remove unused DisplayServer variable remove obsolete argument to endif() remove unneeded ccache property RULE_LAUNCH_LINK ccache doesn't affect linking, so the property is meaningless. remove unneeded CMAKE_VERBOSE_MAKEFILE hardcode. remove extra CMAKE_MODULE_PATH remove extra cmake_minimum_required change PYTHON_CMD to PYTHON_EXECUTABLE change CMAKE_SYSTEM_NAME to UNIX/APPLE/WIN32 Use consistent platform identification. Note that UNIX evaluates true for OSX, so whenever the code intends "Linux only", we use (UNIX AND NOT APPLE). remove unneeded TARGET_NAMES variable remove unneeded VK_LAYER_RPATH variable change 'ln -sf' to 'cmake -E create_symlink' reorder dependencies for clarity rearrange order of macro arguments rename run_vk_xml_generate to GenerateFromVkXml rename add_vk_layer to AddVkLayer Borrowing from the Google style guide, use camel-case to more easily identify locally-defined macros/functions. remove unneeded WRAP_SRCS variable remove unneeded TEST_SRCS variable move check of VulkanRegistry_FOUND move SCRIPTS_DIR closer to point of use move include(FindPkgConfig) earlier move CMAKE_MACOSX_RPATH earlier move option() eariler move GenerateFromVkXml invocations earlier Move invocations to be closer to the definition of the macro. Minor edits to comments. move API_NAME earlier remove unused BUILDTGT_DIR variable move add_executable() earlier combine if(WIN32) trees .cmake-format.py 0.4.1 reformat using cmake-format 0.4.1 Change-Id: Ia251e932dbc9a8f2655201bb12248dea8c940c30
2018-09-20 18:12:14 +00:00
option(BUILD_LOADER "Build loader" ON)
if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/external/googletest)
option(BUILD_TESTS "Build Tests" ON)
else()
option(BUILD_TESTS "Build Tests" OFF)
endif()
cmake: Add warning if submodules not initialized
2018-05-14 20:52:49 +00:00
build: Beautify cmake files Add .cmake-format.py Add cmake-format docs to CONTRIBUTING.md Minor edits to existing files Due to a bug in cmake-format, use this script to reformat: for i in CMakeLists.txt external/CMakeLists.txt loader/CMakeLists.txt tests/CMakeLists.txt tests/layers/CMakeLists.txt do sed --in-place='' 's/^ *#/#/' $i cmake-format --in-place $i done Change-Id: I8e59c77ae184c88485a97a015ac81d4f71ac4897
2018-06-30 18:07:29 +00:00
if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
repo: Disable gcc 8 stringop warnings GCC 8 introduced some new "stringop" wanrings. The loader deliberately does things that trigger these warnings. As such, they should be disabled Change-Id: I08f640fae2930a06cbdd48095f11febfc9e866ed
2018-10-22 22:34:26 +00:00
set(COMMON_COMPILE_FLAGS "-Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wno-stringop-truncation -Wno-stringop-overflow")
misc:Fixes to get better behavior in release builds Add -fno-strict-aliasing -fno-builtin-memcmp - Both of these are used by the Mesa driver, and without the first one, we hang? in link_shaders on release builds Move cube's LoadTexture out of an assert so it isn't skipped in release builds
2015-02-05 21:14:33 +00:00
set(COMMON_COMPILE_FLAGS "${COMMON_COMPILE_FLAGS} -fno-strict-aliasing -fno-builtin-memcmp")
build: Fix loader/layer fallthrough warning Change-Id: I04d563caa9000ccbfd5e6e509bf65ceaed9e388a
2017-07-12 16:06:19 +00:00
build: Beautify cmake files Add .cmake-format.py Add cmake-format docs to CONTRIBUTING.md Minor edits to existing files Due to a bug in cmake-format, use this script to reformat: for i in CMakeLists.txt external/CMakeLists.txt loader/CMakeLists.txt tests/CMakeLists.txt tests/layers/CMakeLists.txt do sed --in-place='' 's/^ *#/#/' $i cmake-format --in-place $i done Change-Id: I8e59c77ae184c88485a97a015ac81d4f71ac4897
2018-06-30 18:07:29 +00:00
# For GCC version 7.1 or greater, we need to disable the implicit fallthrough warning since there's no consistent way to satisfy
# all compilers until they all accept the C++17 standard
if(CMAKE_COMPILER_IS_GNUCC AND NOT (CMAKE_CXX_COMPILER_VERSION LESS 7.1))
build: Fix loader/layer fallthrough warning Change-Id: I04d563caa9000ccbfd5e6e509bf65ceaed9e388a
2017-07-12 16:06:19 +00:00
set(COMMON_COMPILE_FLAGS "${COMMON_COMPILE_FLAGS} -Wimplicit-fallthrough=0")
endif()
build: Beautify cmake files Add .cmake-format.py Add cmake-format docs to CONTRIBUTING.md Minor edits to existing files Due to a bug in cmake-format, use this script to reformat: for i in CMakeLists.txt external/CMakeLists.txt loader/CMakeLists.txt tests/CMakeLists.txt tests/layers/CMakeLists.txt do sed --in-place='' 's/^ *#/#/' $i cmake-format --in-place $i done Change-Id: I8e59c77ae184c88485a97a015ac81d4f71ac4897
2018-06-30 18:07:29 +00:00
if(APPLE)
macOS: Add macOS support
2017-12-12 15:33:01 +00:00
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMMON_COMPILE_FLAGS}")
else()
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 ${COMMON_COMPILE_FLAGS}")
endif()
build: Disable RTTI generation Disablng RTTI can save a little space. And it will help keep some C++ features from being used that are not (well) supported on some platforms. Change-Id: I8050009a65de640c2e41cdefb1ead43c88bb710a
2016-05-12 16:28:57 +00:00
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMMON_COMPILE_FLAGS} -std=c++11 -fno-rtti")
build: Beautify cmake files Add .cmake-format.py Add cmake-format docs to CONTRIBUTING.md Minor edits to existing files Due to a bug in cmake-format, use this script to reformat: for i in CMakeLists.txt external/CMakeLists.txt loader/CMakeLists.txt tests/CMakeLists.txt tests/layers/CMakeLists.txt do sed --in-place='' 's/^ *#/#/' $i cmake-format --in-place $i done Change-Id: I8e59c77ae184c88485a97a015ac81d4f71ac4897
2018-06-30 18:07:29 +00:00
if(UNIX)
add and deal with -fvisibility=hidden everywhere
2014-08-04 00:03:57 +00:00
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden")
cmake: fix up gtest and set -fvisibility=hidden globally
2015-01-18 03:09:29 +00:00
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
add and deal with -fvisibility=hidden everywhere
2014-08-04 00:03:57 +00:00
endif()
endif()
cmake: find libdrm with pkg-config
2014-08-02 01:14:28 +00:00
build: CMakeLists.txt cleanup, part 1 This is a first pass reorganization of CMake files in this repo. It consists primarily of dead code/variable removal, simplification, and reformatting by latest cmake-format. bump to cmake_minimum_required(3.4) for ccache simplify excessive use of generator expressions clarify why CMAKE_OSX_DEPLOYMENT_TARGET is pre-project(). clarify setting Windows install prefix if needed remove unused DisplayServer variable remove obsolete argument to endif() remove unneeded ccache property RULE_LAUNCH_LINK ccache doesn't affect linking, so the property is meaningless. remove unneeded CMAKE_VERBOSE_MAKEFILE hardcode. remove extra CMAKE_MODULE_PATH remove extra cmake_minimum_required change PYTHON_CMD to PYTHON_EXECUTABLE change CMAKE_SYSTEM_NAME to UNIX/APPLE/WIN32 Use consistent platform identification. Note that UNIX evaluates true for OSX, so whenever the code intends "Linux only", we use (UNIX AND NOT APPLE). remove unneeded TARGET_NAMES variable remove unneeded VK_LAYER_RPATH variable change 'ln -sf' to 'cmake -E create_symlink' reorder dependencies for clarity rearrange order of macro arguments rename run_vk_xml_generate to GenerateFromVkXml rename add_vk_layer to AddVkLayer Borrowing from the Google style guide, use camel-case to more easily identify locally-defined macros/functions. remove unneeded WRAP_SRCS variable remove unneeded TEST_SRCS variable move check of VulkanRegistry_FOUND move SCRIPTS_DIR closer to point of use move include(FindPkgConfig) earlier move CMAKE_MACOSX_RPATH earlier move option() eariler move GenerateFromVkXml invocations earlier Move invocations to be closer to the definition of the macro. Minor edits to comments. move API_NAME earlier remove unused BUILDTGT_DIR variable move add_executable() earlier combine if(WIN32) trees .cmake-format.py 0.4.1 reformat using cmake-format 0.4.1 Change-Id: Ia251e932dbc9a8f2655201bb12248dea8c940c30
2018-09-20 18:12:14 +00:00
if(MSVC)
build: fix ninja on windows Use target_compile_options to avoid setting invalid compile options on asm targets. Change-Id: I5d95cfd77a2d515f41c7b8c2c9193f3aff906be7
2018-10-29 21:57:54 +00:00
# /WX: Treat warnings as errors
# /GR-: Disable RTTI
# /w34456: Warn about nested declarations
# /w34701, /w34703: Warn about potentially uninitialized variables
# /w34057: Warn about different indirection types.
# /w34245: Warn about signed/unsigned mismatch.
set(MSVC_LOADER_COMPILE_OPTIONS /WX /GR- /w34456 /w34701 /w34703 /w34057 /w34245)
build: Disable RTTI generation Disablng RTTI can save a little space. And it will help keep some C++ features from being used that are not (well) supported on some platforms. Change-Id: I8050009a65de640c2e41cdefb1ead43c88bb710a
2016-05-12 16:28:57 +00:00
endif()
build: CMakeLists.txt cleanup, part 1 This is a first pass reorganization of CMake files in this repo. It consists primarily of dead code/variable removal, simplification, and reformatting by latest cmake-format. bump to cmake_minimum_required(3.4) for ccache simplify excessive use of generator expressions clarify why CMAKE_OSX_DEPLOYMENT_TARGET is pre-project(). clarify setting Windows install prefix if needed remove unused DisplayServer variable remove obsolete argument to endif() remove unneeded ccache property RULE_LAUNCH_LINK ccache doesn't affect linking, so the property is meaningless. remove unneeded CMAKE_VERBOSE_MAKEFILE hardcode. remove extra CMAKE_MODULE_PATH remove extra cmake_minimum_required change PYTHON_CMD to PYTHON_EXECUTABLE change CMAKE_SYSTEM_NAME to UNIX/APPLE/WIN32 Use consistent platform identification. Note that UNIX evaluates true for OSX, so whenever the code intends "Linux only", we use (UNIX AND NOT APPLE). remove unneeded TARGET_NAMES variable remove unneeded VK_LAYER_RPATH variable change 'ln -sf' to 'cmake -E create_symlink' reorder dependencies for clarity rearrange order of macro arguments rename run_vk_xml_generate to GenerateFromVkXml rename add_vk_layer to AddVkLayer Borrowing from the Google style guide, use camel-case to more easily identify locally-defined macros/functions. remove unneeded WRAP_SRCS variable remove unneeded TEST_SRCS variable move check of VulkanRegistry_FOUND move SCRIPTS_DIR closer to point of use move include(FindPkgConfig) earlier move CMAKE_MACOSX_RPATH earlier move option() eariler move GenerateFromVkXml invocations earlier Move invocations to be closer to the definition of the macro. Minor edits to comments. move API_NAME earlier remove unused BUILDTGT_DIR variable move add_executable() earlier combine if(WIN32) trees .cmake-format.py 0.4.1 reformat using cmake-format 0.4.1 Change-Id: Ia251e932dbc9a8f2655201bb12248dea8c940c30
2018-09-20 18:12:14 +00:00
# Define a macro to generate source code from vk.xml
set(SCRIPTS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/scripts")
macro(GenerateFromVkXml output dependency)
cmake: Move common xml-gen macro to root file We had several copies of this macro across the repos -- moved it to the top-level cmake file for sharing. Change-Id: I33a97ecb24ad8c7cc6826c1a431f668fa2bec41f
2017-01-23 15:51:08 +00:00
add_custom_command(OUTPUT ${output}
build: CMakeLists.txt cleanup, part 1 This is a first pass reorganization of CMake files in this repo. It consists primarily of dead code/variable removal, simplification, and reformatting by latest cmake-format. bump to cmake_minimum_required(3.4) for ccache simplify excessive use of generator expressions clarify why CMAKE_OSX_DEPLOYMENT_TARGET is pre-project(). clarify setting Windows install prefix if needed remove unused DisplayServer variable remove obsolete argument to endif() remove unneeded ccache property RULE_LAUNCH_LINK ccache doesn't affect linking, so the property is meaningless. remove unneeded CMAKE_VERBOSE_MAKEFILE hardcode. remove extra CMAKE_MODULE_PATH remove extra cmake_minimum_required change PYTHON_CMD to PYTHON_EXECUTABLE change CMAKE_SYSTEM_NAME to UNIX/APPLE/WIN32 Use consistent platform identification. Note that UNIX evaluates true for OSX, so whenever the code intends "Linux only", we use (UNIX AND NOT APPLE). remove unneeded TARGET_NAMES variable remove unneeded VK_LAYER_RPATH variable change 'ln -sf' to 'cmake -E create_symlink' reorder dependencies for clarity rearrange order of macro arguments rename run_vk_xml_generate to GenerateFromVkXml rename add_vk_layer to AddVkLayer Borrowing from the Google style guide, use camel-case to more easily identify locally-defined macros/functions. remove unneeded WRAP_SRCS variable remove unneeded TEST_SRCS variable move check of VulkanRegistry_FOUND move SCRIPTS_DIR closer to point of use move include(FindPkgConfig) earlier move CMAKE_MACOSX_RPATH earlier move option() eariler move GenerateFromVkXml invocations earlier Move invocations to be closer to the definition of the macro. Minor edits to comments. move API_NAME earlier remove unused BUILDTGT_DIR variable move add_executable() earlier combine if(WIN32) trees .cmake-format.py 0.4.1 reformat using cmake-format 0.4.1 Change-Id: Ia251e932dbc9a8f2655201bb12248dea8c940c30
2018-09-20 18:12:14 +00:00
COMMAND ${PYTHON_EXECUTABLE} ${SCRIPTS_DIR}/loader_genvk.py -registry ${VulkanRegistry_DIR}/vk.xml -scripts
build: Beautify cmake files Add .cmake-format.py Add cmake-format docs to CONTRIBUTING.md Minor edits to existing files Due to a bug in cmake-format, use this script to reformat: for i in CMakeLists.txt external/CMakeLists.txt loader/CMakeLists.txt tests/CMakeLists.txt tests/layers/CMakeLists.txt do sed --in-place='' 's/^ *#/#/' $i cmake-format --in-place $i done Change-Id: I8e59c77ae184c88485a97a015ac81d4f71ac4897
2018-06-30 18:07:29 +00:00
${VulkanRegistry_DIR} ${output}
build: CMakeLists.txt cleanup, part 1 This is a first pass reorganization of CMake files in this repo. It consists primarily of dead code/variable removal, simplification, and reformatting by latest cmake-format. bump to cmake_minimum_required(3.4) for ccache simplify excessive use of generator expressions clarify why CMAKE_OSX_DEPLOYMENT_TARGET is pre-project(). clarify setting Windows install prefix if needed remove unused DisplayServer variable remove obsolete argument to endif() remove unneeded ccache property RULE_LAUNCH_LINK ccache doesn't affect linking, so the property is meaningless. remove unneeded CMAKE_VERBOSE_MAKEFILE hardcode. remove extra CMAKE_MODULE_PATH remove extra cmake_minimum_required change PYTHON_CMD to PYTHON_EXECUTABLE change CMAKE_SYSTEM_NAME to UNIX/APPLE/WIN32 Use consistent platform identification. Note that UNIX evaluates true for OSX, so whenever the code intends "Linux only", we use (UNIX AND NOT APPLE). remove unneeded TARGET_NAMES variable remove unneeded VK_LAYER_RPATH variable change 'ln -sf' to 'cmake -E create_symlink' reorder dependencies for clarity rearrange order of macro arguments rename run_vk_xml_generate to GenerateFromVkXml rename add_vk_layer to AddVkLayer Borrowing from the Google style guide, use camel-case to more easily identify locally-defined macros/functions. remove unneeded WRAP_SRCS variable remove unneeded TEST_SRCS variable move check of VulkanRegistry_FOUND move SCRIPTS_DIR closer to point of use move include(FindPkgConfig) earlier move CMAKE_MACOSX_RPATH earlier move option() eariler move GenerateFromVkXml invocations earlier Move invocations to be closer to the definition of the macro. Minor edits to comments. move API_NAME earlier remove unused BUILDTGT_DIR variable move add_executable() earlier combine if(WIN32) trees .cmake-format.py 0.4.1 reformat using cmake-format 0.4.1 Change-Id: Ia251e932dbc9a8f2655201bb12248dea8c940c30
2018-09-20 18:12:14 +00:00
DEPENDS ${SCRIPTS_DIR}/${dependency}
build: Beautify cmake files Add .cmake-format.py Add cmake-format docs to CONTRIBUTING.md Minor edits to existing files Due to a bug in cmake-format, use this script to reformat: for i in CMakeLists.txt external/CMakeLists.txt loader/CMakeLists.txt tests/CMakeLists.txt tests/layers/CMakeLists.txt do sed --in-place='' 's/^ *#/#/' $i cmake-format --in-place $i done Change-Id: I8e59c77ae184c88485a97a015ac81d4f71ac4897
2018-06-30 18:07:29 +00:00
${SCRIPTS_DIR}/loader_genvk.py
build: CMakeLists.txt cleanup, part 1 This is a first pass reorganization of CMake files in this repo. It consists primarily of dead code/variable removal, simplification, and reformatting by latest cmake-format. bump to cmake_minimum_required(3.4) for ccache simplify excessive use of generator expressions clarify why CMAKE_OSX_DEPLOYMENT_TARGET is pre-project(). clarify setting Windows install prefix if needed remove unused DisplayServer variable remove obsolete argument to endif() remove unneeded ccache property RULE_LAUNCH_LINK ccache doesn't affect linking, so the property is meaningless. remove unneeded CMAKE_VERBOSE_MAKEFILE hardcode. remove extra CMAKE_MODULE_PATH remove extra cmake_minimum_required change PYTHON_CMD to PYTHON_EXECUTABLE change CMAKE_SYSTEM_NAME to UNIX/APPLE/WIN32 Use consistent platform identification. Note that UNIX evaluates true for OSX, so whenever the code intends "Linux only", we use (UNIX AND NOT APPLE). remove unneeded TARGET_NAMES variable remove unneeded VK_LAYER_RPATH variable change 'ln -sf' to 'cmake -E create_symlink' reorder dependencies for clarity rearrange order of macro arguments rename run_vk_xml_generate to GenerateFromVkXml rename add_vk_layer to AddVkLayer Borrowing from the Google style guide, use camel-case to more easily identify locally-defined macros/functions. remove unneeded WRAP_SRCS variable remove unneeded TEST_SRCS variable move check of VulkanRegistry_FOUND move SCRIPTS_DIR closer to point of use move include(FindPkgConfig) earlier move CMAKE_MACOSX_RPATH earlier move option() eariler move GenerateFromVkXml invocations earlier Move invocations to be closer to the definition of the macro. Minor edits to comments. move API_NAME earlier remove unused BUILDTGT_DIR variable move add_executable() earlier combine if(WIN32) trees .cmake-format.py 0.4.1 reformat using cmake-format 0.4.1 Change-Id: Ia251e932dbc9a8f2655201bb12248dea8c940c30
2018-09-20 18:12:14 +00:00
${VulkanRegistry_DIR}/vk.xml
${VulkanRegistry_DIR}/generator.py
build: Beautify cmake files Add .cmake-format.py Add cmake-format docs to CONTRIBUTING.md Minor edits to existing files Due to a bug in cmake-format, use this script to reformat: for i in CMakeLists.txt external/CMakeLists.txt loader/CMakeLists.txt tests/CMakeLists.txt tests/layers/CMakeLists.txt do sed --in-place='' 's/^ *#/#/' $i cmake-format --in-place $i done Change-Id: I8e59c77ae184c88485a97a015ac81d4f71ac4897
2018-06-30 18:07:29 +00:00
${VulkanRegistry_DIR}/reg.py)
cmake: Move common xml-gen macro to root file We had several copies of this macro across the repos -- moved it to the top-level cmake file for sharing. Change-Id: I33a97ecb24ad8c7cc6826c1a431f668fa2bec41f
2017-01-23 15:51:08 +00:00
endmacro()
build: CMakeLists.txt cleanup, part 1 This is a first pass reorganization of CMake files in this repo. It consists primarily of dead code/variable removal, simplification, and reformatting by latest cmake-format. bump to cmake_minimum_required(3.4) for ccache simplify excessive use of generator expressions clarify why CMAKE_OSX_DEPLOYMENT_TARGET is pre-project(). clarify setting Windows install prefix if needed remove unused DisplayServer variable remove obsolete argument to endif() remove unneeded ccache property RULE_LAUNCH_LINK ccache doesn't affect linking, so the property is meaningless. remove unneeded CMAKE_VERBOSE_MAKEFILE hardcode. remove extra CMAKE_MODULE_PATH remove extra cmake_minimum_required change PYTHON_CMD to PYTHON_EXECUTABLE change CMAKE_SYSTEM_NAME to UNIX/APPLE/WIN32 Use consistent platform identification. Note that UNIX evaluates true for OSX, so whenever the code intends "Linux only", we use (UNIX AND NOT APPLE). remove unneeded TARGET_NAMES variable remove unneeded VK_LAYER_RPATH variable change 'ln -sf' to 'cmake -E create_symlink' reorder dependencies for clarity rearrange order of macro arguments rename run_vk_xml_generate to GenerateFromVkXml rename add_vk_layer to AddVkLayer Borrowing from the Google style guide, use camel-case to more easily identify locally-defined macros/functions. remove unneeded WRAP_SRCS variable remove unneeded TEST_SRCS variable move check of VulkanRegistry_FOUND move SCRIPTS_DIR closer to point of use move include(FindPkgConfig) earlier move CMAKE_MACOSX_RPATH earlier move option() eariler move GenerateFromVkXml invocations earlier Move invocations to be closer to the definition of the macro. Minor edits to comments. move API_NAME earlier remove unused BUILDTGT_DIR variable move add_executable() earlier combine if(WIN32) trees .cmake-format.py 0.4.1 reformat using cmake-format 0.4.1 Change-Id: Ia251e932dbc9a8f2655201bb12248dea8c940c30
2018-09-20 18:12:14 +00:00
# Use the macro to generate the source files.
GenerateFromVkXml(vk_layer_dispatch_table.h loader_extension_generator.py)
GenerateFromVkXml(vk_dispatch_table_helper.h dispatch_table_helper_generator.py)
GenerateFromVkXml(vk_object_types.h helper_file_generator.py)
# Use a custom target to cause the source files to be generated.
build: Beautify cmake files Add .cmake-format.py Add cmake-format docs to CONTRIBUTING.md Minor edits to existing files Due to a bug in cmake-format, use this script to reformat: for i in CMakeLists.txt external/CMakeLists.txt loader/CMakeLists.txt tests/CMakeLists.txt tests/layers/CMakeLists.txt do sed --in-place='' 's/^ *#/#/' $i cmake-format --in-place $i done Change-Id: I8e59c77ae184c88485a97a015ac81d4f71ac4897
2018-06-30 18:07:29 +00:00
add_custom_target(generate_helper_files
scripts: Remove unused codegen from build There was some old codegen that was used for generating validation layers when those were in the same repo as the loader. Since they're separate, we can remove the files so they only exist in the layers repo. Change-Id: Ia72f235ea0617f25258631e1003123ec3edd88d4
2019-05-03 21:40:59 +00:00
DEPENDS vk_object_types.h
build: Beautify cmake files Add .cmake-format.py Add cmake-format docs to CONTRIBUTING.md Minor edits to existing files Due to a bug in cmake-format, use this script to reformat: for i in CMakeLists.txt external/CMakeLists.txt loader/CMakeLists.txt tests/CMakeLists.txt tests/layers/CMakeLists.txt do sed --in-place='' 's/^ *#/#/' $i cmake-format --in-place $i done Change-Id: I8e59c77ae184c88485a97a015ac81d4f71ac4897
2018-06-30 18:07:29 +00:00
vk_layer_dispatch_table.h
scripts: Remove unused codegen from build There was some old codegen that was used for generating validation layers when those were in the same repo as the loader. Since they're separate, we can remove the files so they only exist in the layers repo. Change-Id: Ia72f235ea0617f25258631e1003123ec3edd88d4
2019-05-03 21:40:59 +00:00
vk_dispatch_table_helper.h)
build: CMakeLists.txt cleanup, part 1 This is a first pass reorganization of CMake files in this repo. It consists primarily of dead code/variable removal, simplification, and reformatting by latest cmake-format. bump to cmake_minimum_required(3.4) for ccache simplify excessive use of generator expressions clarify why CMAKE_OSX_DEPLOYMENT_TARGET is pre-project(). clarify setting Windows install prefix if needed remove unused DisplayServer variable remove obsolete argument to endif() remove unneeded ccache property RULE_LAUNCH_LINK ccache doesn't affect linking, so the property is meaningless. remove unneeded CMAKE_VERBOSE_MAKEFILE hardcode. remove extra CMAKE_MODULE_PATH remove extra cmake_minimum_required change PYTHON_CMD to PYTHON_EXECUTABLE change CMAKE_SYSTEM_NAME to UNIX/APPLE/WIN32 Use consistent platform identification. Note that UNIX evaluates true for OSX, so whenever the code intends "Linux only", we use (UNIX AND NOT APPLE). remove unneeded TARGET_NAMES variable remove unneeded VK_LAYER_RPATH variable change 'ln -sf' to 'cmake -E create_symlink' reorder dependencies for clarity rearrange order of macro arguments rename run_vk_xml_generate to GenerateFromVkXml rename add_vk_layer to AddVkLayer Borrowing from the Google style guide, use camel-case to more easily identify locally-defined macros/functions. remove unneeded WRAP_SRCS variable remove unneeded TEST_SRCS variable move check of VulkanRegistry_FOUND move SCRIPTS_DIR closer to point of use move include(FindPkgConfig) earlier move CMAKE_MACOSX_RPATH earlier move option() eariler move GenerateFromVkXml invocations earlier Move invocations to be closer to the definition of the macro. Minor edits to comments. move API_NAME earlier remove unused BUILDTGT_DIR variable move add_executable() earlier combine if(WIN32) trees .cmake-format.py 0.4.1 reformat using cmake-format 0.4.1 Change-Id: Ia251e932dbc9a8f2655201bb12248dea8c940c30
2018-09-20 18:12:14 +00:00
cmake: Fixup FOLDER properties
2018-06-14 22:53:01 +00:00
set_target_properties(generate_helper_files PROPERTIES FOLDER ${LOADER_HELPER_FOLDER})
cmake: Add common targets/rules for helper files Change-Id: I26244eaf04451fd7c3755563953c7b8ad3715613
2017-01-23 16:08:20 +00:00
build: CMakeLists.txt cleanup, part 1 This is a first pass reorganization of CMake files in this repo. It consists primarily of dead code/variable removal, simplification, and reformatting by latest cmake-format. bump to cmake_minimum_required(3.4) for ccache simplify excessive use of generator expressions clarify why CMAKE_OSX_DEPLOYMENT_TARGET is pre-project(). clarify setting Windows install prefix if needed remove unused DisplayServer variable remove obsolete argument to endif() remove unneeded ccache property RULE_LAUNCH_LINK ccache doesn't affect linking, so the property is meaningless. remove unneeded CMAKE_VERBOSE_MAKEFILE hardcode. remove extra CMAKE_MODULE_PATH remove extra cmake_minimum_required change PYTHON_CMD to PYTHON_EXECUTABLE change CMAKE_SYSTEM_NAME to UNIX/APPLE/WIN32 Use consistent platform identification. Note that UNIX evaluates true for OSX, so whenever the code intends "Linux only", we use (UNIX AND NOT APPLE). remove unneeded TARGET_NAMES variable remove unneeded VK_LAYER_RPATH variable change 'ln -sf' to 'cmake -E create_symlink' reorder dependencies for clarity rearrange order of macro arguments rename run_vk_xml_generate to GenerateFromVkXml rename add_vk_layer to AddVkLayer Borrowing from the Google style guide, use camel-case to more easily identify locally-defined macros/functions. remove unneeded WRAP_SRCS variable remove unneeded TEST_SRCS variable move check of VulkanRegistry_FOUND move SCRIPTS_DIR closer to point of use move include(FindPkgConfig) earlier move CMAKE_MACOSX_RPATH earlier move option() eariler move GenerateFromVkXml invocations earlier Move invocations to be closer to the definition of the macro. Minor edits to comments. move API_NAME earlier remove unused BUILDTGT_DIR variable move add_executable() earlier combine if(WIN32) trees .cmake-format.py 0.4.1 reformat using cmake-format 0.4.1 Change-Id: Ia251e932dbc9a8f2655201bb12248dea8c940c30
2018-09-20 18:12:14 +00:00
if(UNIX)
loader: Configurable fallback search paths This makes it easier for non-FHS distributions to behave well when the loader is used by a SUID process or in an otherwise unusual environment.
2017-02-19 19:14:24 +00:00
add_definitions(-DFALLBACK_CONFIG_DIRS="${FALLBACK_CONFIG_DIRS}")
add_definitions(-DFALLBACK_DATA_DIRS="${FALLBACK_DATA_DIRS}")
loader: use CMAKE_INSTALL_FULL_<dir> to improve Linux filesystem compatibility In order to improve the loader's compatibility with different filesystem hierarchies under Linux, use CMake's CMAKE_INSTALL_FULL_<dir> instead of CMAKE_INSTALL_<dir> to correctly resolve the absolute paths of SYSCONFDIR and DATADIR in compliance with the GNU Coding Standard [1] and Linux Foundation's Filesystem Hierarchy Standard [2], as explained in CMake's documentation [3]. Note to packagers: When using CMAKE_INSTALL_PREFIX, this commit obviates the definition of other CMAKE_INSTALL_ defines to properly detect ICD and layer manifests in GNU/Linux-compliant filesystems. This commit fixes GH-1083. (see the issue for more details) [1] https://www.gnu.org/prep/standards/html_node/Directory-Variables.html [2] https://refspecs.linuxfoundation.org/FHS_3.0/fhs/index.html [3] https://cmake.org/cmake/help/v3.4/module/GNUInstallDirs.html Change-Id: If743a3c8f5f7381e00c0d23b95b9e13c0dead144 Signed-off-by: Dor Askayo <dor.askayo@gmail.com>
2016-10-22 17:42:44 +00:00
add_definitions(-DSYSCONFDIR="${CMAKE_INSTALL_FULL_SYSCONFDIR}")
loader: Configurable fallback search paths This makes it easier for non-FHS distributions to behave well when the loader is used by a SUID process or in an otherwise unusual environment.
2017-02-19 19:14:24 +00:00
loader: fix duplicate detection of manifests when CMAKE_INSTALL_PREFIX is defined This commit fixes GH-1084. (see the issue for more details) Note that this adds /usr/local/etc and /usr/local/share to the loader's search path for drivers and layers. Change-Id: I2cf502cc7d905225c8d38383ea6f856a4daed3ea Signed-off-by: Dor Askayo <dor.askayo@gmail.com>
2016-10-22 19:20:29 +00:00
# Make sure /etc is searched by the loader
loader: Improve Linux manifest search Searching XDG_CONFIG_DIRS and XDG_DATA_DIRS instead of hard-coding specific paths improves portability, particularly on platforms which don't implement the Filesystem Hierarchy Standard. For example, this allows the loader to function correctly out of the box on NixOS.
2017-01-29 22:49:54 +00:00
if(NOT (CMAKE_INSTALL_FULL_SYSCONFDIR STREQUAL "/etc"))
loader: fix duplicate detection of manifests when CMAKE_INSTALL_PREFIX is defined This commit fixes GH-1084. (see the issue for more details) Note that this adds /usr/local/etc and /usr/local/share to the loader's search path for drivers and layers. Change-Id: I2cf502cc7d905225c8d38383ea6f856a4daed3ea Signed-off-by: Dor Askayo <dor.askayo@gmail.com>
2016-10-22 19:20:29 +00:00
add_definitions(-DEXTRASYSCONFDIR="/etc")
endif()
cmake: Lift common glslang definitions up to main CMakeLists
2014-10-03 21:34:53 +00:00
endif()
build: Add uninstall target for Linux Change-Id: I0addef3265b5a2b5ec7b902d9c0086725a2ebb15
2017-03-14 23:11:24 +00:00
# uninstall target
cmake: Prevent redefinition of uninstall target Allows for this repo to be included as a submodule of another repo that defines its own uninstall target. The uninstall target is best defined at the top-level repo.
2018-06-12 21:10:23 +00:00
if(NOT TARGET uninstall)
build: CMakeLists.txt cleanup, part 1 This is a first pass reorganization of CMake files in this repo. It consists primarily of dead code/variable removal, simplification, and reformatting by latest cmake-format. bump to cmake_minimum_required(3.4) for ccache simplify excessive use of generator expressions clarify why CMAKE_OSX_DEPLOYMENT_TARGET is pre-project(). clarify setting Windows install prefix if needed remove unused DisplayServer variable remove obsolete argument to endif() remove unneeded ccache property RULE_LAUNCH_LINK ccache doesn't affect linking, so the property is meaningless. remove unneeded CMAKE_VERBOSE_MAKEFILE hardcode. remove extra CMAKE_MODULE_PATH remove extra cmake_minimum_required change PYTHON_CMD to PYTHON_EXECUTABLE change CMAKE_SYSTEM_NAME to UNIX/APPLE/WIN32 Use consistent platform identification. Note that UNIX evaluates true for OSX, so whenever the code intends "Linux only", we use (UNIX AND NOT APPLE). remove unneeded TARGET_NAMES variable remove unneeded VK_LAYER_RPATH variable change 'ln -sf' to 'cmake -E create_symlink' reorder dependencies for clarity rearrange order of macro arguments rename run_vk_xml_generate to GenerateFromVkXml rename add_vk_layer to AddVkLayer Borrowing from the Google style guide, use camel-case to more easily identify locally-defined macros/functions. remove unneeded WRAP_SRCS variable remove unneeded TEST_SRCS variable move check of VulkanRegistry_FOUND move SCRIPTS_DIR closer to point of use move include(FindPkgConfig) earlier move CMAKE_MACOSX_RPATH earlier move option() eariler move GenerateFromVkXml invocations earlier Move invocations to be closer to the definition of the macro. Minor edits to comments. move API_NAME earlier remove unused BUILDTGT_DIR variable move add_executable() earlier combine if(WIN32) trees .cmake-format.py 0.4.1 reformat using cmake-format 0.4.1 Change-Id: Ia251e932dbc9a8f2655201bb12248dea8c940c30
2018-09-20 18:12:14 +00:00
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
build: Beautify cmake files Add .cmake-format.py Add cmake-format docs to CONTRIBUTING.md Minor edits to existing files Due to a bug in cmake-format, use this script to reformat: for i in CMakeLists.txt external/CMakeLists.txt loader/CMakeLists.txt tests/CMakeLists.txt tests/layers/CMakeLists.txt do sed --in-place='' 's/^ *#/#/' $i cmake-format --in-place $i done Change-Id: I8e59c77ae184c88485a97a015ac81d4f71ac4897
2018-06-30 18:07:29 +00:00
IMMEDIATE
@ONLY)
add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
cmake: Fixup FOLDER properties
2018-06-14 22:53:01 +00:00
set_target_properties(uninstall PROPERTIES FOLDER ${LOADER_HELPER_FOLDER})
cmake: Prevent redefinition of uninstall target Allows for this repo to be included as a submodule of another repo that defines its own uninstall target. The uninstall target is best defined at the top-level repo.
2018-06-12 21:10:23 +00:00
endif()
build: Add include files to make install target Change-Id: Ieaf84adc4a9345c1f5ef7646106dd00ff3e5e716
2016-10-12 23:36:35 +00:00
cmake: Make all sub-components optional
2015-10-10 15:43:07 +00:00
if(BUILD_LOADER)
add_subdirectory(loader)
endif()
build: Improve googletest handling Behavior is largely unchanged except that specifying BUILD_TESTS=ON with googletest not present no longer quietly skips building the tests. - Make inclusion of external directory unconditional. We may someday put something there is not related to testing. - Make default for BUILD_TEST dependent on googletest presence. - Remove if() around entire contents of tests CMake file. - Add CMake messaging to clarify googletest activity. - Throw a CMake error if googletest not present and BUILD_TESTS=ON
2018-06-22 21:20:48 +00:00
add_subdirectory(external)
Bug 14084 - Object Tracker, Image, Generic layers
2015-07-09 23:31:46 +00:00
if(BUILD_TESTS)
repo: Make loader tests work on Linux
2018-05-09 23:40:36 +00:00
add_subdirectory(tests)
icd: Adding generated mock icd Initial check-in for mock icd which is being built to allow validation testing without the need for an actual Vulkan device. ICD is currently building and passing 324/332 tests. It creates ptr handles for dispatchable objects and unique id handles for non-dispatchable objects. It currently has some hard-coded values for various Get* device-query functions in order to allow forward progress. The long-term intention is to allow the device configuration to be set by the test itself. See the ICD README.md file for more info.
2017-10-13 15:26:20 +00:00
endif()
Reference in New Issue Copy Permalink