Skip to content
This repository has been archived by the owner on Jul 19, 2018. It is now read-only.

Commit

Permalink
cmake noise
Browse files Browse the repository at this point in the history
  • Loading branch information
chrisforbes committed Apr 12, 2017
1 parent e53a00d commit adf3b72
Showing 1 changed file with 11 additions and 2 deletions.
13 changes: 11 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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} )
Expand All @@ -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}"
Expand All @@ -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})
Expand Down

0 comments on commit adf3b72

Please sign in to comment.