← Back to branch summary

~ken-vandine/content-hub/no-change-rebuild

« back to all changes in this revision

Viewing changes to CMakeLists.txt

  • Committer: Bileto Bot
  • Author(s): Ken VanDine
  • Date: 2016-11-28 17:39:34 UTC
  • mfrom: (307.1.1 zesty-gmock-fix)
  • Revision ID: ci-train-bot@canonical.com-20161128173934-qct36b581ob1h3bp
Fix build failure on zesty due to googletest 1.8. Also refactored tests/acceptance-tests/CMakeLists.txt to make adding tests less cumbersome. (LP: #1644062)

Show diffs side-by-side

added added

removed removed

Lines of Context:
CMakeLists.txt
52
52
  SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -ftest-coverage -fprofile-arcs" )
53
53
ENDIF(CMAKE_BUILD_TYPE MATCHES [cC][oO][vV][eE][rR][aA][gG][eE])
54
54
 
 
55
find_package(Gtest REQUIRED)
 
56
include_directories(${GMOCK_INCLUDE_DIR} ${GTEST_INCLUDE_DIR})
55
57
enable_testing()
56
58
 
57
59
set(CMAKE_INCLUDE_CURRENT_DIR ON)