← Back to branch summary

~charlesk/indicator-session/use-gslice

« back to all changes in this revision

Viewing changes to CMakeLists.txt

  • Committer: Tarmac
  • Author(s): Charles Kerr
  • Date: 2013-08-12 17:36:42 UTC
  • mfrom: (403.1.1 coverage)
  • Revision ID: tarmac-20130812173642-puzbhfctvo3au1aq
Ensure that GCov CFLAGS & LIBS are set before cmake traverses into the src/ directory.

Approved by PS Jenkins bot, Ted Gould.

Show diffs side-by-side

added added

removed removed

Lines of Context:
CMakeLists.txt
49
49
include_directories (${CMAKE_CURRENT_SOURCE_DIR}/src)
50
50
include_directories (${CMAKE_CURRENT_BINARY_DIR}/src)
51
51
 
52
 
 
53
 
add_subdirectory (src)
54
 
add_subdirectory (data)
55
 
add_subdirectory (po)
56
 
 
 
52
# testing & coverage
57
53
if (${enable_tests})
58
54
  set (GTEST_SOURCE_DIR /usr/src/gtest/src)
59
55
  set (GTEST_INCLUDE_DIR ${GTEST_SOURCE_DIR}/..)
60
56
  set (GTEST_LIBS -lpthread)
61
57
  enable_testing ()
62
58
  if (${enable_lcov})
63
 
    include(cmake/GCov.cmake)
 
59
    include(GCov)
64
60
  endif ()
65
 
  add_subdirectory(tests)
 
61
endif ()
 
62
 
 
63
add_subdirectory (src)
 
64
add_subdirectory (data)
 
65
add_subdirectory (po)
 
66
if (${enable_tests})
 
67
  add_subdirectory (tests)
66
68
endif ()