← Back to branch summary

~knitzsche/savilerow/location_tester

« back to all changes in this revision

Viewing changes to CMakeLists.txt

  • Committer: Kyle Nitzsche
  • Date: 2015-04-30 19:03:06 UTC
  • Revision ID: kyle.nitzsche@canonical.com-20150430190306-jvf6699qgj6zygli
to set APIKEY and SECRETKEY vars, CMakeLists.txt now uses include(assets), where assets file is a cmake file that sets the two vars. This assets file is bzr ignored to prevent key/secrete leakage

Show diffs side-by-side

added added

removed removed

Lines of Context:
CMakeLists.txt
1
1
set(VERSION "1.1.2")
2
2
 
3
3
# Supress qDebug() output
4
 
ADD_DEFINITIONS( -DQT_NO_DEBUG_OUTPUT )
 
4
#ADD_DEFINITIONS( -DQT_NO_DEBUG_OUTPUT )
5
5
 
6
6
project(holidays CXX)
7
7
cmake_minimum_required(VERSION 2.8.12)
12
12
set(SCOPE_NAME ${CMAKE_PROJECT_NAME})
13
13
set(SCOPE_INSTALLDIR /${CMAKE_PROJECT_NAME})
14
14
 
15
 
set (APIKEY_CMAKE $apikey )
16
 
set (SECRETKEY_CMAKE $secretkey )
 
15
include(assets)
 
16
#NOTE: 'assets' file is a cmake file that must set the following two vars:
 
17
message("APIKEY " ${APIKEY})
 
18
message("SECRETKEY " ${SECRETKEY})
17
19
 
18
20
#used generally, for example in manifest
19
21
set(PKG_PREFIX "com.canonical.scopes")