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: Update travis config and libffi location
Date Sat, 04 Jul 2015 11:36:28 GMT
Repository: celix
Updated Branches:
  refs/heads/feature/CELIX-237_rsa-ffi 549997b88 -> 8aec1e4ed


CELIX-237: Update travis config and libffi location


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

Branch: refs/heads/feature/CELIX-237_rsa-ffi
Commit: 8aec1e4ed2bb7685b315d8ff8f2df86b6f6d1208
Parents: 549997b
Author: Pepijn Noltes <pepijnnoltes@gmail.com>
Authored: Sat Jul 4 13:43:58 2015 +0200
Committer: Pepijn Noltes <pepijnnoltes@gmail.com>
Committed: Sat Jul 4 13:43:58 2015 +0200

----------------------------------------------------------------------
 .travis.yml                                               | 2 +-
 remote_services/dynamic_function_interface/CMakeLists.txt | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/8aec1e4e/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index d66498f..0b43241 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ language: c
 
 before_install:
   - sudo apt-get update -qq
-  - sudo apt-get install -y uuid-dev libjansson-dev libxml2-dev
+  - sudo apt-get install -y uuid-dev libjansson-dev libxml2-dev cpputest libffi-dev
 
 matrix:
   include:

http://git-wip-us.apache.org/repos/asf/celix/blob/8aec1e4e/remote_services/dynamic_function_interface/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/remote_services/dynamic_function_interface/CMakeLists.txt b/remote_services/dynamic_function_interface/CMakeLists.txt
index bf3a628..7825e07 100644
--- a/remote_services/dynamic_function_interface/CMakeLists.txt
+++ b/remote_services/dynamic_function_interface/CMakeLists.txt
@@ -5,8 +5,9 @@ find_package(Jansson REQUIRED)
 find_package(CppUTest REQUIRED)
 
 #set(FFI_LIB /lib64/libffi.so) #TODO add findPackag for lib ffi
-set(FFI_LIB /opt/local/lib/libffi.dylib) 
-set(FFI_INCLUDE /opt/local/lib/libffi-3.2.1/include)
+#set(FFI_LIB /opt/local/lib/libffi.dylib) 
+#set(FFI_INCLUDE /opt/local/lib/libffi-3.2.1/include)
+set(FFI_LIB /lib/libffi.so)
 
 include_directories( 
     ${CPPUTEST_INCLUDE_DIR}


Mime
View raw message