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-446: Removes building osx with gcc from travis config.
Date Mon, 28 May 2018 21:34:23 GMT
Repository: celix
Updated Branches:
  refs/heads/develop 218d265c5 -> dfa9d1c7c


CELIX-446: Removes building osx with gcc from travis config.

This configuration is difficult to reproduce and gcc is covered under linux.


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

Branch: refs/heads/develop
Commit: dfa9d1c7ccdb6a55743a26607e5b90cf1288f4e4
Parents: 218d265
Author: Pepijn Noltes <pepijnnoltes@gmail.com>
Authored: Mon May 28 23:32:55 2018 +0200
Committer: Pepijn Noltes <pepijnnoltes@gmail.com>
Committed: Mon May 28 23:32:55 2018 +0200

----------------------------------------------------------------------
 .travis.yml               | 4 ----
 libs/utils/CMakeLists.txt | 3 +--
 2 files changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/dfa9d1c7/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index f8de607..3347221 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,10 +26,6 @@ matrix:
          compiler: clang
        - os: osx
          osx_image: xcode7.3
-         compiler: gcc
-         env: MACOSX_DEPLOYMENT_TARGET=10.11
-       - os: osx
-         osx_image: xcode7.3
          compiler: clang
          env: MACOSX_DEPLOYMENT_TARGET=10.11
        - os: linux

http://git-wip-us.apache.org/repos/asf/celix/blob/dfa9d1c7/libs/utils/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/libs/utils/CMakeLists.txt b/libs/utils/CMakeLists.txt
index 595eabd..7433446 100644
--- a/libs/utils/CMakeLists.txt
+++ b/libs/utils/CMakeLists.txt
@@ -69,8 +69,7 @@ celix_subproject(UTILS-TESTS "Option to build the utilities library tests"
"OFF"
 if (ENABLE_TESTING AND UTILS-TESTS)
     find_package(CppUTest REQUIRED)
 
-    include_directories(${CUNIT_INCLUDE_DIRS})
-    include_directories(${CPPUTEST_INCLUDE_DIR})
+    include_directories(SYSTEM ${CPPUTEST_INCLUDE_DIR})
     include_directories(include)
     include_directories(src)
 


Mime
View raw message