CELIX-343: Update CMakeLists.txt for changed bundle_file target prope…

…rty. Enable config_admin in travis
apache · Feb 5, 2016 · 2e31fdd · 2e31fdd
1 parent b19a8f6
commit 2e31fdd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git 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 \

diff --git 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)
 

diff --git 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