This is an automated email from the ASF dual-hosted git repository.
pnoltes pushed a commit to branch feature/cxx
in repository https://gitbox.apache.org/repos/asf/celix.git
commit f378f179989700a5de1769078d13272abbcbb765
Author: Pepijn Noltes <pepijnnol...@gmail.com>
AuthorDate: Mon Jan 7 11:59:43 2019 +0100
CELIX-438: Reanables the c bundles, libs and examples.
---
.travis.yml | 6 +++++-
CMakeLists.txt | 10 +++++-----
bundles/CMakeLists.txt | 14 +++++++-------
bundles/shell/CMakeLists.txt | 8 ++++----
libs/CMakeLists.txt | 14 +++++++-------
5 files changed, 28 insertions(+), 24 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 843e946..eb92e78 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,7 +44,11 @@ before_install:
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update && brew install lcov
libffi zeromq czmq glog cpputest jansson && brew link --force libffi; fi
before_script:
- - mkdir build install
+ - wget
https://github.com/cpputest/cpputest/releases/download/v3.8/cpputest-3.8.tar.gz
-O /tmp/cpputest.tar.gz
+ - tar -xzvf /tmp/cpputest.tar.gz -C /tmp
+ - if [ "$CC" = "clang" ]; then export CXX="clang++"; fi && cd
/tmp/cpputest-* && ./configure --prefix=/usr/local && make && sudo make install
&& cd -
+ - cd /tmp/cpputest-* && ./configure --prefix=/usr/local && make && sudo make
install && cd -
+ - mkdir build install
- export BUILD_OPTIONS=" \
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_DFI=ON \
-DBUILD_DEPLOYMENT_ADMIN=ON \
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f1807f7..669cc43 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -71,15 +71,15 @@ add_subdirectory(libs)
add_subdirectory(bundles)
#Example as last, because some example will check if underlining options are
enabled
-#TODO add_subdirectory(examples/celix-examples examples)
+add_subdirectory(examples/celix-examples examples)
#export targets
-#install(EXPORT celix NAMESPACE Celix:: DESTINATION share/celix/cmake FILE
Targets.cmake COMPONENT cmake)
-#install_celix_targets(celix NAMESPACE Celix:: DESTINATION share/celix/cmake
FILE CelixTargets.cmake COMPONENT cmake)
+install(EXPORT celix NAMESPACE Celix:: DESTINATION share/celix/cmake FILE
Targets.cmake COMPONENT cmake)
+install_celix_targets(celix NAMESPACE Celix:: DESTINATION share/celix/cmake
FILE CelixTargets.cmake COMPONENT cmake)
#install celix cmake modules
-#install(DIRECTORY ${CMAKE_SOURCE_DIR}/cmake/Modules/ DESTINATION
share/celix/cmake/Modules)
-#install(DIRECTORY ${CMAKE_SOURCE_DIR}/cmake/cmake_celix/ DESTINATION
share/celix/cmake/cmake_celix)
+install(DIRECTORY ${CMAKE_SOURCE_DIR}/cmake/Modules/ DESTINATION
share/celix/cmake/Modules)
+install(DIRECTORY ${CMAKE_SOURCE_DIR}/cmake/cmake_celix/ DESTINATION
share/celix/cmake/cmake_celix)
#configure and install CelixConfig and CelixConfigVersion files
configure_file(cmake/CelixConfigVersion.cmake.in
diff --git a/bundles/CMakeLists.txt b/bundles/CMakeLists.txt
index 847b1f0..5ed4054 100644
--- a/bundles/CMakeLists.txt
+++ b/bundles/CMakeLists.txt
@@ -15,11 +15,11 @@
# specific language governing permissions and limitations
# under the License.
-#add_subdirectory(config_admin)
-#add_subdirectory(device_access)
-#add_subdirectory(deployment_admin)
-#add_subdirectory(remote_services)
+add_subdirectory(config_admin)
+add_subdirectory(device_access)
+add_subdirectory(deployment_admin)
+add_subdirectory(remote_services)
add_subdirectory(shell)
-#add_subdirectory(log_writer)
-#add_subdirectory(log_service)
-#add_subdirectory(pubsub)
\ No newline at end of file
+add_subdirectory(log_writer)
+add_subdirectory(log_service)
+add_subdirectory(pubsub)
\ No newline at end of file
diff --git a/bundles/shell/CMakeLists.txt b/bundles/shell/CMakeLists.txt
index c3d0196..851d601 100644
--- a/bundles/shell/CMakeLists.txt
+++ b/bundles/shell/CMakeLists.txt
@@ -15,10 +15,10 @@
# specific language governing permissions and limitations
# under the License.
-#add_subdirectory(shell)
-#add_subdirectory(remote_shell)
-#add_subdirectory(shell_bonjour)
-#add_subdirectory(shell_tui)
+add_subdirectory(shell)
+add_subdirectory(remote_shell)
+add_subdirectory(shell_bonjour)
+add_subdirectory(shell_tui)
add_subdirectory(cxx_shell)
add_subdirectory(cxx_shell_tui)
diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt
index c811b70..7188fcd 100644
--- a/libs/CMakeLists.txt
+++ b/libs/CMakeLists.txt
@@ -17,19 +17,19 @@
#utils, dfi and etcdlib are standalone
#(e.g. no dependency on celix framework
-#add_subdirectory(utils)
-#add_subdirectory(dfi)
-#add_subdirectory(etcdlib)
+add_subdirectory(utils)
+add_subdirectory(dfi)
+add_subdirectory(etcdlib)
-#add_subdirectory(framework)
+add_subdirectory(framework)
#C++ stuff
add_subdirectory(registry)
add_subdirectory(framework_cxx)
#launcher
-#add_subdirectory(launcher)
+add_subdirectory(launcher)
#add_subdirectory(event_admin)# event_admin is unstable
-#add_subdirectory(dependency_manager)
-#add_subdirectory(dependency_manager_cxx)
\ No newline at end of file
+add_subdirectory(dependency_manager)
+add_subdirectory(dependency_manager_cxx)
\ No newline at end of file
