renamed libraries

diff --git a/src/demo/CMakeLists.txt b/src/demo/CMakeLists.txt
index 61fd57ea5e54c0ee9da2218df97c1dea6cadd165..5b6bfcf261374ffa1590f9c2b00d2225f1616870 100644 (file)
--- 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 14ac6a897dcdad3d5e22fb507f796fe72fb34d6d..ba4f408543586f034b16e6f17af33ffc59577f10 100644 (file)
--- 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 c142b58897556d5f080e15d92492438cf42b8080..eab6d413c2f9bd8e96476b71aad457e0b7f6a362 100644 (file)
--- 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 6889b4147b1ced3346f1ee7b2940702d3889e783..30fad9f912fb1017238e7f1a43eceead2d16cef3 100644 (file)
--- 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 6e1148de12bfe66d3cdb09903481ede0b7f81887..5ccefc31eb6e102841eb8e293fd4e69b58fad76f 100644 (file)
--- 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 69b27306b0f932fc3b937f34d080ddd488a1484c..64eb3cf44bcb2fcfcdb580ff22803bd6695ac67f 100644 (file)
--- 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 2f6d1a3fee7cd81bcda15890c9136ee470928c3f..4a8e995e8fc5781422445a885cb3f90fac3ace93 100644 (file)
--- 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}/..)