Merge lp:~gary-wzl77/texts-scope/arch_detect into lp:texts-scope

[Gary.Wang]

detect arch when cmake to make sure click package name correct.

detect arch when cmake to make sure click package name correct.

[Kyle Nitzsche (knitzsche)]

LGTM, thanks Gary.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-07-08 06:30:00 +0000
+++ CMakeLists.txt	2016-07-13 05:20:44 +0000
@@ -1,11 +1,18 @@
-set(VERSION "1.8")
+project(texts CXX)
+cmake_minimum_required(VERSION 2.8.10)
+
+set(VERSION "1.8.2")
+
+# This command figures out the target architecture and puts it into the manifest file
+execute_process(
+  COMMAND dpkg-architecture -qDEB_HOST_ARCH
+  OUTPUT_VARIABLE ARCH
+  OUTPUT_STRIP_TRAILING_WHITESPACE
+)
 
 # Supress qDebug() output
 ADD_DEFINITIONS( -DQT_NO_DEBUG_OUTPUT )
 
-project(texts CXX)
-cmake_minimum_required(VERSION 2.8.10)
-
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -pedantic -Wall -Wextra -s")
 set(UBUNTU_PROJECT_TYPE "Scope" CACHE INTERNAL "Tells QtCreator this is a Scope project")
 
@@ -16,6 +23,7 @@
 set(PKG_PREFIX "com.canonical.scopes")
 set(PKG ${SCOPE_NAME})
 set(APP ${SCOPE_NAME})
+set(FRAMEWORK ubuntu-sdk-15.04.4)
 
 set(SO_NAME ${PKG_PREFIX}.${PKG}_${APP})
 
@@ -69,12 +77,12 @@
 )
 
 configure_file (
-    "manifest.json.in"
-    "manifest.json"
+    "${CMAKE_CURRENT_SOURCE_DIR}/manifest.json.in"
+    "${CMAKE_CURRENT_BINARY_DIR}/manifest.json"
 )
 configure_file (
-    "security.json.in"
-    "${PKG_PREFIX}.${PKG}_${APP}.security.json"
+    "${CMAKE_CURRENT_SOURCE_DIR}/security.json.in"
+    "${CMAKE_CURRENT_BINARY_DIR}/${PKG_PREFIX}.${PKG}_${APP}.security.json"
 )
 
 add_subdirectory(tests)

=== modified file 'manifest.json.in'
--- manifest.json.in	2016-04-13 17:25:50 +0000
+++ manifest.json.in	2016-07-13 05:20:44 +0000
@@ -1,8 +1,8 @@
 {
     "name": "${PKG_PREFIX}.${PKG}",
     "description": "${DISPLAY_DESC}",
-    "framework": "ubuntu-sdk-15.04.4",
-    "architecture": "armhf",
+    "framework": "${FRAMEWORK}",
+    "architecture": "${ARCH}",
     "title": "${DISPLAY_NAME}",
     "hooks": {
         "${APP}": {