From adf3b72df8a5a8eed111a8e81128ef9ed794d976 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Tue, 11 Apr 2017 16:30:56 -0700 Subject: [PATCH] cmake noise --- CMakeLists.txt | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a7b8a89f3c..d99e16ef59 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -208,6 +208,9 @@ find_library(SPIRV_REMAPPER_LIB NAMES SPVRemapper find_library(SPIRV_TOOLS_LIB NAMES SPIRV-Tools HINTS ${SPIRV_TOOLS_SEARCH_PATH} ) +find_library(SPIRV_TOOLS_OPT_LIB NAMES SPIRV-Tools-opt + HINTS ${SPIRV_TOOLS_SEARCH_PATH}/opt ) + if (WIN32) add_library(glslang STATIC IMPORTED) add_library(OGLCompiler STATIC IMPORTED) @@ -217,6 +220,7 @@ if (WIN32) add_library(SPVRemapper STATIC IMPORTED) add_library(Loader STATIC IMPORTED) add_library(SPIRV-Tools STATIC IMPORTED) + add_library(SPIRV-Tools-opt STATIC IMPORTED) find_library(GLSLANG_DLIB NAMES glslangd HINTS ${GLSLANG_DEBUG_SEARCH_PATH} ) @@ -232,6 +236,8 @@ if (WIN32) HINTS ${GLSLANG_DEBUG_SEARCH_PATH} ) find_library(SPIRV_TOOLS_DLIB NAMES SPIRV-Tools HINTS ${SPIRV_TOOLS_DEBUG_SEARCH_PATH} ) + find_library(SPIRV_TOOLS_OPT_DLIB NAMES SPIRV-Tools-opt + HINTS ${SPIRV_TOOLS_DEBUG_SEARCH_PATH}/opt ) set_target_properties(glslang PROPERTIES IMPORTED_LOCATION "${GLSLANG_LIB}" @@ -254,12 +260,15 @@ if (WIN32) set_target_properties(SPIRV-Tools PROPERTIES IMPORTED_LOCATION "${SPIRV_TOOLS_LIB}" IMPORTED_LOCATION_DEBUG "${SPIRV_TOOLS_DLIB}") + set_target_properties(SPIRV-Tools-opt PROPERTIES + IMPORTED_LOCATION "${SPIRV_TOOLS_OPT_LIB}" + IMPORTED_LOCATION_DEBUG "${SPIRV_TOOLS_OPT_DLIB}") set (GLSLANG_LIBRARIES glslang OGLCompiler OSDependent HLSL SPIRV SPVRemapper) - set (SPIRV_TOOLS_LIBRARIES SPIRV-Tools) + set (SPIRV_TOOLS_LIBRARIES SPIRV-Tools SPIRV-Tools-opt) else () set (GLSLANG_LIBRARIES ${GLSLANG_LIB} ${OGLCompiler_LIB} ${OSDependent_LIB} ${HLSL_LIB} ${SPIRV_LIB} ${SPIRV_REMAPPER_LIB}) - set (SPIRV_TOOLS_LIBRARIES ${SPIRV_TOOLS_LIB}) + set (SPIRV_TOOLS_LIBRARIES ${SPIRV_TOOLS_LIB} ${SPIRV_TOOLS_OPT_LIB}) endif() set (PYTHON_CMD ${PYTHON_EXECUTABLE})