celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnol...@apache.org
Subject celix git commit: CELIX-237: Changed jansson build from ./configure and make to cmake
Date Sat, 04 Jul 2015 14:57:09 GMT
Repository: celix
Updated Branches:
  refs/heads/feature/CELIX-237_rsa-ffi 5f62e97e6 -> 6eaf4f4e8


CELIX-237: Changed jansson build from ./configure and make to cmake


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/6eaf4f4e
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/6eaf4f4e
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/6eaf4f4e

Branch: refs/heads/feature/CELIX-237_rsa-ffi
Commit: 6eaf4f4e804c91ea745864cd2b27d1e4eb03ea6e
Parents: 5f62e97
Author: Pepijn Noltes <pepijnnoltes@gmail.com>
Authored: Sat Jul 4 17:02:40 2015 +0200
Committer: Pepijn Noltes <pepijnnoltes@gmail.com>
Committed: Sat Jul 4 17:02:40 2015 +0200

----------------------------------------------------------------------
 .travis.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/6eaf4f4e/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index f4e93f9..f3c5113 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,14 +11,13 @@ matrix:
 
 before_script:  
     - git clone https://github.com/cpputest/cpputest.git cpputest-build 
-    - mkdir -p cpputest-build/build
-    - cd cpputest-build/build
-    - cmake .. && make
+    - cd cpputest-build
+    - cmake . && make
     - sudo make install 
-    - cd ../..
+    - cd ..
     - git clone https://github.com/akheron/jansson.git jansson-build
     - cd jansson-build
-    - ./configure && make
+    - cmake . && make
     - sudo make install
     - cd ..
     - mkdir build install


Mime
View raw message