OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Enable in-package substitute of tr1/tuple

Browse Source 
In clang 6.0 the tr1/tuple header is not present, and this cause a
compilation error inside of the gtest framework. However, if we set a
define, it will use its own substitute of tr1/tuple, which is sufficient
for the unit tests.
This commit is contained in:
Roland Kaufmann 2015-01-01 18:10:21 +01:00
parent b019ad260d
commit eac27f149a
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/FileInterface/FileInterface_UnitTests/CMakeLists.txt
View File

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

4
ApplicationCode/ModelVisualization/ModelVisualization_UnitTests/CMakeLists.txt
View File

@ -61,6 +61,10 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
set( EXTERNAL_LINK_LIBRARIES set( EXTERNAL_LINK_LIBRARIES
pthread pthread
) )
ELSEIF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set( CMAKE_CXX_FLAGS
"-DGTEST_USE_OWN_TR1_TUPLE=1"
)
ENDIF() ENDIF()
target_link_libraries( ${ProjectName} ${LINK_LIBRARIES} ${EXTERNAL_LINK_LIBRARIES}) target_link_libraries( ${ProjectName} ${LINK_LIBRARIES} ${EXTERNAL_LINK_LIBRARIES})

2
ApplicationCode/ReservoirDataModel/ReservoirDataModel_UnitTests/CMakeLists.txt
View File

@ -87,6 +87,8 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNO_DEBUG") set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNO_DEBUG")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ")
ELSEIF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set(CMAKE_CXX_FLAGS "-DGTEST_USE_OWN_TR1_TUPLE=1")
ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux") ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")