celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnol...@apache.org
Subject [1/2] celix git commit: CELIX-237: update install path jansson in travis to prevent lib not found
Date Wed, 08 Jul 2015 20:34:18 GMT
Repository: celix
Updated Branches:
  refs/heads/feature/CELIX-237_rsa-ffi eb9ec11ea -> dcbdd97dd


CELIX-237: update install path jansson in travis to prevent lib not found


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

Branch: refs/heads/feature/CELIX-237_rsa-ffi
Commit: 4c625327b8b2e2da03591155ccabea3647c0d730
Parents: eb9ec11
Author: Pepijn Noltes <pepijnnoltes@gmail.com>
Authored: Wed Jul 8 21:34:15 2015 +0200
Committer: Pepijn Noltes <pepijnnoltes@gmail.com>
Committed: Wed Jul 8 21:34:15 2015 +0200

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


http://git-wip-us.apache.org/repos/asf/celix/blob/4c625327/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 9ff65e2..02573ef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,12 +17,12 @@ before_script:
     - cd ..
     - git clone -b 2.7 --single-branch https://github.com/akheron/jansson.git jansson-build
     - cd jansson-build
-    - cmake -DJANSSON_BUILD_SHARED_LIBS=ON . && make
+    - cmake -DJANSSON_BUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr . && make
     - sudo make install
     - cd ..
     - mkdir build install
     - cd build
-    - cmake -DCMAKE_SKIP_BUILD_RPATH=FALSE -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 ..
+    - cmake -DCMAKE_SKIP_BUILD_RPATH=TRUE -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 ..
 
 script: 
     - make all && make test ARGS="-V"


Mime
View raw message