Merge branch 'master' into nvvm_updates

Samples/7_libNVVM/CMakeLists.txt

@@ -28,7 +28,7 @@ cmake_minimum_required(VERSION 3.10.0)
 
 project(libnvvm-samples)
 enable_testing()
-set_property(GLOBAL PROPERTY ALLOW_DUPLICATE_CUSTOM_TARGETS TRUE)
+#set_property(GLOBAL PROPERTY ALLOW_DUPLICATE_CUSTOM_TARGETS TRUE)
 set(CMAKE_C_STANDARD 11)
 
 # Initialize the CUDA Toolkit search using CUDA_HOME if the user specified it.

Samples/7_libNVVM/device-side-launch/CMakeLists.txt

@@ -30,8 +30,7 @@ set_property(SOURCE dsl.c
              PROPERTY COMPILE_DEFINITIONS LIBCUDADEVRT="${CUDADEVRT_LIB}")
 
 add_executable(dsl dsl.c)
-add_custom_target(clobber)
-add_custom_target(testrun)
+
 add_test(NAME device-side-launch COMMAND dsl
 	WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
 target_link_libraries(dsl ${NVVM_LIB} ${CUDA_LIB})

Samples/7_libNVVM/ptxgen/CMakeLists.txt

@@ -25,8 +25,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 add_executable(ptxgen ptxgen.c)
-add_custom_target(clobber)
-add_custom_target(testrun)
+
 add_test(NAME ptxgenTest
    COMMAND ptxgen "${CMAKE_CURRENT_SOURCE_DIR}/test.ll"
    WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")

Samples/7_libNVVM/simple/CMakeLists.txt

@@ -28,8 +28,7 @@ set(CMAKE_INSTALL_RPATH ${LIBNVVM_HOME})
 set(CMAKE_INCLUDE_CURRENT_DIR YES)
 
 add_executable(simple simple.c)
-add_custom_target(clobber)
-add_custom_target(testrun)
+
 add_test(NAME simple COMMAND simple WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
 
 target_link_libraries(simple ${NVVM_LIB} ${CUDA_LIB})

Samples/7_libNVVM/syscalls/CMakeLists.txt

@@ -24,8 +24,6 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-add_custom_target(clobber)
-add_custom_target(testrun)
 
 add_test(NAME test-syscalls-malloc-free
 	COMMAND "${CMAKE_CURRENT_BINARY_DIR}/ptxgen/ptxgen" "${CMAKE_CURRENT_SOURCE_DIR}/malloc-free.ll"

Samples/7_libNVVM/uvmlite/CMakeLists.txt

@@ -30,9 +30,9 @@ set_property(SOURCE uvmlite.c
              PROPERTY COMPILE_DEFINITIONS LIBCUDADEVRT="${CUDADEVRT_LIB}")
 
 add_executable(uvmlite uvmlite.c)
-add_custom_target(clobber)
-add_custom_target(testrun)
+
 add_test(NAME uvmlite COMMAND uvmlite WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
+
 target_link_libraries(uvmlite ${NVVM_LIB} ${CUDA_LIB})
 
 if (WIN32)