[arrayfire] 38/61: Merge pull request #1120 from shehzan10/tests-standalone

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch dfsg-clean
in repository arrayfire.

commit 3fdef4a19c914339de7e59884b4f5000668f8d37
Merge: 59faf59 7fcf9bb
Author: Shehzan Mohammed <shehzan at arrayfire.com>
Date:   Tue Dec 1 18:53:35 2015 -0500

    Merge pull request #1120 from shehzan10/tests-standalone
    
    Tests standalone

 examples/CMakeLists.txt                            | 117 ++++++-------
 test/CMakeLists.txt                                | 166 +++++++++++++-----
 test/CMakeModules/FindOpenCL.cmake                 | 190 +++++++++++++++++++++
 .../CMakeModules}/build_gtest.cmake                |  15 +-
 4 files changed, 372 insertions(+), 116 deletions(-)

diff --cc examples/CMakeLists.txt
index 49ce38d,bbadd46..d42f273
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@@ -71,70 -72,62 +72,62 @@@ FILE(GLOB FILES "*/*.cpp"
  ADD_DEFINITIONS("-DASSETS_DIR=\"${ASSETS_DIR}\"")
  
  # Next we build each example using every backend.
- if(${ArrayFire_CPU_FOUND})  # variable defined by FIND(ArrayFire ...)
-   MESSAGE(STATUS "EXAMPLES: CPU backend is ON.")
-   BUILD_ALL("${FILES}" cpu ${ArrayFire_CPU_LIBRARIES} "")
- elseif(TARGET afcpu)        # variable defined by the ArrayFire build tree
-   MESSAGE(STATUS "EXAMPLES: CPU backend is ON.")
-   BUILD_ALL("${FILES}" cpu afcpu "")
- else()
-   MESSAGE(STATUS "EXAMPLES: CPU backend is OFF. afcpu was not found.")
- endif()
+ IF(${ArrayFire_CPU_FOUND})  # variable defined by FIND(ArrayFire ...)
+     MESSAGE(STATUS "EXAMPLES: CPU backend is ON.")
+     BUILD_ALL("${FILES}" cpu ${ArrayFire_CPU_LIBRARIES} "")
+ ELSEIF(TARGET afcpu)        # variable defined by the ArrayFire build tree
+     MESSAGE(STATUS "EXAMPLES: CPU backend is ON.")
+     BUILD_ALL("${FILES}" cpu afcpu "")
+ ELSE()
+     MESSAGE(STATUS "EXAMPLES: CPU backend is OFF. afcpu was not found.")
+ ENDIF()
  
  # Next we build each example using every backend.
- if(${ArrayFire_Unified_FOUND})  # variable defined by FIND(ArrayFire ...)
-   MESSAGE(STATUS "EXAMPLES: UNIFIED backend is ON.")
-   IF(WIN32)
-     BUILD_ALL("${FILES}" unified ${ArrayFire_Unified_LIBRARIES} "")
-   ELSE()
-     BUILD_ALL("${FILES}" unified ${ArrayFire_Unified_LIBRARIES} "dl")
-   ENDIF()
- elseif(TARGET af)        # variable defined by the ArrayFire build tree
-   MESSAGE(STATUS "EXAMPLES: UNIFIED backend is ON.")
-   IF(WIN32)
-       BUILD_ALL("${FILES}" unified af "")
-   ELSE()
-       BUILD_ALL("${FILES}" unified af "dl")
-   ENDIF()
- else()
-   MESSAGE(STATUS "EXAMPLES: UNIFIED backend is OFF. af was not found.")
- endif()
+ IF(${ArrayFire_Unified_FOUND})  # variable defined by FIND(ArrayFire ...)
+     MESSAGE(STATUS "EXAMPLES: UNIFIED backend is ON.")
+     BUILD_ALL("${FILES}" unified ${ArrayFire_Unified_LIBRARIES} "${CMAKE_DL_LIBS}")
+ ELSEIF(TARGET af)        # variable defined by the ArrayFire build tree
+     MESSAGE(STATUS "EXAMPLES: UNIFIED backend is ON.")
+     BUILD_ALL("${FILES}" unified af "${CMAKE_DL_LIBS}")
+ ELSE()
+     MESSAGE(STATUS "EXAMPLES: UNIFIED backend is OFF. af was not found.")
+ ENDIF()
  
- if (${CUDA_FOUND})
-   if(${ArrayFire_CUDA_FOUND})  # variable defined by FIND(ArrayFire ...)
-     FIND_LIBRARY( CUDA_NVVM_LIBRARY
-       NAMES "nvvm"
-       PATH_SUFFIXES "nvvm/lib64" "nvvm/lib"
-       PATHS ${CUDA_TOOLKIT_ROOT_DIR}
-       DOC "CUDA NVVM Library"
-       )
-     MESSAGE(STATUS "EXAMPLES: CUDA backend is ON.")
-     BUILD_ALL("${FILES}" cuda ${ArrayFire_CUDA_LIBRARIES} "${CUDA_CUBLAS_LIBRARIES};${CUDA_LIBRARIES};${CUDA_cusolver_LIBRARY};${CUDA_CUFFT_LIBRARIES};${CUDA_NVVM_LIBRARY};${CUDA_CUDA_LIBRARY}")
-   elseif(TARGET afcuda)        # variable defined by the ArrayFire build tree
-     MESSAGE(STATUS "EXAMPLES: CUDA backend is ON.")
-     BUILD_ALL("${FILES}" cuda afcuda "")
-   else()
-     MESSAGE(STATUS "EXAMPLES: CUDA backend is OFF. afcuda was not found")
-   endif()
- else()
-   MESSAGE(STATUS "EXAMPLES: CUDA backend is OFF. CUDA was not found")
- endif()
+ IF (${CUDA_FOUND})
+     IF(${ArrayFire_CUDA_FOUND})  # variable defined by FIND(ArrayFire ...)
+         FIND_LIBRARY( CUDA_NVVM_LIBRARY
+           NAMES "nvvm"
+           PATH_SUFFIXES "nvvm/lib64" "nvvm/lib"
+           PATHS ${CUDA_TOOLKIT_ROOT_DIR}
+           DOC "CUDA NVVM Library"
+           )
+         MESSAGE(STATUS "EXAMPLES: CUDA backend is ON.")
+         BUILD_ALL("${FILES}" cuda ${ArrayFire_CUDA_LIBRARIES} "${CUDA_CUBLAS_LIBRARIES};${CUDA_LIBRARIES};${CUDA_cusolver_LIBRARY};${CUDA_CUFFT_LIBRARIES};${CUDA_NVVM_LIBRARY};${CUDA_CUDA_LIBRARY}")
+     ELSEIF(TARGET afcuda)        # variable defined by the ArrayFire build tree
+         MESSAGE(STATUS "EXAMPLES: CUDA backend is ON.")
+         BUILD_ALL("${FILES}" cuda afcuda "")
+     ELSE()
+         MESSAGE(STATUS "EXAMPLES: CUDA backend is OFF. afcuda was not found")
+     ENDIF()
+ ELSE()
+     MESSAGE(STATUS "EXAMPLES: CUDA backend is OFF. CUDA was not found")
+ ENDIF()
  
- if (${OpenCL_FOUND})
-   if(${ArrayFire_OpenCL_FOUND})  # variable defined by FIND(ArrayFire ...)
-     MESSAGE(STATUS "EXAMPLES: OPENCL backend is ON.")
-     BUILD_ALL("${FILES}" opencl ${ArrayFire_OpenCL_LIBRARIES} "${OpenCL_LIBRARIES}")
-   elseif(TARGET afopencl)        # variable defined by the ArrayFire build tree
-     MESSAGE(STATUS "EXAMPLES: OPENCL backend is ON.")
-     BUILD_ALL("${FILES}" opencl afopencl ${OpenCL_LIBRARIES})
-   else()
-     MESSAGE(STATUS "EXAMPLES: OPENCL backend is OFF. afopencl was not found")
-   endif()
- else()
-   MESSAGE(STATUS "EXAMPLES: OPENCL backend is OFF. OPENCL was not found")
- endif()
+ IF (${OpenCL_FOUND})
+     IF(${ArrayFire_OpenCL_FOUND})  # variable defined by FIND(ArrayFire ...)
+         MESSAGE(STATUS "EXAMPLES: OpenCL backend is ON.")
+         BUILD_ALL("${FILES}" opencl ${ArrayFire_OpenCL_LIBRARIES} "${OpenCL_LIBRARIES}")
+     ELSEIF(TARGET afopencl)        # variable defined by the ArrayFire build tree
+         MESSAGE(STATUS "EXAMPLES: OpenCL backend is ON.")
+         BUILD_ALL("${FILES}" opencl afopencl "${OpenCL_LIBRARIES}")
+     ELSE()
+         MESSAGE(STATUS "EXAMPLES: OpenCL backend is OFF. afopencl was not found")
+     ENDIF()
+ ELSE()
+     MESSAGE(STATUS "EXAMPLES: OpenCL backend is OFF. OpenCL was not found")
+ ENDIF()
  
 -INSTALL(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
 +INSTALL(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/"
      DESTINATION "${AF_INSTALL_EXAMPLE_DIR}"
      COMPONENT examples)
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/arrayfire.git