X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=external%2Fglslang%2FCMakeLists.txt;h=f97fe4eb0d08bed255c02c0ddc3e845b59370bac;hb=a24448cdd72ffdbd8f7f571886625b8a53100979;hp=8fab581f2a863162783f076461c40cbd6f90d9ac;hpb=10fb79e74102e3e6357037c43b6759dd105d850d;p=platform%2Fupstream%2FVK-GL-CTS.git diff --git a/external/glslang/CMakeLists.txt b/external/glslang/CMakeLists.txt index 8fab581..f97fe4e 100644 --- a/external/glslang/CMakeLists.txt +++ b/external/glslang/CMakeLists.txt @@ -60,9 +60,7 @@ if (EXISTS ${GLSLANG_ABS_PATH}/glslang/GenericCodeGen/CodeGen.cpp) ${GLSLANG_ABS_PATH}/glslang/MachineIndependent/preprocessor/PpAtom.cpp ${GLSLANG_ABS_PATH}/glslang/MachineIndependent/preprocessor/PpContext.cpp ${GLSLANG_ABS_PATH}/glslang/MachineIndependent/preprocessor/Pp.cpp - ${GLSLANG_ABS_PATH}/glslang/MachineIndependent/preprocessor/PpMemory.cpp ${GLSLANG_ABS_PATH}/glslang/MachineIndependent/preprocessor/PpScanner.cpp - ${GLSLANG_ABS_PATH}/glslang/MachineIndependent/preprocessor/PpSymbols.cpp ${GLSLANG_ABS_PATH}/glslang/MachineIndependent/preprocessor/PpTokens.cpp ${GLSLANG_ABS_PATH}/glslang/GenericCodeGen/CodeGen.cpp @@ -70,6 +68,7 @@ if (EXISTS ${GLSLANG_ABS_PATH}/glslang/GenericCodeGen/CodeGen.cpp) ${GLSLANG_ABS_PATH}/OGLCompilersDLL/InitializeDll.cpp + ${GLSLANG_ABS_PATH}/hlsl/hlslAttributes.cpp ${GLSLANG_ABS_PATH}/hlsl/hlslGrammar.cpp ${GLSLANG_ABS_PATH}/hlsl/hlslOpMap.cpp ${GLSLANG_ABS_PATH}/hlsl/hlslParseables.cpp @@ -98,6 +97,8 @@ if (EXISTS ${GLSLANG_ABS_PATH}/glslang/GenericCodeGen/CodeGen.cpp) add_library(glslang STATIC ${GLSLANG_SRCS}) target_link_libraries(glslang dethread ${ZLIB_LIBRARY}) + add_definitions(-DENABLE_HLSL) + set(GLSLANG_INCLUDE_PATH ${GLSLANG_ABS_PATH} PARENT_SCOPE) set(GLSLANG_LIBRARY glslang PARENT_SCOPE) set(DEQP_HAVE_GLSLANG ON PARENT_SCOPE)