Skip to content

Commit

Permalink
More stylistic fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
MathiasMagnus committed Mar 3, 2017
1 parent 935d673 commit 772edaa
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 8 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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 '<id>' 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
Expand Down
2 changes: 1 addition & 1 deletion tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
2 changes: 1 addition & 1 deletion tests/detail/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
declare_trisycl_test(TARGET small_array)
2 changes: 1 addition & 1 deletion tests/device_selector/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})
endif(${BUILD_OPENCL})
1 change: 0 additions & 1 deletion tests/id/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,3 @@ cjj via e = 3
6 2
1 2 3
5 6")

2 changes: 1 addition & 1 deletion tests/item/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ declare_trisycl_test(TARGET item TEST_REGEX
100 10
2 3
0 0
302")
302")
2 changes: 1 addition & 1 deletion tests/vector/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
declare_trisycl_test(TARGET vecacc)

0 comments on commit 772edaa

Please sign in to comment.