[clfft] 90/107: Merge branch 'mac-libc++' of https://github.com/glehmann/clFFT into glehmann-mac-libc++

[Ghislain Vaillant]

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

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

commit 1a1be108de836700d02ea2aa1fe333ad5bab5aa2
Merge: 8b6c24b 8a144eb
Author: Kent Knox <kent.knox at amd>
Date:   Thu Jun 4 11:24:56 2015 -0500

    Merge branch 'mac-libc++' of https://github.com/glehmann/clFFT into glehmann-mac-libc++

 src/client/CMakeLists.txt | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --cc src/client/CMakeLists.txt
index 0164f7f,4521003..c9508f7
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@@ -30,14 -30,8 +30,12 @@@ set( Client.Headers client.
  
  set( Client.Files ${Client.Source} ${Client.Headers} )
  
- set( DL_LIB "" )
++set( RT_LIB "" )
  if( WIN32 )
  	add_definitions( "/D_CONSOLE" )
- elseif( APPLE )
- 	set( CMAKE_CXX_FLAGS "-std=c++11 -stdlib=libc++ ${CMAKE_CXX_FLAGS}" )	
- else( )
++elseif( NOT APPLE )
 +	# To use the dlopen() and dlclose() functions, we should link with libdl
- 	set( DL_LIB "-ldl -lrt" )
++	set( RT_LIB "-lrt" )
  endif( )
  
  # Include standard OpenCL headers
@@@ -45,7 -39,7 +43,7 @@@ include_directories( ${Boost_INCLUDE_DI
  
  add_executable( clFFT-client ${Client.Files} )
  
- target_link_libraries( clFFT-client clFFT ${Boost_LIBRARIES} ${OPENCL_LIBRARIES} ${DL_LIB} )
 -target_link_libraries( clFFT-client clFFT ${Boost_LIBRARIES} ${OPENCL_LIBRARIES} ${CMAKE_DL_LIBS} )
++target_link_libraries( clFFT-client clFFT ${Boost_LIBRARIES} ${OPENCL_LIBRARIES} ${CMAKE_DL_LIBS} ${RT_LIB} )
  
  set_target_properties( clFFT-client PROPERTIES VERSION ${CLFFT_VERSION} )
  set_target_properties( clFFT-client PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/staging" )

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