[clfft] 43/107: don't force the usage of libc++ on mac - it is not the default c++ lib on 10.8 and older

Ghislain Vaillant ghisvail-guest at moszumanska.debian.org
Thu Jul 30 18:06:32 UTC 2015


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

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

commit 8a144ebfff38d01474abcd33fc41aad6b7f0c3b9
Author: Gaëtan Lehmann <gaetan.lehmann at gmail.com>
Date:   Mon Mar 23 21:06:03 2015 +0100

    don't force the usage of libc++ on mac - it is not the default c++ lib on 10.8 and older
---
 src/client/CMakeLists.txt | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index 649d856..4521003 100644
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -30,14 +30,8 @@ set( Client.Headers client.h
 
 set( Client.Files ${Client.Source} ${Client.Headers} )
 
-set( DL_LIB "" )
 if( WIN32 )
 	add_definitions( "/D_CONSOLE" )
-elseif( APPLE )
-	set( CMAKE_CXX_FLAGS "-std=c++11 -stdlib=libc++ ${CMAKE_CXX_FLAGS}" )	
-else( )
-	# To use the dlopen() and dlclose() functions, we should link with libdl
-	set( DL_LIB "-ldl" )
 endif( )
 
 # Include standard OpenCL headers
@@ -45,7 +39,7 @@ include_directories( ${Boost_INCLUDE_DIRS} ${OPENCL_INCLUDE_DIRS} ../../../commo
 
 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} )
 
 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



More information about the debian-science-commits mailing list