~gary-wzl77/scope-aggregator/force_display_results

« back to all changes in this revision

Viewing changes to CMakeLists.txt

  • Committer: Kyle Nitzsche
  • Date: 2015-08-04 19:12:04 UTC
  • mfrom: (140.2.6 hints-network)
  • Revision ID: kyle.nitzsche@canonical.com-20150804191204-2og2jrvld165tdhr
Tags: 1.5.24
merge branch that fixes two bugs:
1481436: read intenet connectivity reliably
1476367: allow agg scopes to declare they want to display no network
and or no location messages even when they do not use hints (use of hints
for these messages is still supported).

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
set(VERSION "1.5.23")
 
1
set(VERSION "1.5.24")
2
2
 
3
3
# Supress qDebug() output
4
4
ADD_DEFINITIONS( -DQT_NO_DEBUG_OUTPUT )
63
63
 
64
64
# for i18n
65
65
set(GETTEXT_DOMAIN ${SCOPE_NAME})
 
66
set(GETTEXT_DOMAIN_LIB "scope-aggregator-common")
66
67
 
67
68
#find_package(PkgConfig REQUIRED)
68
69
include(FindPkgConfig)