Merge pull request #570 from ComputationalRadiationPhysics/release-0.3.2

Release 0.3.2 to master

Author: BenjaminW3

.travis.yml

@@ -54,31 +54,32 @@ Accelerator Back-ends
 |OpenMP 4.0+ (CPU)|OpenMP 4.0+|Host CPU (multi core)|parallel (undefined)|parallel (preemptive multitasking)|
 | std::thread | std::thread |Host CPU (multi core)|sequential|parallel (preemptive multitasking)|
 | Boost.Fiber | boost::fibers::fiber |Host CPU (single core)|sequential|parallel (cooperative multitasking)|
-|TBB 2.2+ blocks|TBB 2.2+|Host CPU (multi core)|parallel (preemptive multitasking)|sequential (only 1 thread per block)|
-|CUDA 7.0+|CUDA 7.0+|NVIDIA GPUs SM 2.0+|parallel (undefined)|parallel (lock-step within warps)|
+|TBB|TBB 2.2+|Host CPU (multi core)|parallel (preemptive multitasking)|sequential (only 1 thread per block)|
+|CUDA|CUDA 7.0-9.2|NVIDIA GPUs|parallel (undefined)|parallel (lock-step within warps)|
 
 
 Supported Compilers
 -------------------
 
 This library uses C++11 (or newer when available).
 
-|Accelerator Back-end|gcc 4.9.2|gcc 5.4|gcc 6.3/7.2|clang 3.5/3.6|clang 3.7/3.8|clang 3.9|clang 4/5|MSVC 2017.5|
-|---|---|---|---|---|---|---|---|---|
-|Serial|:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|
-|OpenMP 2.0+ blocks|:white_check_mark:|:white_check_mark:|:white_check_mark:|:x:|:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|
-|OpenMP 2.0+ threads|:white_check_mark:|:white_check_mark:|:white_check_mark:|:x:|:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|
-|OpenMP 4.0+ (CPU)|:white_check_mark:|:white_check_mark:|:white_check_mark:|:x:|:x:|:white_check_mark:|:white_check_mark:|:x:|
-| std::thread |:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|
-| Boost.Fiber |:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|
-|TBB 2.2+|:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|
-|CUDA 7.0+|:white_check_mark: (nvcc 7.0+)|:white_check_mark: (nvcc 8.0+)|:x:|:white_check_mark: (nvcc 8.0+)|:white_check_mark: (nvcc 8.0+)|:white_check_mark: (native)|:white_check_mark: (native)|:x:|
+|Accelerator Back-end|gcc 4.9.2|gcc 5.4|gcc 6.3/7.2|clang 3.5/3.6|clang 3.7/3.8|clang 3.9|clang 4|clang 5|MSVC 2017.5|
+|---|---|---|---|---|---|---|---|
+|Serial|:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|
+|OpenMP 2.0+ blocks|:white_check_mark:|:white_check_mark:|:white_check_mark:|:x:|:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|
+|OpenMP 2.0+ threads|:white_check_mark:|:white_check_mark:|:white_check_mark:|:x:|:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|
+|OpenMP 4.0+ (CPU)|:white_check_mark:|:white_check_mark:|:white_check_mark:|:x:|:x:|:white_check_mark:|:white_check_mark:|:white_check_mark:|:x:|
+| std::thread |:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|
+| Boost.Fiber |:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|
+|TBB|:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|:white_check_mark:|
+|CUDA (nvcc)|:white_check_mark: <br/> (CUDA 7.0-9.2)|:white_check_mark: <br/> (CUDA 9.0-9.2)|:white_check_mark: <br/> (CUDA 9.2)|:white_check_mark: <br/> (CUDA 8.0)|:x:|:white_check_mark: <br/> (CUDA 9.1-9.2)|:white_check_mark: <br/> (CUDA 9.1-9.2)|:x:|:x:|
+|CUDA (clang) | - | - | - | - | - | - | :white_check_mark: <br/> (CUDA 8.0)| :white_check_mark: <br/> (CUDA 8.0) | - |
 
 
 Dependencies
 ------------
 
-[Boost](http://boost.org/) 1.62+ is the only mandatory external dependency.
+[Boost](http://boost.org/) 1.62+ is the only mandatory external dependency (for CUDA 9+ Boost >=1.65.1 is required).
 The **alpaka** library itself just requires header-only libraries.
 However some of the accelerator back-end implementations require different boost libraries to be built.
 

README.md

@@ -1,5 +1,5 @@
 #
-# Copyright 2014-2017 Benjamin Worpitz, Erik Zenker
+# Copyright 2014-2018 Benjamin Worpitz, Erik Zenker, Axel Huebl
 #
 # This file is part of alpaka.
 #
@@ -50,10 +50,6 @@ UNSET(_ALPAKA_ADD_EXECUTABLE_FILE)
 UNSET(_ALPAKA_ADD_LIBRRAY_FILE)
 UNSET(_ALPAKA_FILES_HEADER)
 UNSET(_ALPAKA_FILES_OTHER)
-UNSET(_ALPAKA_VERSION_DEFINE)
-UNSET(_ALPAKA_VER_MAJOR)
-UNSET(_ALPAKA_VER_MINOR)
-UNSET(_ALPAKA_VER_PATCH)
 
 #-------------------------------------------------------------------------------
 # Common.
@@ -119,6 +115,18 @@ IF(${ALPAKA_DEBUG} GREATER 1)
     MESSAGE(STATUS "CMAKE_BUILD_TYPE : ${CMAKE_BUILD_TYPE}")
 ENDIF()
 
+#-------------------------------------------------------------------------------
+# Check supported compilers.
+IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.5)
+    MESSAGE(FATAL_ERROR "Clang versions < 3.5 are not supported!")
+    SET(_ALPAKA_FOUND FALSE)
+ENDIF()
+
+IF(ALPAKA_ACC_CPU_B_SEQ_T_FIBERS_ENABLE AND ALPAKA_ACC_GPU_CUDA_ENABLE)
+    MESSAGE(FATAL_ERROR "Fibers and CUDA back-end can not be enabled both at the same time.")
+    SET(_ALPAKA_FOUND FALSE)
+ENDIF()
+
 #-------------------------------------------------------------------------------
 # Find Boost.
 SET(_ALPAKA_BOOST_MIN_VER "1.62.0")
@@ -325,6 +333,20 @@ IF(ALPAKA_ACC_GPU_CUDA_ENABLE)
             OPTION(ALPAKA_CUDA_KEEP_FILES "Keep all intermediate files that are generated during internal compilation steps (folder: nvcc_tmp)" OFF)
 
             IF(ALPAKA_CUDA_COMPILER MATCHES "clang")
+                IF(NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+                    MESSAGE(FATAL_ERROR "Using clang as CUDA compiler is only possible if clang is the host compiler!")
+                ENDIF()
+
+                IF(CMAKE_CXX_COMPILER_VERSION LESS 6.0)
+                    IF(CUDA_VERSION GREATER_EQUAL 9.0)
+                        MESSAGE(FATAL_ERROR "Clang versions lower than 6 do not support CUDA 9 or greater!")
+                    ENDIF()
+                ELSEIF(CMAKE_CXX_COMPILER_VERSION LESS 7.0)
+                    IF(CUDA_VERSION GREATER_EQUAL 9.2)
+                        MESSAGE(FATAL_ERROR "Clang versions lower than 7 do not support CUDA 9.2 or greater!")
+                    ENDIF()
+                ENDIF()
+
                 FOREACH(_CUDA_ARCH_ELEM ${ALPAKA_CUDA_ARCH})
                     LIST(APPEND _ALPAKA_COMPILE_OPTIONS_PUBLIC "--cuda-gpu-arch=sm_${_CUDA_ARCH_ELEM}")
                 ENDFOREACH()
@@ -357,6 +379,46 @@ IF(ALPAKA_ACC_GPU_CUDA_ENABLE)
                 ENDIF()
 
             ELSE()
+                IF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+                    IF(CUDA_VERSION VERSION_EQUAL 8.0)
+                        IF(CMAKE_CXX_COMPILER_VERSION GREATER_EQUAL 5.4)
+                            MESSAGE(FATAL_ERROR "NVCC 8.0 does not support GCC 5.4+. Please use GCC 4.9 - 5.3!")
+                        ENDIF()
+                    ELSEIF((CUDA_VERSION VERSION_EQUAL 9.0) OR (CUDA_VERSION VERSION_EQUAL 9.1))
+                        IF(CMAKE_CXX_COMPILER_VERSION GREATER_EQUAL 6.0)
+                            MESSAGE(FATAL_ERROR "NVCC 9.0 - 9.1 do not support GCC 7+ and fail compiling the std::tuple implementation in GCC 6+. Please use GCC 4.9 - 5.5!")
+                        ENDIF()
+                    ELSEIF(CUDA_VERSION VERSION_EQUAL 9.2)
+                        IF(CMAKE_CXX_COMPILER_VERSION GREATER_EQUAL 8.0)
+                            MESSAGE(FATAL_ERROR "NVCC 9.2 does not support GCC 8+. Please use GCC 4.9, 5, 6 or 7!")
+                        ENDIF()
+                    ENDIF()
+                ELSEIF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+                    IF(CUDA_VERSION VERSION_EQUAL 8.0)
+                        IF(CMAKE_CXX_COMPILER_VERSION GREATER_EQUAL 4.0)
+                            MESSAGE(FATAL_ERROR "NVCC 8.0 does not support clang 4+. Please use NVCC 9.1!")
+                        ENDIF()
+                    ELSEIF(CUDA_VERSION VERSION_EQUAL 9.0)
+                        IF(CMAKE_CXX_COMPILER_VERSION GREATER_EQUAL 4.0)
+                            MESSAGE(FATAL_ERROR "NVCC 9.0 does not support clang 4+. Please use NVCC 9.1!")
+                        ENDIF()
+                    ELSEIF(CUDA_VERSION VERSION_EQUAL 9.1)
+                        IF(CMAKE_CXX_COMPILER_VERSION GREATER_EQUAL 5.0)
+                            MESSAGE(FATAL_ERROR "NVCC 9.1 does not support clang 5+. Please use clang 4!")
+                        ENDIF()
+                    ELSEIF(CUDA_VERSION VERSION_EQUAL 9.2)
+                        IF(CMAKE_CXX_COMPILER_VERSION GREATER_EQUAL 6.0)
+                            MESSAGE(FATAL_ERROR "NVCC 9.2 does not support clang 6+ and fails compiling with clang 5. Please use clang 4!")
+                        ENDIF()
+                    ENDIF()
+                ENDIF()
+
+                # CUDA 9.0 removed the __CUDACC_VER__ macro. Boost versions lower than 1.65.1 still use this macro.
+                IF(CUDA_VERSION VERSION_GREATER_EQUAL 9.0 AND Boost_VERSION VERSION_LESS 1.65.1)
+                    MESSAGE(WARNING "CUDA 9.0 or newer requires boost-1.65.1 or newer!")
+                    SET(_ALPAKA_FOUND FALSE)
+                ENDIF()
+
                 # Clean up the flags. Else, multiple find calls would result in duplicate flags. Furthermore, other modules may have set different settings.
                 SET(CUDA_NVCC_FLAGS)
 
@@ -386,8 +448,6 @@ IF(ALPAKA_ACC_GPU_CUDA_ENABLE)
 
                 IF(NOT MSVC)
                     LIST(APPEND CUDA_NVCC_FLAGS "-std=c++11")
-                ELSE()
-                    LIST(APPEND _ALPAKA_COMPILE_DEFINITIONS_PUBLIC "_HAS_ITERATOR_DEBUGGING=0")
                 ENDIF()
 
                 SET(CUDA_HOST_COMPILER "${CMAKE_CXX_COMPILER}")
@@ -677,10 +737,6 @@ IF(NOT _ALPAKA_FOUND)
     UNSET(_ALPAKA_FILES_HEADER)
     UNSET(_ALPAKA_FILES_OTHER)
     UNSET(_ALPAKA_BOOST_MIN_VER)
-    UNSET(_ALPAKA_VERSION_DEFINE)
-    UNSET(_ALPAKA_VER_MAJOR)
-    UNSET(_ALPAKA_VER_MINOR)
-    UNSET(_ALPAKA_VER_PATCH)
 ELSE()
     # Make internal variables advanced options in the GUI.
     MARK_AS_ADVANCED(
@@ -698,11 +754,7 @@ ELSE()
         _ALPAKA_ADD_LIBRARY_FILE
         _ALPAKA_FILES_HEADER
         _ALPAKA_FILES_OTHER
-        _ALPAKA_BOOST_MIN_VER
-        _ALPAKA_VERSION_DEFINE
-        _ALPAKA_VER_MAJOR
-        _ALPAKA_VER_MINOR
-        _ALPAKA_VER_PATCH)
+        _ALPAKA_BOOST_MIN_VER)
 ENDIF()
 
 ###############################################################################

alpakaConfig.cmake

@@ -121,11 +121,11 @@ before_build:
 
     #-------------------------------------------------------------------------------
     # Clone boost.
-    - cmd: set BOOST_ROOT=C:\projects\boost
+    - cmd: set ALPAKA_CI_BOOST_ROOT_DIR=C:\projects\boost
     - cmd: set ALPAKA_B2_STAGE_DIR=C:\projects\boost_libs
-    - cmd: set BOOST_LIBRARYDIR=%ALPAKA_B2_STAGE_DIR%\lib
-    - cmd: git clone -b %ALPAKA_BOOST_BRANCH% --recursive --single-branch --depth 1 https://github.com/boostorg/boost.git %BOOST_ROOT%
-    - cmd: cd %BOOST_ROOT%
+    - cmd: set ALPAKA_CI_BOOST_LIB_DIR=%ALPAKA_B2_STAGE_DIR%\lib
+    - cmd: git clone -b %ALPAKA_BOOST_BRANCH% --recursive --single-branch --depth 1 https://github.com/boostorg/boost.git %ALPAKA_CI_BOOST_ROOT_DIR%
+    - cmd: cd %ALPAKA_CI_BOOST_ROOT_DIR%
 
     # Prepare building of boost.
     - cmd: call bootstrap.bat
@@ -166,7 +166,7 @@ before_build:
     - cmd: if "%PLATFORM%"=="x64" set ALPAKA_CMAKE_GENERATOR=%ALPAKA_CMAKE_GENERATOR% Win64
     - cmd: mkdir build
     - cmd: cd build
-    - cmd: cmake -G "%ALPAKA_CMAKE_GENERATOR%" -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DTBB_ROOT_DIR="%TBB_ROOT_DIR%" -DBOOST_ROOT="%BOOST_ROOT%" -DBOOST_LIBRARYDIR="%BOOST_LIBRARYDIR%" -DBoost_USE_STATIC_LIBS=ON -DBoost_USE_MULTITHREADED=ON -DBoost_USE_STATIC_RUNTIME=OFF -DALPAKA_DEBUG="%ALPAKA_DEBUG%" -DALPAKA_CI=ON ".."
+    - cmd: cmake -G "%ALPAKA_CMAKE_GENERATOR%" -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DTBB_ROOT_DIR="%TBB_ROOT_DIR%" -DBOOST_ROOT="%ALPAKA_CI_BOOST_ROOT_DIR%" -DBOOST_LIBRARYDIR="%ALPAKA_CI_BOOST_LIB_DIR%" -DBoost_USE_STATIC_LIBS=ON -DBoost_USE_MULTITHREADED=ON -DBoost_USE_STATIC_RUNTIME=OFF -DALPAKA_ACC_CPU_B_SEQ_T_SEQ_ENABLE="%ALPAKA_ACC_CPU_B_SEQ_T_SEQ_ENABLE%" -DALPAKA_ACC_CPU_B_SEQ_T_THREADS_ENABLE="%ALPAKA_ACC_CPU_B_SEQ_T_THREADS_ENABLE%" -DALPAKA_ACC_CPU_B_SEQ_T_FIBERS_ENABLE="%ALPAKA_ACC_CPU_B_SEQ_T_FIBERS_ENABLE%" -DALPAKA_ACC_CPU_B_TBB_T_SEQ_ENABLE="%ALPAKA_ACC_CPU_B_TBB_T_SEQ_ENABLE%" -DALPAKA_ACC_CPU_B_OMP2_T_SEQ_ENABLE="%ALPAKA_ACC_CPU_B_OMP2_T_SEQ_ENABLE%" -DALPAKA_ACC_CPU_B_SEQ_T_OMP2_ENABLE="%ALPAKA_ACC_CPU_B_SEQ_T_OMP2_ENABLE%" -DALPAKA_ACC_CPU_BT_OMP4_ENABLE="%ALPAKA_ACC_CPU_BT_OMP4_ENABLE%" -DALPAKA_ACC_GPU_CUDA_ENABLE="%ALPAKA_ACC_GPU_CUDA_ENABLE%" -DALPAKA_ACC_GPU_CUDA_ONLY_MODE="%ALPAKA_ACC_GPU_CUDA_ONLY_MODE%" -DALPAKA_DEBUG="%ALPAKA_DEBUG%" -DALPAKA_CI=APPVEYOR ".."
 
 build:
     project: C:\projects\alpaka\build\alpakaAll.sln

appveyor.yml

@@ -21,6 +21,12 @@
 #-------------------------------------------------------------------------------
 # Compiler settings.
 #-------------------------------------------------------------------------------
+# By marking the boost headers as system headers, warnings produced within them are ignored.
+# Marking the boost headers as system headers does not work for nvcc (FindCUDA always uses -I)
+TARGET_INCLUDE_DIRECTORIES(
+    "alpaka"
+    SYSTEM
+    INTERFACE ${Boost_INCLUDE_DIRS})
 
 #MSVC
 IF(MSVC)
@@ -41,6 +47,7 @@ IF(MSVC)
         LIST(APPEND ALPAKA_DEV_COMPILE_OPTIONS "/Zc:throwingNew" "/Zc:strictStrings")
     ENDIF()
 ELSE()
+  IF(NOT (ALPAKA_ACC_GPU_CUDA_ENABLE AND NOT ALPAKA_CUDA_COMPILER MATCHES "clang"))
     # GNU
     IF(CMAKE_COMPILER_IS_GNUCXX)
         LIST(APPEND ALPAKA_DEV_COMPILE_OPTIONS "-Wall")
@@ -111,12 +118,16 @@ ELSE()
             LIST(APPEND ALPAKA_DEV_COMPILE_OPTIONS "-Wduplicated-cond")
             LIST(APPEND ALPAKA_DEV_COMPILE_OPTIONS "-Wsubobject-linkage")
         ENDIF()
-        # By marking the boost headers as system headers, warnings produced within them are ignored.
-        FIND_PACKAGE(Boost QUIET)
-        IF(NOT Boost_FOUND)
-            MESSAGE(FATAL_ERROR "Required alpaka dependency Boost.Test could not be found!")
+        IF(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0)
+            # This warning might be useful but it is triggered by comile-time code where it does not make any sense:
+            # E.g. "vec::Vec<dim::DimInt<(TidxDimOut < TidxDimIn) ? TidxDimIn : TidxDimOut>, TElem>" when both values are equal
+            #LIST(APPEND ALPAKA_DEV_COMPILE_OPTIONS "-Wduplicated-branches")
+            LIST(APPEND ALPAKA_DEV_COMPILE_OPTIONS "-Walloc-zero")
+            LIST(APPEND ALPAKA_DEV_COMPILE_OPTIONS "-Walloca")
+        ENDIF()
+        IF(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8.0)
+            LIST(APPEND ALPAKA_DEV_COMPILE_OPTIONS "-Wcast-align=strict")
         ENDIF()
-        INCLUDE_DIRECTORIES(SYSTEM ${Boost_INCLUDE_DIRS})
 
     # Clang or AppleClang
     ELSEIF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
@@ -133,13 +144,12 @@ ELSE()
         # as they are stored as members. Therefore, the padding warning is triggered by the calling code
         # and does not indicate a failure within alpaka.
         LIST(APPEND ALPAKA_DEV_COMPILE_OPTIONS "-Wno-padded")
-        # By marking the boost headers as system headers, warnings produced within them are ignored.
-        LIST(APPEND ALPAKA_DEV_COMPILE_OPTIONS "--system-header-prefix=boost/")
     # ICC
     ELSEIF(${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel")
         LIST(APPEND ALPAKA_DEV_COMPILE_OPTIONS "-Wall")
     # PGI
     ELSEIF(${CMAKE_CXX_COMPILER_ID} STREQUAL "PGI")
         LIST(APPEND ALPAKA_DEV_COMPILE_OPTIONS "-Minform=inform")
     ENDIF()
-ENDIF()
+  ENDIF()
+ENDIF()

cmake/dev.cmake

@@ -53,18 +53,25 @@ SET(_SOURCE_DIR "src/")
 # Add all the source files in all recursive subdirectories and group them accordingly.
 append_recursive_files_add_to_src_group("${_SOURCE_DIR}" "${_SOURCE_DIR}" "cpp" _FILES_SOURCE)
 
+SET(_COMPILE_OPTIONS_PRIVATE ${ALPAKA_DEV_COMPILE_OPTIONS})
+
 IF(MSVC)
     LIST(APPEND _COMPILE_DEFINITIONS_PRIVATE "/wd4996")   # This function or variable may be unsafe. Consider using <safe_version> instead.
 ENDIF()
 
+# NVCC does not incorporate the COMPILE_OPTIONS of a target but only the CMAKE_CXX_FLAGS
+IF(ALPAKA_ACC_GPU_CUDA_ENABLE AND NOT ALPAKA_CUDA_COMPILER MATCHES "clang")
+    STRING(REPLACE ";" " " _COMPILE_OPTIONS_PRIVATE_STRING "${_COMPILE_OPTIONS_PRIVATE}")
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${_COMPILE_OPTIONS_PRIVATE_STRING}")
+ENDIF()
+
 # Always add all files to the target executable build call to add them to the build project.
 ALPAKA_ADD_EXECUTABLE(
     ${_TARGET_NAME}
     ${_FILES_SOURCE})
 TARGET_COMPILE_OPTIONS(
     ${_TARGET_NAME}
-    PRIVATE ${_COMPILE_DEFINITIONS_PRIVATE}
-    PRIVATE ${ALPAKA_DEV_COMPILE_OPTIONS})
+    PRIVATE ${_COMPILE_OPTIONS_PRIVATE})
 TARGET_LINK_LIBRARIES(
     ${_TARGET_NAME}
     PUBLIC "alpaka")

example/bufferCopy/CMakeLists.txt

@@ -53,18 +53,25 @@ SET(_SOURCE_DIR "src/")
 # Add all the source files in all recursive subdirectories and group them accordingly.
 append_recursive_files_add_to_src_group("${_SOURCE_DIR}" "${_SOURCE_DIR}" "cpp" _FILES_SOURCE)
 
+SET(_COMPILE_OPTIONS_PRIVATE ${ALPAKA_DEV_COMPILE_OPTIONS})
+
 IF(MSVC)
     LIST(APPEND _COMPILE_DEFINITIONS_PRIVATE "/wd4996")   # This function or variable may be unsafe. Consider using <safe_version> instead.
 ENDIF()
 
+# NVCC does not incorporate the COMPILE_OPTIONS of a target but only the CMAKE_CXX_FLAGS
+IF(ALPAKA_ACC_GPU_CUDA_ENABLE AND NOT ALPAKA_CUDA_COMPILER MATCHES "clang")
+    STRING(REPLACE ";" " " _COMPILE_OPTIONS_PRIVATE_STRING "${_COMPILE_OPTIONS_PRIVATE}")
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${_COMPILE_OPTIONS_PRIVATE_STRING}")
+ENDIF()
+
 # Always add all files to the target executable build call to add them to the build project.
 ALPAKA_ADD_EXECUTABLE(
     ${_TARGET_NAME}
     ${_FILES_SOURCE})
 TARGET_COMPILE_OPTIONS(
     ${_TARGET_NAME}
-    PRIVATE ${_COMPILE_DEFINITIONS_PRIVATE}
-    PRIVATE ${ALPAKA_DEV_COMPILE_OPTIONS})
+    PRIVATE ${_COMPILE_OPTIONS_PRIVATE})
 TARGET_LINK_LIBRARIES(
     ${_TARGET_NAME}
     PUBLIC "alpaka")

example/helloWorld/CMakeLists.txt

@@ -53,18 +53,25 @@ SET(_SOURCE_DIR "src/")
 # Add all the source files in all recursive subdirectories and group them accordingly.
 append_recursive_files_add_to_src_group("${_SOURCE_DIR}" "${_SOURCE_DIR}" "cpp" _FILES_SOURCE)
 
+SET(_COMPILE_OPTIONS_PRIVATE ${ALPAKA_DEV_COMPILE_OPTIONS})
+
 IF(MSVC)
     LIST(APPEND _COMPILE_DEFINITIONS_PRIVATE "/wd4996")   # This function or variable may be unsafe. Consider using <safe_version> instead.
 ENDIF()
 
+# NVCC does not incorporate the COMPILE_OPTIONS of a target but only the CMAKE_CXX_FLAGS
+IF(ALPAKA_ACC_GPU_CUDA_ENABLE AND NOT ALPAKA_CUDA_COMPILER MATCHES "clang")
+    STRING(REPLACE ";" " " _COMPILE_OPTIONS_PRIVATE_STRING "${_COMPILE_OPTIONS_PRIVATE}")
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${_COMPILE_OPTIONS_PRIVATE_STRING}")
+ENDIF()
+
 # Always add all files to the target executable build call to add them to the build project.
 ALPAKA_ADD_EXECUTABLE(
     ${_TARGET_NAME}
     ${_FILES_SOURCE})
 TARGET_COMPILE_OPTIONS(
     ${_TARGET_NAME}
-    PRIVATE ${_COMPILE_DEFINITIONS_PRIVATE}
-    PRIVATE ${ALPAKA_DEV_COMPILE_OPTIONS})
+    PRIVATE ${_COMPILE_OPTIONS_PRIVATE})
 TARGET_LINK_LIBRARIES(
     ${_TARGET_NAME}
     PUBLIC "alpaka")