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: cpputest is based cmake instead of ./configure ...
Date Sat, 04 Jul 2015 13:43:49 GMT
Repository: celix
Updated Branches:
  refs/heads/feature/CELIX-237_rsa-ffi 45c5f3d29 -> e8db0577c


CELIX-237: cpputest is based cmake instead of ./configure ...


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

Branch: refs/heads/feature/CELIX-237_rsa-ffi
Commit: e8db0577cc6e52a3c2b23676995ac10434d6fb74
Parents: 45c5f3d
Author: Pepijn Noltes <pepijnnoltes@gmail.com>
Authored: Sat Jul 4 15:48:43 2015 +0200
Committer: Pepijn Noltes <pepijnnoltes@gmail.com>
Committed: Sat Jul 4 15:48:43 2015 +0200

----------------------------------------------------------------------
 .travis.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/e8db0577/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index f7d7804..7c65580 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,10 +11,11 @@ matrix:
 
 before_script:  
     - git clone https://github.com/cpputest/cpputest.git cpputest-build 
-    - cd cpputest-build
-    - ./configure && make
+    - mkdir cpputest-build/build
+    - cd cpputest-build/build
+    - cmake .. && make
     - sudo make install 
-    - cd ..
+    - cd ../..
     - mkdir build install
     - cd build
     - cmake -DENABLE_CODE_COVERAGE=ON -DBUILD_DEPLOYMENT_ADMIN=ON -DBUILD_EXAMPLES=ON -DBUILD_LOG_SERVICE=ON
-DBUILD_LOG_WRITER=ON -DBUILD_REMOTE_SERVICE_ADMIN=ON -DBUILD_RSA_DISCOVERY_CONFIGURED=ON
-DBUILD_RSA_DISCOVERY_ETCD=ON -DBUILD_RSA_DISCOVERY_SHM=ON -DBUILD_RSA_EXAMPLES=ON -DBUILD_RSA_REMOTE_SERVICE_ADMIN_SHM=ON
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_HTTP=ON -DBUILD_REMOTE_SHELL=ON -DBUILD_SHELL=ON -DBUILD_SHELL_TUI=ON
-DCMAKE_INSTALL_PREFIX=../install ..


Mime
View raw message