From 827ce8bec6d4ee5f18a85777f77a8f362794aaa8 Mon Sep 17 00:00:00 2001
From: redstrate <54911369+redstrate@users.noreply.github.com>
Date: Tue, 22 Sep 2020 12:26:49 -0400
Subject: [PATCH] Fix strange glslang error and reduce spirv-cross modules

---
 CMakeLists.txt              | 18 ++++++++++++++++--
 engine/asset/CMakeLists.txt |  2 +-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 33fa356..36199d0 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,7 +39,7 @@ FetchContent_Declare(
   GIT_TAG master
 )
 
-# manual download
+# bullet
 set(BUILD_BULLET3 OFF CACHE BOOL "" FORCE)
 set(BUILD_BULLET3_DEMOS OFF CACHE BOOL "" FORCE)
 set(BUILD_BULLET2_DEMOS OFF CACHE BOOL "" FORCE)
@@ -47,11 +47,26 @@ set(BUILD_CPU_DEMOS OFF CACHE BOOL "" FORCE)
 set(USE_GRAPHICAL_BENCHMARK OFF CACHE BOOL "" FORCE)
 set(BUILD_EXTRAS OFF CACHE BOOL "" FORCE)
 set(INSTALL_LIBS OFF CACHE BOOL "" FORCE)
+
+# spirv-cross
 set(BUILD_UNIT_TESTS OFF CACHE BOOL "" FORCE)
 set(SPIRV_CROSS_SKIP_INSTALL ON CACHE BOOL "" FORCE)
 set(BUILD_EXTERNAL OFF CACHE BOOL "" FORCE)
+set(SPIRV_CROSS_CLI OFF CACHE BOOL "" FORCE)
+set(SPIRV_CROSS_ENABLE_TESTS OFF CACHE BOOL "" FORCE)
+set(SPIRV_CROSS_ENABLE_HLSL OFF CACHE BOOL "" FORCE)
+set(SPIRV_CROSS_ENABLE_CPP OFF CACHE BOOL "" FORCE)
+set(SPIRV_CROSS_ENABLE_REFLECT OFF CACHE BOOL "" FORCE)
+set(SPIRV_CROSS_ENABLE_C_API OFF CACHE BOOL "" FORCE)
+set(SPIRV_CROSS_ENABLE_UTIL OFF CACHE BOOL "" FORCE)
+
+# glslang
+set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
+set(BUILD_EXTERNAL OFF CACHE BOOL "" FORCE)
 set(ENABLE_GLSLANG_BINARIES OFF CACHE BOOL "" FORCE)
 set(USE_MSVC_RUNTIME_LIBRARY_DLL ON CACHE BOOL "" FORCE)
+set(ENABLE_GLSLANG_INSTALL OFF CACHE BOOL "" FORCE)
+set(ENABLE_CTEST OFF CACHE BOOL "" FORCE)
 
 set(CMAKE_FOLDER "External")
 
@@ -103,7 +118,6 @@ endif()
 set(CROSS_LIBS
     spirv-cross-core
     spirv-cross-glsl
-    spirv-cross-cpp
     spirv-cross-msl
     glslang
     SPIRV
diff --git a/engine/asset/CMakeLists.txt b/engine/asset/CMakeLists.txt
index b9b380d..f026181 100644
--- a/engine/asset/CMakeLists.txt
+++ b/engine/asset/CMakeLists.txt
@@ -6,7 +6,7 @@ set(SRC
     
     src/asset.cpp)
 
-add_library(Asset ${SRC})
+add_library(Asset STATIC ${SRC})
 target_include_directories(Asset PUBLIC include)
 target_link_libraries(Asset
     PUBLIC