From 5ee3c3dfc4ce3f42fcd4355f5697598138b927e7 Mon Sep 17 00:00:00 2001
From: Karl Schultz <karl@lunarg.com>
Date: Fri, 12 Jan 2018 14:41:55 -0700
Subject: build: Use DevSim from a VulkanTools build in CI

- Change Travis-CI to build VulkanTools and use the resulting
  DevSim binary instead of the one checked into the repo.
- Delete the DevSim binary and JSON file from layers/linux.
- Remove CMake rules related to DevSim binary.
---
 layers/CMakeLists.txt                        |  28 ---------------------------
 layers/linux/VkLayer_device_simulation.json  |  11 -----------
 layers/linux/libVkLayer_device_simulation.so | Bin 350874 -> 0 bytes
 3 files changed, 39 deletions(-)
 delete mode 100644 layers/linux/VkLayer_device_simulation.json
 delete mode 100755 layers/linux/libVkLayer_device_simulation.so

(limited to 'layers')

diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt
index 53beccbf..eb23788f 100644
--- a/layers/CMakeLists.txt
+++ b/layers/CMakeLists.txt
@@ -39,14 +39,6 @@ set(LAYER_JSON_FILES_NO_DEPENDENCIES
 
 set(LAYER_JSON_FILES ${LAYER_JSON_FILES_WITH_DEPENDENCIES} ${LAYER_JSON_FILES_NO_DEPENDENCIES})
 
-set(LAYER_BINARY_JSON_FILES
-    VkLayer_device_simulation
-    )
-
-set(LAYER_BINARY_FILES
-    libVkLayer_device_simulation
-    )
-
 if (WIN32)
         if (CMAKE_GENERATOR MATCHES "^Visual Studio.*")
             foreach (config_file ${LAYER_JSON_FILES})
@@ -85,18 +77,6 @@ else()
                 VERBATIM
                 )
         endforeach(config_file)
-        foreach (config_file ${LAYER_BINARY_JSON_FILES})
-            add_custom_target(${config_file}-bin-json ALL
-                COMMAND ln -sf ${CMAKE_CURRENT_SOURCE_DIR}/linux/${config_file}.json
-                VERBATIM
-                )
-        endforeach(config_file)
-        foreach (config_file ${LAYER_BINARY_FILES})
-            add_custom_target(${config_file}-so ALL
-                COMMAND ln -sf ${CMAKE_CURRENT_SOURCE_DIR}/linux/${config_file}.so
-                VERBATIM
-                )
-        endforeach(config_file)
         # Add link to vk_validation_error_messages.h in build dir for scripts to pick up
         add_custom_target(vk_validation_error_messages ALL
             COMMAND ln -sf ${CMAKE_CURRENT_SOURCE_DIR}/vk_validation_error_messages.h
@@ -113,14 +93,6 @@ if ((Win32) OR (NOT (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
     foreach (config_file ${LAYER_JSON_FILES_NO_DEPENDENCIES})
         add_dependencies(${config_file}-json VkLayer_utils)
     endforeach(config_file)
-    if(UNIX)
-        foreach (config_file ${LAYER_BINARY_JSON_FILES})
-            add_dependencies(${config_file}-bin-json VkLayer_utils)
-        endforeach(config_file)
-        foreach (config_file ${LAYER_BINARY_FILES})
-            add_dependencies(${config_file}-so VkLayer_utils)
-        endforeach(config_file)
-    endif()
 endif()
 
 # Add targets for JSON file install on Linux.
diff --git a/layers/linux/VkLayer_device_simulation.json b/layers/linux/VkLayer_device_simulation.json
deleted file mode 100644
index 0cf0fdd5..00000000
--- a/layers/linux/VkLayer_device_simulation.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "file_format_version" : "1.1.0",
-    "layer" : {
-        "name": "VK_LAYER_LUNARG_device_simulation",
-        "type": "GLOBAL",
-        "library_path": "./libVkLayer_device_simulation.so",
-        "api_version": "1.0.67",
-        "implementation_version": "1.2.0",
-        "description": "LunarG device simulation layer"
-    }
-}
diff --git a/layers/linux/libVkLayer_device_simulation.so b/layers/linux/libVkLayer_device_simulation.so
deleted file mode 100755
index 3bfea567..00000000
Binary files a/layers/linux/libVkLayer_device_simulation.so and /dev/null differ
-- 
cgit v1.2.3