Merge pull request #495 from steve-lunarg/remapper-tests-2

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()