You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by za...@apache.org on 2014/12/15 14:33:19 UTC
[30/37] cordova-ubuntu git commit: set UBUNTU_TOUCH flag for device
target
set UBUNTU_TOUCH flag for device target
Project: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/commit/b442e854
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/tree/b442e854
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/diff/b442e854
Branch: refs/heads/master
Commit: b442e854702523c80a9060dbf026d5b58df75b80
Parents: 3b7bbe4
Author: Maxim Ermilov <ma...@canonical.com>
Authored: Mon Dec 1 08:29:47 2014 +0300
Committer: Maxim Ermilov <ma...@canonical.com>
Committed: Mon Dec 1 08:35:32 2014 +0300
----------------------------------------------------------------------
CMakeLists.txt | 4 ++++
bin/templates/project/cordova/lib/build.js | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/blob/b442e854/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 22ba714..bf286fe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,6 +42,10 @@ configure_file (
SET(CMAKE_CXX_FLAGS "-std=c++11 -fno-omit-frame-pointer -Wall -Wextra -DCORDOVA_UBUNTU_VERSION=\\\"${VERSION}\\\" -DCORDOVA_UBUNTU_MAJOR_VERSION=${MAJOR_VERSION} -DCORDOVA_UBUNTU_MINOR_VERSION=${MINOR_VERSION} -I ${PROJECT_SOURCE_DIR}/src")
+if(UBUNTU_TOUCH STREQUAL "1")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUBUNTU_TOUCH")
+endif()
+
if(CMAKE_BUILD_TYPE STREQUAL "Release")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Os")
endif()
http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/blob/b442e854/bin/templates/project/cordova/lib/build.js
----------------------------------------------------------------------
diff --git a/bin/templates/project/cordova/lib/build.js b/bin/templates/project/cordova/lib/build.js
index 403b034..64c7fd4 100644
--- a/bin/templates/project/cordova/lib/build.js
+++ b/bin/templates/project/cordova/lib/build.js
@@ -84,7 +84,7 @@ function buildClickPackage(campoDir, ubuntuDir, nobuild, architecture, framework
buildType = '"Release"';
var cmakeCmd = 'click chroot -a ' + architecture + ' -f ' + framework + ' run cmake ' + campoDir
- + ' -DCMAKE_INSTALL_PREFIX="' + prefixDir + '"' + ' -DCMAKE_BUILD_TYPE=' + buildType;
+ + ' -DCMAKE_INSTALL_PREFIX="' + prefixDir + '"' + ' -DCMAKE_BUILD_TYPE=' + buildType +' -DUBUNTU_TOUCH="1"';
var deps = additionalBuildDependencies(ubuntuDir).join(' ').replace(/ARCH/g, architecture);
if (deps.length)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org