X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gtests%2FCMakeLists.txt;h=203812d8fbfb7f028c5d30f57e2b6879b48e9de9;hb=683c0f34f00ebf7c38ad6ddcb394a8c837addd2b;hp=74c9809aac492df637599e2c366427547dc96a9e;hpb=84e11a858c550d43afa459c418d3f9daf8a94ab1;p=platform%2Fupstream%2Fglslang.git

diff --git a/gtests/CMakeLists.txt b/gtests/CMakeLists.txt
index 74c9809..203812d 100644
--- a/gtests/CMakeLists.txt
+++ b/gtests/CMakeLists.txt
@@ -47,6 +47,7 @@ if(BUILD_TESTING)
             # Test related source files
             ${CMAKE_CURRENT_SOURCE_DIR}/AST.FromFile.cpp
             ${CMAKE_CURRENT_SOURCE_DIR}/BuiltInResource.FromFile.cpp
+            ${CMAKE_CURRENT_SOURCE_DIR}/Common.cpp
             ${CMAKE_CURRENT_SOURCE_DIR}/Config.FromFile.cpp
             ${CMAKE_CURRENT_SOURCE_DIR}/HexFloat.cpp
             ${CMAKE_CURRENT_SOURCE_DIR}/Hlsl.FromFile.cpp
@@ -68,10 +69,20 @@ if(BUILD_TESTING)
         set_property(TARGET glslangtests PROPERTY FOLDER tests)
         glslang_set_link_args(glslangtests)
         if(ENABLE_GLSLANG_INSTALL)
-            install(TARGETS glslangtests EXPORT glslangtestsTargets
-                    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-			install(EXPORT glslangtestsTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
-        endif(ENABLE_GLSLANG_INSTALL)
+            install(TARGETS glslangtests EXPORT glslang-targets)
+
+            # Backward compatibility
+            file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/glslangtestsTargets.cmake" "
+                message(WARNING \"Using `glslangtestsTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\")
+
+                if (NOT TARGET glslang::glslangtests)
+                    include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\")
+                endif()
+
+                add_library(glslangtests ALIAS glslang::glslangtests)
+            ")
+            install(FILES "${CMAKE_CURRENT_BINARY_DIR}/glslangtestsTargets.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
+        endif()
 
         set(GLSLANG_TEST_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../Test")
         # Supply a default test root directory, so that manual testing
@@ -89,7 +100,7 @@ if(BUILD_TESTING)
             target_include_directories(glslangtests
                 PRIVATE ${spirv-tools_SOURCE_DIR}/include
             )
-        endif(ENABLE_OPT)
+        endif()
 
         set(LIBRARIES
             glslang OSDependent OGLCompiler glslang
@@ -101,7 +112,7 @@ if(BUILD_TESTING)
 
         if(ENABLE_HLSL)
             set(LIBRARIES ${LIBRARIES} HLSL)
-        endif(ENABLE_HLSL)
+        endif()
         target_link_libraries(glslangtests PRIVATE ${LIBRARIES} gmock)
 
         add_test(NAME glslang-gtests