[clfft] 26/109: Everything builds with xcode 5.0 except for the googletest executable

[Jérôme Kieffer]

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

kieffer-guest pushed a commit to branch debian
in repository clfft.

commit 24ce704491c0e1960a6e82bc820e8536deb101cf
Author: Kent Knox <kent.knox at amd>
Date:   Sun Oct 13 16:57:01 2013 -0500

    Everything builds with xcode 5.0 except for the googletest executable
---
 src/CMakeLists.txt           | 4 ++--
 src/statTimer/CMakeLists.txt | 2 +-
 src/tests/CMakeLists.txt     | 4 ++++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1a76989..54ade57 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -210,8 +210,8 @@ elseif( CMAKE_COMPILER_IS_GNUCXX )
         set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage")
         set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --coverage")
     endif()
-else( )
-	message( FATAL_ERROR "Compiler not supported or not detected" )
+# elseif( APPLE )
+#	set( CMAKE_CXX_FLAGS "-std=c++11 -stdlib=libc++ ${CMAKE_CXX_FLAGS}" )
 endif( )
 
 # If UNICODE is defined for microsoft compilers, pass extra definitions
diff --git a/src/statTimer/CMakeLists.txt b/src/statTimer/CMakeLists.txt
index 6de01a9..4976b30 100644
--- a/src/statTimer/CMakeLists.txt
+++ b/src/statTimer/CMakeLists.txt
@@ -69,7 +69,7 @@ set_target_properties( StatTimer PROPERTIES SOVERSION ${CLFFT_SOVERSION} )
 set_target_properties( StatTimer PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/staging" )
 target_link_libraries( StatTimer ${OPENCL_LIBRARIES} )
 
-if( UNIX )
+if( UNIX AND NOT APPLE )
 	# This library dependency is brought in by the high precision timer available in linux
 	target_link_libraries( StatTimer -lrt )
 endif( )
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 868f402..cf6ab6e 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -57,6 +57,10 @@ if( MINGW )
 elseif( CMAKE_COMPILER_IS_GNUCXX )
 	set( CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS}" )
 	set( LD_PTHREAD "-lpthread" )
+elseif( APPLE )
+	set( CMAKE_CXX_FLAGS "-std=c++11 -stdlib=libc++ ${CMAKE_CXX_FLAGS}" )
+#	set( CMAKE_CXX_FLAGS "-stdlib=libc++ ${CMAKE_CXX_FLAGS}" )
+	add_definitions( -DGTEST_USE_OWN_TR1_TUPLE )
 endif( )
 
 # Include standard OpenCL headers

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