Skip to content

G
glslang
Unverified Commit 7d623e1c by dan sinclair Committed by GitHub
Options

Indenting

parent 0f98465f
Showing with 24 additions and 24 deletions
CMakeLists.txt
...@@ -182,31 +182,31 @@ endif(ENABLE_HLSL) ...@@ -182,31 +182,31 @@ endif(ENABLE_HLSL)
add_subdirectory(gtests) add_subdirectory(gtests)
if(BUILD_TESTING) if(BUILD_TESTING)
# glslang-testsuite runs a bash script on Windows. # glslang-testsuite runs a bash script on Windows.
# Make sure to use '-o igncr' flag to ignore carriage returns (\r). # Make sure to use '-o igncr' flag to ignore carriage returns (\r).
set(IGNORE_CR_FLAG "") set(IGNORE_CR_FLAG "")
if(WIN32) if(WIN32)
set(IGNORE_CR_FLAG -o igncr) set(IGNORE_CR_FLAG -o igncr)
endif() endif()
add_test(NAME glslang-testsuite add_test(NAME glslang-testsuite
COMMAND bash ${IGNORE_CR_FLAG} runtests COMMAND bash ${IGNORE_CR_FLAG} runtests
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Test/) WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Test/)
if (CMAKE_CONFIGURATION_TYPES) if (CMAKE_CONFIGURATION_TYPES)
set_property(TEST glslang-testsuite APPEND PROPERTY set_property(TEST glslang-testsuite APPEND PROPERTY
ENVIRONMENT GLSLANG_PATH=${CMAKE_CURRENT_BINARY_DIR}/StandAlone/$<CONFIGURATION>/glslangValidator) ENVIRONMENT GLSLANG_PATH=${CMAKE_CURRENT_BINARY_DIR}/StandAlone/$<CONFIGURATION>/glslangValidator)
set_property(TEST glslang-testsuite APPEND PROPERTY set_property(TEST glslang-testsuite APPEND PROPERTY
ENVIRONMENT SPIRV_REMAP_PATH=${CMAKE_CURRENT_BINARY_DIR}/StandAlone/$<CONFIGURATION>/spirv-remap) ENVIRONMENT SPIRV_REMAP_PATH=${CMAKE_CURRENT_BINARY_DIR}/StandAlone/$<CONFIGURATION>/spirv-remap)
set_property(TEST glslang-testsuite APPEND PROPERTY set_property(TEST glslang-testsuite APPEND PROPERTY
ENVIRONMENT GLSLANG_TEST_RESULTS=${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>/localResults) ENVIRONMENT GLSLANG_TEST_RESULTS=${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>/localResults)
else(CMAKE_CONFIGURATION_TYPES) else(CMAKE_CONFIGURATION_TYPES)
set_property(TEST glslang-testsuite APPEND PROPERTY set_property(TEST glslang-testsuite APPEND PROPERTY
ENVIRONMENT GLSLANG_PATH=${CMAKE_CURRENT_BINARY_DIR}/StandAlone/glslangValidator) ENVIRONMENT GLSLANG_PATH=${CMAKE_CURRENT_BINARY_DIR}/StandAlone/glslangValidator)
set_property(TEST glslang-testsuite APPEND PROPERTY set_property(TEST glslang-testsuite APPEND PROPERTY
ENVIRONMENT SPIRV_REMAP_PATH=${CMAKE_CURRENT_BINARY_DIR}/StandAlone/spirv-remap) ENVIRONMENT SPIRV_REMAP_PATH=${CMAKE_CURRENT_BINARY_DIR}/StandAlone/spirv-remap)
set_property(TEST glslang-testsuite APPEND PROPERTY set_property(TEST glslang-testsuite APPEND PROPERTY
ENVIRONMENT GLSLANG_TEST_RESULTS=${CMAKE_CURRENT_BINARY_DIR}/localResults) ENVIRONMENT GLSLANG_TEST_RESULTS=${CMAKE_CURRENT_BINARY_DIR}/localResults)
endif(CMAKE_CONFIGURATION_TYPES) endif(CMAKE_CONFIGURATION_TYPES)
endif(BUILD_TESTING) endif(BUILD_TESTING)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment