Merge pull request #24 from kknox/macosx

Macosx

Author: Timmy

src/CMakeLists.txt

@@ -180,7 +180,7 @@ get_filename_component( C_COMPILER_NAME ${CMAKE_C_COMPILER} NAME_WE )
 # message( "CMAKE_C_COMPILER: " ${CMAKE_C_COMPILER} )
 
 # Set common compile and link options
-if( C_COMPILER_NAME STREQUAL "cl" )
+if( MSVC )
 	# Following options for nMake
 	message( STATUS "Detected MSVS Ver: " ${MSVC_VERSION} )
 
@@ -210,8 +210,6 @@ 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" )
 endif( )
 
 # If UNICODE is defined for microsoft compilers, pass extra definitions

src/client/CMakeLists.txt

@@ -33,10 +33,12 @@ set( Client.Files ${Client.Source} ${Client.Headers} )
 set( DL_LIB "" )
 if( WIN32 )
 	add_definitions( "/D_CONSOLE" )
-else()
+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()
+endif( )
 
 # Include standard OpenCL headers
 include_directories( ${Boost_INCLUDE_DIRS} ${OPENCL_INCLUDE_DIRS} ../../../common ${PROJECT_BINARY_DIR}/include ../include )

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( )

src/tests/CMakeLists.txt

@@ -57,6 +57,9 @@ 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}" )
+	add_definitions( -DGTEST_USE_OWN_TR1_TUPLE )
 endif( )
 
 # Include standard OpenCL headers