From 772edaa544a994813e60401d7964d5134a44e4ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nagy-Egri=20M=C3=A1t=C3=A9=20Ferenc?= Date: Fri, 3 Mar 2017 10:18:20 +0100 Subject: [PATCH] More stylistic fixes. --- CMakeLists.txt | 4 ++-- tests/CMakeLists.txt | 2 +- tests/detail/CMakeLists.txt | 2 +- tests/device_selector/CMakeLists.txt | 2 +- tests/id/CMakeLists.txt | 1 - tests/item/CMakeLists.txt | 2 +- tests/vector/CMakeLists.txt | 2 +- 7 files changed, 7 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 30fde5ebe..8d25f2b00 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,7 +44,7 @@ project(triSYCL C CXX) # The name of the project (forward declare language ) set(BOOST_COMPUTE_INCPATH /usr/include/compute CACHE PATH "Path to Boost.Compute headers (default is: /usr/include/compute)") find_package(Threads REQUIRED) endif(UNIX) - + if(APPLE) # If compiling under OSX find_package(Threads REQUIRED) endif(APPLE) @@ -72,7 +72,7 @@ project(triSYCL C CXX) # The name of the project (forward declare language ) add_compile_options("/wd4127") # warning C4127: conditional expression is constant add_compile_options("/wd4456") # warning C4456: declaration of '' hides previous local declaration endif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") - + # If compiling with g++ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU") add_compile_options("-std=c++1z") # Use latest available C++ standard diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 1df077f57..39e209130 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -66,7 +66,7 @@ function(declare_trisycl_test) add_test(NAME ${TEST_NAME} COMMAND ${TARGET_NAME} WORKING_DIRECTORY ${PROJECT_BINARY_DIR}) - + # If test uses regular expression if(NOT ${declare_trisycl_test_TEST_REGEX} STREQUAL "") set_tests_properties (${TEST_NAME} PROPERTIES PASS_REGULAR_EXPRESSION ${declare_trisycl_test_TEST_REGEX}) diff --git a/tests/detail/CMakeLists.txt b/tests/detail/CMakeLists.txt index b4bd4ee13..b2846a890 100644 --- a/tests/detail/CMakeLists.txt +++ b/tests/detail/CMakeLists.txt @@ -1,4 +1,4 @@ cmake_minimum_required (VERSION 3.0) # The minimum version of CMake necessary to build this project project (detail) # The name of our project -declare_trisycl_test(TARGET small_array) \ No newline at end of file +declare_trisycl_test(TARGET small_array) diff --git a/tests/device_selector/CMakeLists.txt b/tests/device_selector/CMakeLists.txt index 0ece6ba7a..36d1063be 100644 --- a/tests/device_selector/CMakeLists.txt +++ b/tests/device_selector/CMakeLists.txt @@ -5,4 +5,4 @@ declare_trisycl_test(TARGET explicit_selector) declare_trisycl_test(TARGET selector) if(${BUILD_OPENCL}) declare_trisycl_test(TARGET opencl_selector USES_OPENCL) -endif(${BUILD_OPENCL}) \ No newline at end of file +endif(${BUILD_OPENCL}) diff --git a/tests/id/CMakeLists.txt b/tests/id/CMakeLists.txt index f72b8059c..71f3b121c 100644 --- a/tests/id/CMakeLists.txt +++ b/tests/id/CMakeLists.txt @@ -22,4 +22,3 @@ cjj via e = 3 6 2 1 2 3 5 6") - \ No newline at end of file diff --git a/tests/item/CMakeLists.txt b/tests/item/CMakeLists.txt index 0d5756264..89cb94b3b 100644 --- a/tests/item/CMakeLists.txt +++ b/tests/item/CMakeLists.txt @@ -13,4 +13,4 @@ declare_trisycl_test(TARGET item TEST_REGEX 100 10 2 3 0 0 -302") \ No newline at end of file +302") diff --git a/tests/vector/CMakeLists.txt b/tests/vector/CMakeLists.txt index f5c5dc153..81d6bc8c8 100644 --- a/tests/vector/CMakeLists.txt +++ b/tests/vector/CMakeLists.txt @@ -3,4 +3,4 @@ project (vector) # The name of our project declare_trisycl_test(TARGET operators) declare_trisycl_test(TARGET vec) -declare_trisycl_test(TARGET vecacc) \ No newline at end of file +declare_trisycl_test(TARGET vecacc)