Skip to content

Commit

Permalink
Use gmock 1.6 on Windows. Trying to fix builds. refs #7284
Browse files Browse the repository at this point in the history
  • Loading branch information
stuartcampbell committed Feb 26, 2014
1 parent 7ac110f commit d629e20
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions Code/Mantid/Build/CMake/FindGMock.cmake
Expand Up @@ -13,6 +13,12 @@ if( ${CMAKE_CXX_COMPILER} MATCHES "icpc.*$" )
set (GMOCK_VERSION "1.6.0")
ENDIF()

# Nasty hack for Windows to get build working!
IF (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
set (GMOCK_VERSION "1.6.0")
ENDIF()


find_path ( GMOCK_INCLUDE_DIR gmock/gmock.h
PATHS ${PROJECT_SOURCE_DIR}/TestingTools/gmock-${GMOCK_VERSION}/include
${PROJECT_SOURCE_DIR}/../TestingTools/gmock-${GMOCK_VERSION}/include
Expand Down

0 comments on commit d629e20

Please sign in to comment.