Merge pull request #690 from ligfx/proper_dependencies

CMake: add target_link_libraries internally
This commit is contained in:
John Kessenich 2017-01-26 15:13:27 -07:00 committed by GitHub
commit c0904c15c2
3 changed files with 5 additions and 5 deletions

View File

@ -41,6 +41,7 @@ endif(ENABLE_NV_EXTENSIONS)
add_library(SPIRV STATIC ${SOURCES} ${HEADERS})
set_property(TARGET SPIRV PROPERTY FOLDER glslang)
target_link_libraries(SPIRV glslang)
add_library(SPVRemapper STATIC ${SPVREMAP_SOURCES} ${SPVREMAP_HEADERS})
set_property(TARGET SPVRemapper PROPERTY FOLDER glslang)

View File

@ -20,15 +20,10 @@ glslang_set_link_args(spirv-remap)
set(LIBRARIES
glslang
OGLCompiler
OSDependent
SPIRV
SPVRemapper
glslang-default-resource-limits)
if(ENABLE_HLSL)
set(LIBRARIES ${LIBRARIES} HLSL)
endif(ENABLE_HLSL)
if(WIN32)
set(LIBRARIES ${LIBRARIES} psapi)

View File

@ -82,6 +82,10 @@ set(HEADERS
add_library(glslang STATIC ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} ${HEADERS})
set_property(TARGET glslang PROPERTY FOLDER glslang)
target_link_libraries(glslang OGLCompiler OSDependent)
if(ENABLE_HLSL)
target_link_libraries(glslang HLSL)
endif()
if(WIN32)
source_group("Public" REGULAR_EXPRESSION "Public/*")