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

build: Various improvements. (#743) (#1006)

Browse Source 
- Remove the build_<platform> scripts that were simply calling cmake in favor of
  using cmake directly
- Move flag  CRT_SECURE_NO_WARNING into a section specifically for visual studio
- Change vendor file selection to just use the file if present
- Add a variable for determining whether to link against pthread
- Delete all lines in CMakeVendor.txt so each implementation can define their own

Change-Id: Ibbd83521ce4d42d09dcbd0b16efa9fbe6cbf785d
This commit is contained in:
Sreelakshmi Haridas Maruthur
2020-10-21 03:02:22 -06:00
committed by GitHub
parent 8d44302935
commit 6adf4ead5c
8 changed files with 35 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test_conformance/CMakeLists.txt
View File

@@ -49,7 +49,9 @@ add_subdirectory( subgroups )
add_subdirectory( workgroups )
add_subdirectory( pipes )
add_subdirectory( device_timer )
add_subdirectory( clcpp )
if(KHRONOS_OFFLINE_COMPILER)
add_subdirectory( clcpp )
endif()
add_subdirectory( spirv_new )
add_subdirectory( spir )

28
test_conformance/compiler/CMakeLists.txt
View File

@@ -17,19 +17,17 @@ set(${MODULE_NAME}_SOURCES
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})
# Copy the required test include directories into the build directory.
if(NOT DEFINED COMPILER_TEST_RESOURCES)
set(COMPILER_TEST_RESOURCES $<TARGET_FILE_DIR:${${MODULE_NAME}_OUT}>)
endif()
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)
COMMENT "Copying compiler test resources..."
TARGET ${${MODULE_NAME}_OUT}
PRE_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_directory
${CLConform_SOURCE_DIR}/test_conformance/compiler/includeTestDirectory
${COMPILER_TEST_RESOURCES}/includeTestDirectory
COMMAND ${CMAKE_COMMAND} -E copy_directory
${CLConform_SOURCE_DIR}/test_conformance/compiler/secondIncludeTestDirectory
${COMPILER_TEST_RESOURCES}/secondIncludeTestDirectory)