From 747ab8b391efc3658af751e0094710e488a50d29 Mon Sep 17 00:00:00 2001
From: hyzboy <hyzboy@gmail.com>
Date: Mon, 19 Aug 2019 10:32:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E4=B8=BA=E7=9B=B4=E6=8E=A5=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8glslang,SPIRV,OGLCompilers=E5=B7=A5=E7=A8=8B=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E9=81=BF=E5=85=8D=E9=80=A0=E6=88=90glslang/M?=
 =?UTF-8?q?athGeoLib=E9=85=8D=E7=BD=AE=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CMakeLists.txt | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d9f341d7..9b4cc42e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,11 +44,11 @@ SET(ULRE    ULRE.Base
             MathGeoLib
             spirv-cross-core
             SPIRV
+            glslang
             jsoncpp_lib
             ${RENDER_LIBRARY}
             ${Vulkan_LIBRARIES})
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/3rdpty/glslang)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/3rdpty/assimp/include)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/3rdpty/MathGeoLib/src)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/3rdpty/NvTriStrip)
@@ -60,6 +60,20 @@ SET(SPIRV_CROSS_PATH ${CMAKE_CURRENT_SOURCE_DIR}/3rdpty/SPIRV-Cross)
 include_directories(${SPIRV_CROSS_PATH})
 add_subdirectory(${SPIRV_CROSS_PATH})
 
+macro(glslang_pch SRCS PCHCPP)
+    message("use null [glslang_pch] macro")
+endmacro()
+
+include_directories(${SPIRV_CROSS_PATH}/external/glslang/glslang/Public)
+add_subdirectory(${SPIRV_CROSS_PATH}/external/glslang/glslang)
+
+include_directories(${SPIRV_CROSS_PATH}/external/glslang)
+add_subdirectory(${SPIRV_CROSS_PATH}/external/glslang/SPIRV)
+
+if(WIN32)
+add_subdirectory(${SPIRV_CROSS_PATH}/external/glslang/OGLCompilersDLL)
+endif()
+
 SET(ULRE_RUNTIME_PATH   ${CMAKE_CURRENT_SOURCE_DIR})
 
 add_subdirectory(3rdpty/MathGeoLib)