From db848fbcd23b2da71664fb99512965d06a80af69 Mon Sep 17 00:00:00 2001 From: jatang Date: Tue, 18 Oct 2022 17:57:43 -0400 Subject: [PATCH] SWDEV-362891 - Incorperate TestLog into ocltst. So it's no longer needed to setup path to find TestLog Change-Id: I0c7ae21e426f2d6d832f707b9d37661bbed67100 [ROCm/clr commit: cf9f9e84b800b0ca2340df4278e3f49198db54ba] --- .../clr/opencl/tests/ocltst/CMakeLists.txt | 1 - .../opencl/tests/ocltst/env/CMakeLists.txt | 3 ++- .../tests/ocltst/{log => env}/oclTestLog.cpp | 0 .../tests/ocltst/{log => env}/oclTestLog.h | 0 .../opencl/tests/ocltst/log/CMakeLists.txt | 21 ------------------- 5 files changed, 2 insertions(+), 23 deletions(-) rename projects/clr/opencl/tests/ocltst/{log => env}/oclTestLog.cpp (100%) rename projects/clr/opencl/tests/ocltst/{log => env}/oclTestLog.h (100%) delete mode 100644 projects/clr/opencl/tests/ocltst/log/CMakeLists.txt diff --git a/projects/clr/opencl/tests/ocltst/CMakeLists.txt b/projects/clr/opencl/tests/ocltst/CMakeLists.txt index db110fde1f..eafbf96946 100644 --- a/projects/clr/opencl/tests/ocltst/CMakeLists.txt +++ b/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) diff --git a/projects/clr/opencl/tests/ocltst/env/CMakeLists.txt b/projects/clr/opencl/tests/ocltst/env/CMakeLists.txt index 29819b7e63..8087c821b0 100644 --- a/projects/clr/opencl/tests/ocltst/env/CMakeLists.txt +++ b/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) diff --git a/projects/clr/opencl/tests/ocltst/log/oclTestLog.cpp b/projects/clr/opencl/tests/ocltst/env/oclTestLog.cpp similarity index 100% rename from projects/clr/opencl/tests/ocltst/log/oclTestLog.cpp rename to projects/clr/opencl/tests/ocltst/env/oclTestLog.cpp diff --git a/projects/clr/opencl/tests/ocltst/log/oclTestLog.h b/projects/clr/opencl/tests/ocltst/env/oclTestLog.h similarity index 100% rename from projects/clr/opencl/tests/ocltst/log/oclTestLog.h rename to projects/clr/opencl/tests/ocltst/env/oclTestLog.h diff --git a/projects/clr/opencl/tests/ocltst/log/CMakeLists.txt b/projects/clr/opencl/tests/ocltst/log/CMakeLists.txt deleted file mode 100644 index 6e359e29ee..0000000000 --- a/projects/clr/opencl/tests/ocltst/log/CMakeLists.txt +++ /dev/null @@ -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) -