From: Jacob Lifshay <programmerjake@gmail.com>
Date: Wed, 9 Aug 2017 04:23:50 +0000 (-0700)
Subject: renamed libraries
X-Git-Tag: gsoc-2017~53
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=67576f02b7193936e541d18cde17651c0782eb41;p=kazan.git

renamed libraries
---

diff --git a/src/demo/CMakeLists.txt b/src/demo/CMakeLists.txt
index 61fd57e..5b6bfcf 100644
--- a/src/demo/CMakeLists.txt
+++ b/src/demo/CMakeLists.txt
@@ -21,4 +21,4 @@
 cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
 set(sources demo.cpp) 
 add_executable(demo ${sources})
-target_link_libraries(demo spirv util spirv_to_llvm)
+target_link_libraries(demo vulkan_cpu_spirv vulkan_cpu_util vulkan_cpu_spirv_to_llvm)
diff --git a/src/generate_spirv_parser/CMakeLists.txt b/src/generate_spirv_parser/CMakeLists.txt
index 14ac6a8..ba4f408 100644
--- a/src/generate_spirv_parser/CMakeLists.txt
+++ b/src/generate_spirv_parser/CMakeLists.txt
@@ -26,4 +26,4 @@ set(sources ast.cpp
             parser.cpp
             patch.cpp)
 add_executable(generate_spirv_parser ${sources})
-target_link_libraries(generate_spirv_parser util json)
+target_link_libraries(generate_spirv_parser vulkan_cpu_util vulkan_cpu_json)
diff --git a/src/json/CMakeLists.txt b/src/json/CMakeLists.txt
index c142b58..eab6d41 100644
--- a/src/json/CMakeLists.txt
+++ b/src/json/CMakeLists.txt
@@ -23,5 +23,5 @@ set(sources json.cpp
             location.cpp
             parser.cpp
             source.cpp)
-add_library(json STATIC ${sources})
-target_link_libraries(json util)
\ No newline at end of file
+add_library(vulkan_cpu_json STATIC ${sources})
+target_link_libraries(vulkan_cpu_json vulkan_cpu_util)
diff --git a/src/llvm_wrapper/CMakeLists.txt b/src/llvm_wrapper/CMakeLists.txt
index 6889b41..30fad9f 100644
--- a/src/llvm_wrapper/CMakeLists.txt
+++ b/src/llvm_wrapper/CMakeLists.txt
@@ -21,10 +21,10 @@
 cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
 
 set(sources llvm_wrapper.cpp)
-add_library(llvm_wrapper STATIC ${sources})
-if(1)
+add_library(vulkan_cpu_llvm_wrapper STATIC ${sources})
+if(0)
 llvm_map_components_to_libnames(llvm_libraries core native analysis orcjit mcjit nativecodegen)
 else()
 set(llvm_libraries LLVM)
 endif()
-target_link_libraries(llvm_wrapper util ${llvm_libraries})
+target_link_libraries(vulkan_cpu_llvm_wrapper util ${llvm_libraries})
diff --git a/src/spirv/CMakeLists.txt b/src/spirv/CMakeLists.txt
index 6e1148d..5ccefc3 100644
--- a/src/spirv/CMakeLists.txt
+++ b/src/spirv/CMakeLists.txt
@@ -42,6 +42,6 @@ add_custom_command(OUTPUT ${spirv_parser_sources} ${spirv_parser_headers}
                    VERBATIM
                    COMMENT "Generating SPIR-V Parser")
 set(sources ${sources} ${spirv_parser_sources})
-add_library(spirv STATIC ${sources})
-target_link_libraries(spirv util json)
-target_include_directories(spirv PUBLIC ${spirv_parser_generated_include_dir})
+add_library(vulkan_cpu_spirv STATIC ${sources})
+target_link_libraries(vulkan_cpu_spirv vulkan_cpu_util vulkan_cpu_json)
+target_include_directories(vulkan_cpu_spirv PUBLIC ${spirv_parser_generated_include_dir})
diff --git a/src/spirv_to_llvm/CMakeLists.txt b/src/spirv_to_llvm/CMakeLists.txt
index 69b2730..64eb3cf 100644
--- a/src/spirv_to_llvm/CMakeLists.txt
+++ b/src/spirv_to_llvm/CMakeLists.txt
@@ -21,5 +21,5 @@
 cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
 
 set(sources spirv_to_llvm.cpp)
-add_library(spirv_to_llvm STATIC ${sources})
-target_link_libraries(spirv_to_llvm util spirv llvm_wrapper)
+add_library(vulkan_cpu_spirv_to_llvm STATIC ${sources})
+target_link_libraries(vulkan_cpu_spirv_to_llvm vulkan_cpu_util vulkan_cpu_spirv vulkan_cpu_llvm_wrapper)
diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
index 2f6d1a3..4a8e995 100644
--- a/src/util/CMakeLists.txt
+++ b/src/util/CMakeLists.txt
@@ -40,7 +40,7 @@ set(sources bit_intrinsics.cpp
             string_view.cpp
             variant.cpp
             void_t.cpp)
-add_library(util STATIC ${sources})
-target_include_directories(util PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/..)
-add_executable(util_test EXCLUDE_FROM_ALL ${sources} util_test.cpp)
-target_include_directories(util_test PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/..)
+add_library(vulkan_cpu_util STATIC ${sources})
+target_include_directories(vulkan_cpu_util PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/..)
+add_executable(vulkan_cpu_util_test EXCLUDE_FROM_ALL ${sources} util_test.cpp)
+target_include_directories(vulkan_cpu_util_test PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/..)