Merge branch 'pr/268' into dev

This commit is contained in:
Magne Sjaastad
2015-01-09 08:05:23 +01:00
11 changed files with 77 additions and 9 deletions

View File

@@ -76,6 +76,10 @@ set( LINK_LIBRARIES
${QT_LIBRARIES}
)
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set(CMAKE_CXX_FLAGS "-DGTEST_USE_OWN_TR1_TUPLE=1")
endif()
add_executable( ${ProjectName}
${CODE_HEADER_FILES}