From 97162f5b7ddd54c08e61d31144a12ca8183999b1 Mon Sep 17 00:00:00 2001 From: Mark Lobodzinski Date: Thu, 10 May 2018 20:34:08 -0600 Subject: [PATCH] cmake: More cmake fixups Removed duplicate vulkaninfo directives, renamed project, killed some dead comments. Change-Id: Ibf580ac0fb5f8ebec0a68fe9c36f7905dbccc594 --- CMakeLists.txt | 2 +- cube/CMakeLists.txt | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 02737c0..98295b0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 2.8.11) # This must come before the project command. set(CMAKE_OSX_DEPLOYMENT_TARGET "10.12" CACHE STRING "Minimum OS X deployment version") -project (VULKAN) +project (Vulkan-Tools) # set (CMAKE_VERBOSE_MAKEFILE 1) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake") diff --git a/cube/CMakeLists.txt b/cube/CMakeLists.txt index 92a9a3f..8a08855 100644 --- a/cube/CMakeLists.txt +++ b/cube/CMakeLists.txt @@ -92,7 +92,6 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux") ${MIR_INCLUDE_DIR} ${CUBE_INCLUDE_DIRS} ) - # TODO - Add Mir support elseif(CUBE_WSI_SELECTION STREQUAL "DISPLAY") add_definitions(-DVK_USE_PLATFORM_DISPLAY_KHR) else() @@ -115,11 +114,9 @@ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") if(WIN32) -#### set (LIBRARIES "vulkan-1") set (LIBRARIES "Vulkan::Vulkan") elseif(UNIX) set (LIBRARIES "Vulkan::Vulkan") -### set (LIBRARIES "vulkan") else() endif() -- 2.7.4