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-309: Add missing include_directories statement for Darwin systems. Add pkg-config to travis max os x install (used by FindFFI)
Date Wed, 02 Dec 2015 20:05:18 GMT
Repository: celix
Updated Branches:
  refs/heads/develop 2260c4f43 -> 66bed55cd


CELIX-309: Add missing include_directories statement for Darwin systems. Add pkg-config to
travis max os x install (used by FindFFI)


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

Branch: refs/heads/develop
Commit: 66bed55cd8dc4907377ae3d6bcbecfb85a5c98cc
Parents: 2260c4f
Author: Pepijn Noltes <pepijnnoltes@gmail.com>
Authored: Wed Dec 2 21:05:15 2015 +0100
Committer: Pepijn Noltes <pepijnnoltes@gmail.com>
Committed: Wed Dec 2 21:05:15 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/celix/blob/66bed55c/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 5bcddf7..efa57fa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ compiler:
 
 before_install:
   - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq update && sudo apt-get
install -y uuid-dev libxml2-dev lcov libffi-dev; fi
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update && brew install lcov libffi
&& brew link --force libffi; fi
+  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update && brew install lcov libffi
pkg-config && brew link --force libffi; fi
 
 before_script:
     - wget https://github.com/cpputest/cpputest.github.io/blob/master/releases/cpputest-3.7.1.tar.gz?raw=true
-O /tmp/cpputest.tar.gz

http://git-wip-us.apache.org/repos/asf/celix/blob/66bed55c/dfi/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/dfi/CMakeLists.txt b/dfi/CMakeLists.txt
index b9b5886..8c21938 100644
--- a/dfi/CMakeLists.txt
+++ b/dfi/CMakeLists.txt
@@ -25,11 +25,12 @@ include_directories(
 	    public/include
 )
 
-set(MEMSTREAM_SOURCES "")
-set(MEMSTREAM_INCLUDES "")
+set(MEMSTREAM_SOURCES )
+set(MEMSTREAM_INCLUDES )
 if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") 
 	set(MEMSTREAM_SOURCES private/src/memstream/open_memstream.c private/src/memstream/fmemopen.c)
 	set(MEMSTREAM_INCLUDES public/include/memstream/open_memstream.h public/include/memstream/fmemopen.h)
+    include_directories(public/include/memstream)
 endif()
 
 add_library(celix_dfi SHARED


Mime
View raw message