CELIX-343: Update CMakeLists.txt for changed bundle_file target property. Enable config_admin in travis
Project: http://git-wip-us.apache.org/repos/asf/celix/repo Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/2e31fdd5 Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/2e31fdd5 Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/2e31fdd5 Branch: refs/heads/release/celix-2.0.0 Commit: 2e31fdd536e6f874cdbb69867ba84fe4ab03a335 Parents: b19a8f6 Author: Pepijn Noltes <[email protected]> Authored: Fri Feb 5 13:08:23 2016 +0100 Committer: Pepijn Noltes <[email protected]> Committed: Fri Feb 5 13:08:23 2016 +0100 ---------------------------------------------------------------------- .travis.yml | 2 +- config_admin/config_admin_tst/CMakeLists.txt | 6 +++--- config_admin/config_admin_tst/example_test2/CMakeLists.txt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/celix/blob/2e31fdd5/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index 3e8b170..7448d72 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,7 +53,7 @@ before_script: - cd - - mkdir build install - export BUILD_OPTIONS=" \ - -DBUILD_CONFIG_ADMIN=OFF \ + -DBUILD_CONFIG_ADMIN=ON \ -DBUILD_RSA_REMOTE_SERVICE_ADMIN_DFI=ON \ -DBUILD_DEPLOYMENT_ADMIN=ON \ -DBUILD_DEPENDENCY_MANAGER=ON \ http://git-wip-us.apache.org/repos/asf/celix/blob/2e31fdd5/config_admin/config_admin_tst/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/config_admin/config_admin_tst/CMakeLists.txt b/config_admin/config_admin_tst/CMakeLists.txt index bc20862..e74e7bd 100644 --- a/config_admin/config_admin_tst/CMakeLists.txt +++ b/config_admin/config_admin_tst/CMakeLists.txt @@ -35,9 +35,9 @@ add_executable(config_admin_test config_admin_test.cpp) target_link_libraries(config_admin_test celix_framework ${CELIX_LIBRARIES} ${CPPUTEST_LIBRARY} pthread) -get_property(config_admin_bundle_file TARGET config_admin PROPERTY BUNDLE) -get_property(example_test_bundle_file TARGET example_test PROPERTY BUNDLE) -get_property(example_test2_bundle_file TARGET example_test2 PROPERTY BUNDLE) +get_property(config_admin_bundle_file TARGET config_admin PROPERTY BUNDLE_FILE) +get_property(example_test_bundle_file TARGET example_test PROPERTY BUNDLE_FILE) +get_property(example_test2_bundle_file TARGET example_test2 PROPERTY BUNDLE_FILE) configure_file(config.properties.in config.properties @ONLY) http://git-wip-us.apache.org/repos/asf/celix/blob/2e31fdd5/config_admin/config_admin_tst/example_test2/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/config_admin/config_admin_tst/example_test2/CMakeLists.txt b/config_admin/config_admin_tst/example_test2/CMakeLists.txt index 2d38251..d312673 100644 --- a/config_admin/config_admin_tst/example_test2/CMakeLists.txt +++ b/config_admin/config_admin_tst/example_test2/CMakeLists.txt @@ -21,7 +21,7 @@ include_directories("${PROJECT_SOURCE_DIR}/framework/public/include") include_directories("${PROJECT_SOURCE_DIR}/config_admin/service/public/include") include_directories("private/include") -add_bundle(bundle_managed_service SOURCES +add_bundle(example_test2 SOURCES private/src/activator private/src/example_managed_service_impl VERSION 0.1.0
