[Cmake-commits] CMake branch, next, updated. v3.8.0-rc2-410-gd0791d8
Kitware Robot
kwrobot at kitware.com
Tue Mar 7 13:35:02 EST 2017
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via d0791d846e7e09fec819acb3660803cd286efa9e (commit)
via 613b3e49a009c4b3c39909c803d2c8b383a8c14f (commit)
from f9867934158a7f067202d89dd683b1e8ed1010f3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d0791d846e7e09fec819acb3660803cd286efa9e
commit d0791d846e7e09fec819acb3660803cd286efa9e
Merge: f986793 613b3e4
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 7 18:28:55 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Mar 7 13:28:58 2017 -0500
Stage topic 'cuda-test-spelling'
Topic-id: 22917
Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/563
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=613b3e49a009c4b3c39909c803d2c8b383a8c14f
commit 613b3e49a009c4b3c39909c803d2c8b383a8c14f
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 7 13:26:01 2017 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 7 13:26:01 2017 -0500
CUDA: Fix spelling of CudaOnly.SeparateCompilation test targets
diff --git a/Tests/CudaOnly/SeparateCompilation/CMakeLists.txt b/Tests/CudaOnly/SeparateCompilation/CMakeLists.txt
index d134b96..420d7a9 100644
--- a/Tests/CudaOnly/SeparateCompilation/CMakeLists.txt
+++ b/Tests/CudaOnly/SeparateCompilation/CMakeLists.txt
@@ -12,22 +12,22 @@ project (CudaOnlySeparateCompilation CUDA)
string(APPEND CMAKE_CUDA_FLAGS " -gencode arch=compute_30,code=compute_30")
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CUDA_STANDARD 11)
-add_library(CUDASerarateLibA STATIC file1.cu file2.cu file3.cu)
+add_library(CUDASeparateLibA STATIC file1.cu file2.cu file3.cu)
#Having file4/file5 in a shared library causes serious problems
#with the nvcc linker and it will generate bad entries that will
#cause a segv when trying to run the executable
#
-add_library(CUDASerarateLibB STATIC file4.cu file5.cu)
-target_link_libraries(CUDASerarateLibB PRIVATE CUDASerarateLibA)
+add_library(CUDASeparateLibB STATIC file4.cu file5.cu)
+target_link_libraries(CUDASeparateLibB PRIVATE CUDASeparateLibA)
add_executable(CudaOnlySeparateCompilation main.cu)
-target_link_libraries(CudaOnlySeparateCompilation PRIVATE CUDASerarateLibB)
+target_link_libraries(CudaOnlySeparateCompilation PRIVATE CUDASeparateLibB)
-set_target_properties( CUDASerarateLibA
- CUDASerarateLibB
+set_target_properties( CUDASeparateLibA
+ CUDASeparateLibB
PROPERTIES CUDA_SEPARABLE_COMPILATION ON)
-set_target_properties( CUDASerarateLibA
- CUDASerarateLibB
+set_target_properties( CUDASeparateLibA
+ CUDASeparateLibB
PROPERTIES POSITION_INDEPENDENT_CODE ON)
-----------------------------------------------------------------------
Summary of changes:
Tests/CudaOnly/SeparateCompilation/CMakeLists.txt | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list