ahmed/OpenCL-CTS
1
0
Fork 0
mirror of https://github.com/KhronosGroup/OpenCL-CTS.git synced 2026-03-19 06:09:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Arbitrary output directory support for compiler test build copies (#848) (#851)

Browse Source 
* Move copy from top level down to test_compile module as post-build copy
* Fix windows VS2015 build break
This commit is contained in:
Jim Lewis
2020-07-24 08:30:24 -05:00
committed by GitHub
parent 9c0edebd3c
commit 0ee260b036
3 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
CMakeLists.txt
View File

@@ -232,17 +232,4 @@ else(WIN32)
add_custom_target( COPY_FILES${CONFORMANCE_SUFFIX} ) add_custom_target( COPY_FILES${CONFORMANCE_SUFFIX} )
endif(WIN32) endif(WIN32)
# Copy required CL include directories into the build directory
# as required for the compiler testing.
# ... For running the compiler test on the command line.
file(COPY "${CLConform_SOURCE_DIR}/test_conformance/compiler/includeTestDirectory" DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test_conformance/compiler)
file(COPY "${CLConform_SOURCE_DIR}/test_conformance/compiler/secondIncludeTestDirectory" DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test_conformance/compiler)
# ... For running the compiler test with VisualStudio.
if(MSVC)
file(COPY "${CLConform_SOURCE_DIR}/test_conformance/compiler/includeTestDirectory" DESTINATION "${CLConform_SOURCE_DIR}/build/test_conformance/compiler")
file(COPY "${CLConform_SOURCE_DIR}/test_conformance/compiler/secondIncludeTestDirectory" DESTINATION "${CLConform_SOURCE_DIR}/build/test_conformance/compiler")
endif(MSVC)
set_property(TARGET COPY_FILES${CONFORMANCE_SUFFIX} PROPERTY FOLDER "CONFORMANCE${CONFORMANCE_SUFFIX}") set_property(TARGET COPY_FILES${CONFORMANCE_SUFFIX} PROPERTY FOLDER "CONFORMANCE${CONFORMANCE_SUFFIX}")

17
test_conformance/compiler/CMakeLists.txt
View File

@@ -13,3 +13,20 @@ set(${MODULE_NAME}_SOURCES
) )
include(../CMakeCommon.txt) include(../CMakeCommon.txt)
# Copy required CL include directories into the binary directory
set(COMPILER_SOURCE_DIR ${CLConform_SOURCE_DIR}/test_conformance/compiler)
set(COMPILER_TARGET ${${MODULE_NAME}_OUT})
add_custom_command(
TARGET ${COMPILER_TARGET}
COMMAND ${CMAKE_COMMAND} -E copy_directory
"${COMPILER_SOURCE_DIR}/includeTestDirectory"
$<TARGET_FILE_DIR:${COMPILER_TARGET}>/includeTestDirectory)
add_custom_command(
TARGET ${COMPILER_TARGET}
COMMAND ${CMAKE_COMMAND} -E copy_directory
"${COMPILER_SOURCE_DIR}/secondIncludeTestDirectory"
$<TARGET_FILE_DIR:${COMPILER_TARGET}>/secondIncludeTestDirectory)

1
test_conformance/computeinfo/extended_versioning.cpp
View File

@@ -17,6 +17,7 @@
#include <vector> #include <vector>
#include <set> #include <set>
#include <iterator>
#include <algorithm> #include <algorithm>
#include <cstring> #include <cstring>
#include "harness/testHarness.h" #include "harness/testHarness.h"