Repository: celix
Updated Branches:
  refs/heads/develop a89429917 -> 6a4da96e2


CELIX-279: Update support for cmake 3.3. Now the build will only fail if cmake 
version is 3.3 and the generator is makefiles. e.g. ninja as generator works 
fine.

Update the cmakelists of da. It contains an unneeded UUID lib.
Update travis files. Added extra command needed for brew to link libffi


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

Branch: refs/heads/develop
Commit: 6a4da96e2cb6140afe93e82d6e5682dccebd55fb
Parents: a894299
Author: Pepijn Noltes <pepijnnol...@gmail.com>
Authored: Mon Oct 26 19:31:30 2015 +0100
Committer: Pepijn Noltes <pepijnnol...@gmail.com>
Committed: Mon Oct 26 19:31:30 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/celix/blob/6a4da96e/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index caba64f..52c81d8 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 libjansson-dev libxml2-dev lcov libffi-dev; fi
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update && brew install lcov 
libffi; fi
+  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update && brew install lcov 
libffi && 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
@@ -29,7 +29,8 @@ script:
      # RSA_DISCOVERY_SHM is only working on linux, but both compilers (see 
CELIX-277)
      # RSA_SHM is only working on linux, but both compilers (see CELIX-277)
     - cd build
-    - if [ "$CC" = "clang" ] || [ "$TRAVIS_OS_NAME" = "osx" ]; then export 
BUILD_OPTS=""; else export 
BUILD_OPTS="-DBUILD_RSA_REMOTE_SERVICE_ADMIN_DFI=ON"; fi
+    - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export 
BUILD_OPTS="-DFFI_INCLUDE_DIR=/usr/local/lib/libffi-3.0.13/include 
-DFFI_LIBRARY=/usr/local/lib/libffi.dylib"
+    - if [ "$CC" = "clang" ] || [ "$TRAVIS_OS_NAME" = "osx" ]; then export 
BUILD_OPTS="${BUILD_OPTS}"; else export BUILD_OPTS="${BUILD_OPTS} 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_DFI=ON"; fi
     - if [ "$TRAVIS_OS_NAME" = "linux" ]; then cmake 
-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 -DBUILD_DEVICE_ACCESS=ON 
-DBUILD_DEVICE_ACCESS_EXAMPLE=ON -DBUILD_FRAMEWORK_TESTS=OFF 
-DENABLE_CODE_COVERAGE=ON -DENABLE_TESTING=ON ${BUILD_OPTS} 
-DCMAKE_INSTALL_PREFIX=../install ..; fi
     - if [ "$TRAVIS_OS_NAME" = "osx" ]; then  cmake 
-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=OFF -DBUILD_RSA_EXAMPLES=ON 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_SHM=OFF 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_HTTP=ON -DBUILD_REMOTE_SHELL=ON 
-DBUILD_SHELL=ON -DBUILD_SHELL_TUI=ON -DBUILD_DEVICE_ACCESS=ON 
-DBUILD_DEVICE_ACCESS_EXAMPLE=ON -DBUILD_FRAMEWORK_TESTS=OFF 
-DENABLE_CODE_COVERAGE=ON -DENABLE_TESTING=ON 
-DFFI_LIBRARY=/usr/local/opt/libffi/lib/libffi.dylib ${BUILD_OPTS} 
-DCMAKE_INSTALL_PREFIX=../install ..; fi
     - make all && make deploy && make install-all

http://git-wip-us.apache.org/repos/asf/celix/blob/6a4da96e/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 78f5c1c..6f60639 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,8 +30,8 @@ set(CMAKE_INSTALL_NAME_DIR "@rpath")
 SET(CMAKE_BUILD_TYPE "Debug")
 
 # see https://public.kitware.com/Bug/view.php?id=15696
-IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} EQUAL 3.3)
-       message( FATAL_ERROR "Building Celix using CMake 3.3 is not supported 
due to a bug in the Makefile Generator (see Bug 15696). Please change the used 
CMake version - both, CMake 3.2 and CMake 3.4 are working fine." )
+IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} EQUAL 3.3 AND 
${CMAKE_GENERATOR} STREQUAL "Unix Makefiles")
+    message( FATAL_ERROR "Building Celix using CMake 3.3 and makefiles is not 
supported due to a bug in the Makefile Generator (see Bug 15696). Please change 
the used CMake version - both, CMake 3.2 and CMake 3.4 are working fine. Or use 
a different generator (e.g. Ninja)." )
 ENDIF()
 
 IF(UNIX)

http://git-wip-us.apache.org/repos/asf/celix/blob/6a4da96e/deployment_admin/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/deployment_admin/CMakeLists.txt b/deployment_admin/CMakeLists.txt
index 1f18ae2..00dfa13 100644
--- a/deployment_admin/CMakeLists.txt
+++ b/deployment_admin/CMakeLists.txt
@@ -60,5 +60,5 @@ if (DEPLOYMENT_ADMIN)
                public/include/resource_processor.h
        )
     
-    target_link_libraries(deployment_admin celix_framework ${CURL_LIBRARIES} 
${UUID_LIBRARY})
+    target_link_libraries(deployment_admin celix_framework ${CURL_LIBRARIES})
 endif (DEPLOYMENT_ADMIN)

Reply via email to