diff options
| author | John Kessenich <johnkslang@users.noreply.github.com> | 2016-09-02 10:57:24 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-02 10:57:24 -0600 |
| commit | 31207bc20a0d8430552e5c5aba537d015ab2e689 (patch) | |
| tree | dad21728417c919e7571d0d2346d035295a42f28 | |
| parent | f2b7f3353b7f3ca633bac3e88ab2e520d258b17f (diff) | |
| parent | 65564a4ad647b0e1b100f4e5a188759d990f015b (diff) | |
| download | glslang-31207bc20a0d8430552e5c5aba537d015ab2e689.tar.gz | |
Merge pull request #495 from steve-lunarg/remapper-tests-2
Remapper: move remapper tests into the glslangtests executable.
| -rw-r--r-- | gtests/CMakeLists.txt | 37 |
1 files changed, 3 insertions, 34 deletions
diff --git a/gtests/CMakeLists.txt b/gtests/CMakeLists.txt index 2b301836..8a91eef3 100644 --- a/gtests/CMakeLists.txt +++ b/gtests/CMakeLists.txt @@ -18,6 +18,8 @@ if (TARGET gmock) ${CMAKE_CURRENT_SOURCE_DIR}/Link.FromFile.cpp ${CMAKE_CURRENT_SOURCE_DIR}/Pp.FromFile.cpp ${CMAKE_CURRENT_SOURCE_DIR}/Spv.FromFile.cpp + # -- Remapper tests + ${CMAKE_CURRENT_SOURCE_DIR}/Remap.FromFile.cpp ) add_executable(glslangtests ${TEST_SOURCES}) @@ -34,40 +36,7 @@ if (TARGET gmock) ${gmock_SOURCE_DIR}/include ${gtest_SOURCE_DIR}/include) target_link_libraries(glslangtests PRIVATE - glslang OSDependent OGLCompiler HLSL glslang + SPVRemapper glslang OSDependent OGLCompiler HLSL glslang SPIRV glslang-default-resource-limits gmock) add_test(NAME glslang-gtests COMMAND glslangtests) - - # -- Remapper tests - set(REMAPPER_TEST_SOURCES - # Framework related source files - ${CMAKE_CURRENT_SOURCE_DIR}/Initializer.h - ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/Settings.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/Settings.h - ${CMAKE_CURRENT_SOURCE_DIR}/TestFixture.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/TestFixture.h - - # Test related source files - ${CMAKE_CURRENT_SOURCE_DIR}/Remap.FromFile.cpp - ) - - add_executable(remappertests ${REMAPPER_TEST_SOURCES}) - set_property(TARGET remappertests PROPERTY FOLDER tests) - glslang_set_link_args(remappertests) - install(TARGETS remappertests - RUNTIME DESTINATION bin) - - target_compile_definitions(remappertests - PRIVATE GLSLANG_TEST_DIRECTORY="${CMAKE_CURRENT_SOURCE_DIR}/../Test") - target_include_directories(remappertests PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR} - ${PROJECT_SOURCE_DIR} - ${gmock_SOURCE_DIR}/include - ${gtest_SOURCE_DIR}/include) - target_link_libraries(remappertests PRIVATE - SPVRemapper - glslang OSDependent OGLCompiler HLSL glslang - SPIRV glslang-default-resource-limits gmock) - add_test(NAME remapper-gtests COMMAND remappertests) endif() |