SWDEV-362891 - Incorperate TestLog into ocltst.

So it's no longer needed to setup path to find TestLog

Change-Id: I0c7ae21e426f2d6d832f707b9d37661bbed67100


[ROCm/clr commit: cf9f9e84b8]

projects/clr/opencl/tests/ocltst/CMakeLists.txt

@@ -6,7 +6,6 @@ find_package(OpenGL)
 find_package(GLEW)
 
 add_subdirectory(module/common)
-add_subdirectory(log)
 add_subdirectory(env)
 if(OPENGL_FOUND AND GLEW_FOUND)
     add_subdirectory(module/gl)

projects/clr/opencl/tests/ocltst/env/CMakeLists.txt

@@ -1,6 +1,7 @@
 add_executable(ocltst)
 
 target_sources(ocltst PRIVATE
+    ${OCLTST_DIR}/env/oclTestLog.cpp
     ${OCLTST_DIR}/env/oclsysinfo.cpp
     ${OCLTST_DIR}/env/ocltst.cpp
     ${OCLTST_DIR}/env/pfm.cpp
@@ -36,7 +37,7 @@ target_include_directories(ocltst
 target_link_libraries(ocltst
     PRIVATE
         OpenCL
-        TestLog)
+        )
 
 INSTALL(TARGETS ocltst DESTINATION tests/ocltst COMPONENT ocltst)
 

projects/clr/opencl/tests/ocltst/log/CMakeLists.txt

@@ -1,21 +0,0 @@
-add_library(TestLog SHARED
-    ${OCLTST_DIR}/log/oclTestLog.cpp)
-
-set_target_properties(TestLog PROPERTIES
-    CXX_STANDARD 14
-    CXX_STANDARD_REQUIRED ON
-    CXX_EXTENSIONS OFF
-    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/tests/ocltst
-    LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/tests/ocltst)
-
-target_compile_definitions(TestLog PRIVATE
-    OCLTST_LOG_BUILD)
-
-target_include_directories(TestLog
-    PRIVATE
-        ${OCLTST_DIR}/include
-    PUBLIC
-        ${OCLTST_DIR}/log)
-
-INSTALL(TARGETS TestLog DESTINATION tests/ocltst COMPONENT ocltst)
-