[arrayfire] 55/79: Merge remote-tracking branch 'upstream/devel' into hotfixes-3.0.1

[Ghislain Vaillant]

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

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

commit bf8d01514a27c6107762ee3016dd3a02b43e0a7b
Merge: bbab9e8 b3ae296
Author: Shehzan Mohammed <shehzan at arrayfire.com>
Date:   Wed Jun 10 14:26:30 2015 -0400

    Merge remote-tracking branch 'upstream/devel' into hotfixes-3.0.1
    
    Conflicts:
    	test/CMakeLists.txt

 CMakeLists.txt                 |  3 +--
 CMakeModules/FindForge.cmake   | 15 +++++------
 CMakeModules/FindGLEWmx.cmake  |  8 ++++--
 CMakeModules/FindGLFW.cmake    | 60 ------------------------------------------
 CMakeModules/build_forge.cmake | 16 ++++-------
 src/api/c/graphics_common.cpp  | 20 +++++++-------
 src/api/c/graphics_common.hpp  |  8 +++---
 test/CMakeLists.txt            |  6 +++--
 test/basic_c.c                 | 17 ++++++++++++
 9 files changed, 53 insertions(+), 100 deletions(-)

diff --cc test/CMakeLists.txt
index ef10932,cd4ca2c..760a943
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@@ -12,11 -12,12 +12,13 @@@ MACRO(CREATE_TESTS BACKEND GTEST_LIBS O
          SET(TEST_NAME ${FNAME}_${BACKEND})
  
          ADD_TEST(Test_${TEST_NAME} ${TEST_NAME})
-         ADD_EXECUTABLE(${TEST_NAME} ${FNAME}.cpp)
 -
+         FILE(GLOB TEST_FILE "${FNAME}.cpp" "${FNAME}.c")
+         ADD_EXECUTABLE(${TEST_NAME} ${TEST_FILE})
 -        TARGET_LINK_LIBRARIES(${TEST_NAME}  af${BACKEND}
 -                      ${THREAD_LIB_FLAG}
 -                      ${GTEST_LIBS} ${OTHER_LIBS})
 +        TARGET_LINK_LIBRARIES(${TEST_NAME}  PRIVATE  af${BACKEND}
 +                                            PRIVATE ${THREAD_LIB_FLAG}
 +                                            PRIVATE ${GTEST_LIBS}
 +                                            PRIVATE ${OTHER_LIBS})
++
          SET_TARGET_PROPERTIES(${TEST_NAME}
                        PROPERTIES
                        COMPILE_FLAGS -DAF_${DEF_NAME}

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