Author: pnoltes
Date: Thu Jul 12 14:10:35 2012
New Revision: 1360690
URL: http://svn.apache.org/viewvc?rev=1360690&view=rev
Log:
Renamed launcher to celix, libframework to libcelix_framework and libutils to
libcelix_utlts.
Adjusted the CMakeLists.txt for the launcer/library renames.
Replace include(FindLIB) with find_pagkage(LIB REQUIRED).
Added a cmake/Bundling.cmake which is can be used instead of Packaging.cmake
and creates bundles without the use of CPack.
Added:
incubator/celix/trunk/cmake/Bundling.cmake
Modified:
incubator/celix/trunk/cmake/Includes.cmake
incubator/celix/trunk/cmake/Packaging.cmake
incubator/celix/trunk/dependency_manager/CMakeLists.txt
incubator/celix/trunk/deployment_admin/CMakeLists.txt
incubator/celix/trunk/device_access/CMakeLists.txt
incubator/celix/trunk/device_access/device_access/CMakeLists.txt
incubator/celix/trunk/device_access/driver_locator/CMakeLists.txt
incubator/celix/trunk/device_access/example/CMakeLists.txt
incubator/celix/trunk/device_access/example/base_driver/CMakeLists.txt
incubator/celix/trunk/device_access/example/consuming_driver/CMakeLists.txt
incubator/celix/trunk/device_access/example/refining_driver/CMakeLists.txt
incubator/celix/trunk/examples/echo_service/client/CMakeLists.txt
incubator/celix/trunk/examples/echo_service/server/CMakeLists.txt
incubator/celix/trunk/examples/hello_world/CMakeLists.txt
incubator/celix/trunk/examples/mongoose/CMakeLists.txt
incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/client/CMakeLists.txt
incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/greeting/CMakeLists.txt
incubator/celix/trunk/examples/osgi-in-action/chapter04-correct-listener/CMakeLists.txt
incubator/celix/trunk/examples/osgi-in-action/chapter04-correct-lookup/CMakeLists.txt
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/circle/CMakeLists.txt
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/CMakeLists.txt
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/square/CMakeLists.txt
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/triangle/CMakeLists.txt
incubator/celix/trunk/examples/receiver-2.0/CMakeLists.txt
incubator/celix/trunk/examples/receiver/CMakeLists.txt
incubator/celix/trunk/examples/sender/CMakeLists.txt
incubator/celix/trunk/examples/whiteboard/publisherA/CMakeLists.txt
incubator/celix/trunk/examples/whiteboard/publisherB/CMakeLists.txt
incubator/celix/trunk/examples/whiteboard/tracker/CMakeLists.txt
incubator/celix/trunk/examples/whiteboard/tracker_depman/CMakeLists.txt
incubator/celix/trunk/framework/CMakeLists.txt
incubator/celix/trunk/launcher/CMakeLists.txt
incubator/celix/trunk/log_service/CMakeLists.txt
incubator/celix/trunk/log_writer/CMakeLists.txt
incubator/celix/trunk/remote_services/CMakeLists.txt
incubator/celix/trunk/remote_services/calc_shell/CMakeLists.txt
incubator/celix/trunk/remote_services/discovery/CMakeLists.txt
incubator/celix/trunk/remote_services/example_endpoint/CMakeLists.txt
incubator/celix/trunk/remote_services/example_proxy/CMakeLists.txt
incubator/celix/trunk/remote_services/example_service/CMakeLists.txt
incubator/celix/trunk/remote_services/remote_service_admin/CMakeLists.txt
incubator/celix/trunk/remote_services/remote_service_admin_http/CMakeLists.txt
incubator/celix/trunk/remote_services/topology_manager/CMakeLists.txt
incubator/celix/trunk/shell/CMakeLists.txt
incubator/celix/trunk/shell_tui/CMakeLists.txt
incubator/celix/trunk/utils/CMakeLists.txt
Added: incubator/celix/trunk/cmake/Bundling.cmake
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/cmake/Bundling.cmake?rev=1360690&view=auto
==============================================================================
--- incubator/celix/trunk/cmake/Bundling.cmake (added)
+++ incubator/celix/trunk/cmake/Bundling.cmake Thu Jul 12 14:10:35 2012
@@ -0,0 +1,194 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+find_program(FOUND_JAR jar)
+if(NOT FOUND_JAR)
+ message(FATAL_ERROR "Need jar command!")
+endif()
+
+SET(BUNDLES_INSTALL_DIR "share/celix/bundles" CACHE PATH "Directory to install
bundles. Relative to CMAKE_INSTALL_PREFIX")
+
+file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/bundles)
+
+function(bundle)
+ PARSE_ARGUMENTS(BUNDLE "SOURCES" "" ${ARGN})
+ LIST(GET BUNDLE_DEFAULT_ARGS 0 BUNDLE_NAME)
+
+ add_library(${BUNDLE_NAME} SHARED ${BUNDLE_SOURCES})
+ file(WRITE
${CMAKE_BINARY_DIR}/CMakeFiles/bundle_${BUNDLE_NAME}_add.cmake "")
+
+ set(LIB_NAME
${CMAKE_SHARED_LIBRARY_PREFIX}${BUNDLE_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
+
+ add_custom_command(TARGET ${BUNDLE_NAME}
+ POST_BUILD
+ COMMAND ${CMAKE_COMMAND} -E make_directory tojar
+ COMMAND ${CMAKE_COMMAND} -P
${CMAKE_BINARY_DIR}/CMakeFiles/bundle_${BUNDLE_NAME}_add.cmake
+ COMMAND ${CMAKE_COMMAND} -E copy ${LIB_NAME} tojar/
+ COMMAND jar -cfm
${PROJECT_BINARY_DIR}/bundles/${BUNDLE_NAME}.zip
${CMAKE_CURRENT_SOURCE_DIR}/META-INF/MANIFEST.MF -C
${CMAKE_CURRENT_BINARY_DIR}/tojar .
+ COMMAND ${CMAKE_COMMAND} -E remove_directory tojar
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+ )
+endfunction(bundle)
+
+function(bundle_add BUNDLE_NAME)
+ list (LENGTH ARGN ARGN_LENGTH)
+ list(FIND ARGN "DESTINATION" DEST_INDEX)
+ math(EXPR COPY_RANGE "${DEST_INDEX} -1")
+ math(EXPR DEST_VALUE_INDEX "${DEST_INDEX} +1")
+ math(EXPR REST_START_INDEX "${DEST_INDEX} +2")
+ math(EXPR MAX_RANGE "${ARGN_LENGTH} -1")
+
+ list(APPEND ARGUMENTS COPY)
+
+ #replace relative files/directory paths with absolute paths
+ foreach(INDEX RANGE 0 ${COPY_RANGE})
+ list(GET ARGN ${INDEX} PATH)
+ if (IS_ABSOLUTE ${PATH})
+ list(APPEND ARGUMENTS ${PATH})
+ else ()
+ list(APPEND ARGUMENTS
${CMAKE_CURRENT_SOURCE_DIR}/${PATH})
+ endif ()
+ endforeach()
+
+ #add tojar to the relative DESTINATION path
+ list(GET ARGN ${DEST_VALUE_INDEX} DEST_PATH)
+ if (IS_ABSOLUTE ${DEST_PATH})
+ message(FATAL_ERROR "Absolute path as DESTINATION is not
supported!")
+ endif ()
+ list(APPEND ARGUMENTS DESTINATION)
+ list(APPEND ARGUMENTS tojar/${DEST_PATH})
+
+ if (${REST_START_INDEX} LESS ${MAX_RANGE} OR ${REST_START_INDEX} EQUAL
${MAX_RANGE})
+ foreach(INDEX RANGE ${REST_START_INDEX} ${MAX_RANGE})
+ list(GET ARGN ${INDEX} VALUE)
+ list(APPEND ARGUMENTS ${VALUE})
+ endforeach()
+ endif ()
+
+ file(APPEND
${CMAKE_BINARY_DIR}/CMakeFiles/bundle_${BUNDLE_NAME}_add.cmake "
+ file(${ARGUMENTS})
+ ")
+endfunction()
+
+function(bundle_install BUNDLE_NAME)
+ list(FIND ARGN COMPONENT COMP_INDEX)
+ if (${COMP_INDEX} GREATER -1)
+ math(EXPR COMP_VALUE_INDEX "${COMP_INDEX} +1")
+ list(GET ARGN ${COMP_VALUE_INDEX} BUNDLE_COMPONENT)
+ else ()
+ set(BUNDLE_COMPONENT ${BUNDLE_NAME})
+ endif ()
+
+ set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
${PROJECT_BINARY_DIR}/bundles/${BUNDLE_NAME}.zip)
+ install(FILES ${PROJECT_BINARY_DIR}/bundles/${BUNDLE_NAME}.zip
DESTINATION ${BUNDLES_INSTALL_DIR} COMPONENT ${BUNDLE_COMPONENT})
+endfunction()
+
+function(package)
+ #dummy function
+endfunction(package)
+
+ADD_CUSTOM_TARGET(deploy)
+MACRO(deploy)
+ PARSE_ARGUMENTS(DEPLOY "BUNDLES" "" ${ARGN})
+ LIST(GET DEPLOY_DEFAULT_ARGS 0 DEPLOY_NAME)
+
+ SET(DEPLOY_COMPONENT deploy_${DEPLOY_NAME})
+ SET(__deployTarget deploy_${DEPLOY_NAME})
+ #SET(__deployConfig
${CMAKE_CURRENT_BINARY_DIR}/CPackConfig-${DEPLOY_NAME}-deploy.cmake)
+
+ #SET(DEPLOY_BIN_DIR ${CMAKE_CURRENT_BINARY_DIR}/deploy/${DEPLOY_NAME})
+ #CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/cmake/CPackConfigDeploy.in
${__deployConfig} @ONLY)
+ #install(FILES ${EXT_DIR}/celix/* DESTINATION . COMPONENT
${DEPLOY_COMPONENT})
+
+ SET(BUNDLES "")
+ SET(DEPS)
+ FOREACH(BUNDLE ${DEPLOY_BUNDLES})
+ SET(DEP_NAME ${DEPLOY_NAME}_${BUNDLE})
+ add_custom_command(OUTPUT
${CMAKE_CURRENT_BINARY_DIR}/deploy/${DEPLOY_NAME}/bundles/${BUNDLE}.zip
+ COMMAND ${CMAKE_COMMAND} -E copy
${PROJECT_BINARY_DIR}/bundles/${BUNDLE}.zip
+
${CMAKE_CURRENT_BINARY_DIR}/deploy/${DEPLOY_NAME}/bundles/${BUNDLE}.zip
+ DEPENDS ${BUNDLE}
+ COMMENT "Deploying ${BUNDLE} to ${DEPLOY_NAME}"
+ )
+ SET(BUNDLES "${BUNDLES} bundles/${BUNDLE}.zip")
+ SET(DEPS
${DEPS};${CMAKE_CURRENT_BINARY_DIR}/deploy/${DEPLOY_NAME}/bundles/${BUNDLE}.zip)
+ ENDFOREACH(BUNDLE)
+ ADD_CUSTOM_TARGET(${__deployTarget}
+ #mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/deploy \;
+ # cd ${CMAKE_CURRENT_BINARY_DIR}/deploy \;
+ # ${CPACK_COMMAND} --config "${__deployConfig}"
+ DEPENDS ${DEPS} celix
+ COMMENT "Deploy target ${DEPLOY_NAME}")
+ ADD_DEPENDENCIES(deploy ${__deployTarget})
+
+ CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/cmake/config.properties.in
${CMAKE_CURRENT_BINARY_DIR}/deploy/${DEPLOY_NAME}/config.properties @ONLY)
+
+ set(FW_PATH ${CMAKE_BINARY_DIR}/framework)
+ set(UTILS_PATH ${CMAKE_BINARY_DIR}/utils)
+ set(LAUNCHER ${CMAKE_BINARY_DIR}/launcher/celix)
+
+ IF(UNIX)
+ IF(APPLE)
+ set(LIBRARY_PATH DYLD_LIBRARY_PATH)
+ ELSE(APPLE)
+ set(LIBRARY_PATH LD_LIBRARY_PATH)
+ ENDIF(APPLE)
+ ENDIF(UNIX)
+
+ CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/cmake/run.sh.in
${CMAKE_CURRENT_BINARY_DIR}/deploy/${DEPLOY_NAME}/run.sh @ONLY)
+
+ GET_DIRECTORY_PROPERTY(PROPS ADDITIONAL_MAKE_CLEAN_FILES)
+ SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
"${PROPS};${CMAKE_CURRENT_BINARY_DIR}/deploy/${DEPLOY_NAME}/bundles")
+
+ #install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/deploy/${DEPLOY_NAME}
DESTINATION . COMPONENT ${DEPLOY_COMPONENT})
+ #ADD_CUSTOM_TARGET(clean_${__packageTarget}
+ # rm ${PROJECT_BINARY_DIR}/packages/IBS-${PACKAGE_NAME}
+ #)
+ENDMACRO(deploy)
+
+MACRO(PARSE_ARGUMENTS prefix arg_names option_names)
+ SET(DEFAULT_ARGS)
+ FOREACH(arg_name ${arg_names})
+ SET(${prefix}_${arg_name})
+ ENDFOREACH(arg_name)
+ FOREACH(option ${option_names})
+ SET(${prefix}_${option} FALSE)
+ ENDFOREACH(option)
+
+ SET(current_arg_name DEFAULT_ARGS)
+ SET(current_arg_list)
+ FOREACH(arg ${ARGN})
+ SET(larg_names ${arg_names})
+ LIST(FIND larg_names "${arg}" is_arg_name)
+ IF (is_arg_name GREATER -1)
+ SET(${prefix}_${current_arg_name} ${current_arg_list})
+ SET(current_arg_name ${arg})
+ SET(current_arg_list)
+ ELSE (is_arg_name GREATER -1)
+ SET(loption_names ${option_names})
+ LIST(FIND loption_names "${arg}" is_option)
+ IF (is_option GREATER -1)
+ SET(${prefix}_${arg} TRUE)
+ ELSE (is_option GREATER -1)
+ SET(current_arg_list ${current_arg_list} ${arg})
+ ENDIF (is_option GREATER -1)
+ ENDIF (is_arg_name GREATER -1)
+ ENDFOREACH(arg)
+ SET(${prefix}_${current_arg_name} ${current_arg_list})
+ENDMACRO(PARSE_ARGUMENTS)
+
+
Modified: incubator/celix/trunk/cmake/Includes.cmake
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/cmake/Includes.cmake?rev=1360690&r1=1360689&r2=1360690&view=diff
==============================================================================
--- incubator/celix/trunk/cmake/Includes.cmake (original)
+++ incubator/celix/trunk/cmake/Includes.cmake Thu Jul 12 14:10:35 2012
@@ -15,12 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-include(FindAPR)
-IF(APR_FOUND)
- MESSAGE(STATUS "Looking for APR - found")
-ELSE(APR_FOUND)
- MESSAGE(FATAL_ERROR "Looking for APR - not found")
-ENDIF(APR_FOUND)
+find_package(APR REQUIRED)
include_directories(${APR_INCLUDE_DIR})
include_directories(${APRUTIL_INCLUDE_DIR})
@@ -29,4 +24,5 @@ include_directories("framework/public/in
include(cmake/Dependencies.cmake)
include(cmake/Packaging.cmake)
+#include(cmake/Bundling.cmake)
include(cmake/Test.cmake)
\ No newline at end of file
Modified: incubator/celix/trunk/cmake/Packaging.cmake
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/cmake/Packaging.cmake?rev=1360690&r1=1360689&r2=1360690&view=diff
==============================================================================
--- incubator/celix/trunk/cmake/Packaging.cmake (original)
+++ incubator/celix/trunk/cmake/Packaging.cmake Thu Jul 12 14:10:35 2012
@@ -125,7 +125,7 @@ MACRO(deploy)
set(FW_PATH ${CMAKE_BINARY_DIR}/framework)
set(UTILS_PATH ${CMAKE_BINARY_DIR}/utils)
- set(LAUNCHER ${CMAKE_BINARY_DIR}/launcher/launcher)
+ set(LAUNCHER ${CMAKE_BINARY_DIR}/launcher/celix)
IF(UNIX)
IF(APPLE)
Modified: incubator/celix/trunk/dependency_manager/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/dependency_manager/CMakeLists.txt?rev=1360690&r1=1360689&r2=1360690&view=diff
==============================================================================
--- incubator/celix/trunk/dependency_manager/CMakeLists.txt (original)
+++ incubator/celix/trunk/dependency_manager/CMakeLists.txt Thu Jul 12 14:10:35
2012
@@ -31,9 +31,9 @@ if (DEPENDENCY_MANAGER)
add_library(dependency_manager STATIC dependency_manager.c
dependency_activator_base.c service_component.c service_dependency.c)
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
- target_link_libraries(dependency_manager framework)
+ target_link_libraries(dependency_manager celix_framework)
FILE(GLOB files dependency_activator_base.h service.h dependency_manager.h
service_component_private.h service_component.h service_dependency.h)
- INSTALL(FILES ${files} DESTINATION include/dependency_manager COMPONENT
framework)
+ INSTALL(FILES ${files} DESTINATION include/celix/dependency_manager
COMPONENT framework)
install(TARGETS dependency_manager DESTINATION lib COMPONENT framework)
endif (DEPENDENCY_MANAGER)
Modified: incubator/celix/trunk/deployment_admin/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/deployment_admin/CMakeLists.txt?rev=1360690&r1=1360689&r2=1360690&view=diff
==============================================================================
--- incubator/celix/trunk/deployment_admin/CMakeLists.txt (original)
+++ incubator/celix/trunk/deployment_admin/CMakeLists.txt Thu Jul 12 14:10:35
2012
@@ -27,6 +27,7 @@ if (DEPLOYMENT_ADMIN)
include_directories("${PROJECT_SOURCE_DIR}/deployment_admin/public/include")
link_directories("/opt/local/lib")
+
bundle(deployment_admin SOURCES
private/src/deployment_package
private/src/deployment_admin
@@ -38,7 +39,10 @@ if (DEPLOYMENT_ADMIN)
private/src/log_store
private/src/log_sync
)
- target_link_libraries(deployment_admin framework ${CURL_LIBRARIES})
+
+ target_link_libraries(deployment_admin celix_framework ${CURL_LIBRARIES})
+
+ install(FILES public/include/resource_processor.h DESTINATION
include/celix/deployment_admin)
deploy("deployment-admin" BUNDLES deployment_admin shell shell_tui
log_service log_writer)
endif (DEPLOYMENT_ADMIN)
Modified: incubator/celix/trunk/device_access/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/CMakeLists.txt?rev=1360690&r1=1360689&r2=1360690&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/CMakeLists.txt (original)
+++ incubator/celix/trunk/device_access/CMakeLists.txt Thu Jul 12 14:10:35 2012
@@ -16,10 +16,9 @@
# under the License.
celix_subproject(DEVICE_ACCESS "Option to enable building the Device Access
Service bundles" OFF DEPS LAUNCHER LOG_SERVICE SHELL shell_tui)
if(DEVICE_ACCESS)
+
add_subdirectory(device_access)
- add_subdirectory(driver_locator)
-
+ add_subdirectory(driver_locator)
add_subdirectory(example)
- deploy("device_access_example" BUNDLES device_manager driver_locator shell
shell_tui log_service base_driver)
endif(DEVICE_ACCESS)
Modified: incubator/celix/trunk/device_access/device_access/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/device_access/CMakeLists.txt?rev=1360690&r1=1360689&r2=1360690&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/device_access/CMakeLists.txt (original)
+++ incubator/celix/trunk/device_access/device_access/CMakeLists.txt Thu Jul 12
14:10:35 2012
@@ -21,7 +21,20 @@ bundle(device_manager SOURCES
private/src/driver_attributes
private/src/device_manager
private/src/driver_loader
- private/src/driver_matcher)
+ private/src/driver_matcher
+)
+
+FILE(GLOB SERVICE_HEADERS public/include/*.h)
+
+#bundle_add(device_manager ${SERVICE_HEADERS} DESTINATION services)
+#bundle_add(device_manager
+# public/include DESTINATION public/include
+# PATTERN .svn EXCLUDE)
+
+#bundle_install(device_manager COMPONENT device_access)
+
+install(FILES ${SERVICE_HEADERS} DESTINATION include/celix/device_access)
+
include_directories("${PROJECT_SOURCE_DIR}/framework/public/include")
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
@@ -29,4 +42,4 @@ include_directories("${PROJECT_SOURCE_DI
include_directories("public/include")
include_directories("private/include")
-target_link_libraries(device_manager framework utils ${APR_LIBRARY})
+target_link_libraries(device_manager celix_framework celix_utils
${APR_LIBRARY})
Modified: incubator/celix/trunk/device_access/driver_locator/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/driver_locator/CMakeLists.txt?rev=1360690&r1=1360689&r2=1360690&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/driver_locator/CMakeLists.txt (original)
+++ incubator/celix/trunk/device_access/driver_locator/CMakeLists.txt Thu Jul
12 14:10:35 2012
@@ -14,14 +14,21 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-include(FindAPR)
+
+find_package(APR REQUIRED)
bundle(driver_locator SOURCES
private/src/activator
private/src/driver_locator
)
+
+#bundle_install(driver_locator COMPONENT device_access)
+
+package(driver_locator)
+
include_directories(${PROJECT_SOURCE_DIR}/device_access/device_access/public/include)
include_directories(private/include)
include_directories("${PROJECT_SOURCE_DIR}/framework/public/include")
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
-target_link_libraries(driver_locator utils framework ${APR_LIBRARY})
+
+target_link_libraries(driver_locator celix_utils celix_framework
${APR_LIBRARY})
Modified: incubator/celix/trunk/device_access/example/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/example/CMakeLists.txt?rev=1360690&r1=1360689&r2=1360690&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/example/CMakeLists.txt (original)
+++ incubator/celix/trunk/device_access/example/CMakeLists.txt Thu Jul 12
14:10:35 2012
@@ -15,6 +15,12 @@
# specific language governing permissions and limitations
# under the License.
-add_subdirectory(base_driver)
-add_subdirectory(consuming_driver)
-add_subdirectory(refining_driver)
\ No newline at end of file
+celix_subproject(DEVICE_ACCESS_EXAMPLE "Option to enable building the Device
Access example bundles" OFF DEPS LAUNCHER LOG_SERVICE SHELL shell_tui)
+if(DEVICE_ACCESS_EXAMPLE)
+
+ add_subdirectory(base_driver)
+ add_subdirectory(consuming_driver)
+ add_subdirectory(refining_driver)
+
+ deploy("device_access_example" BUNDLES device_manager driver_locator
shell shell_tui log_service base_driver base_driver word_consumingdriver
char_refiningdriver)
+endif(DEVICE_ACCESS_EXAMPLE)
\ No newline at end of file
Modified: incubator/celix/trunk/device_access/example/base_driver/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/example/base_driver/CMakeLists.txt?rev=1360690&r1=1360689&r2=1360690&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/example/base_driver/CMakeLists.txt
(original)
+++ incubator/celix/trunk/device_access/example/base_driver/CMakeLists.txt Thu
Jul 12 14:10:35 2012
@@ -27,4 +27,5 @@ include_directories(private/include)
include_directories(public/include)
include_directories("${PROJECT_SOURCE_DIR}/framework/public/include")
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
-target_link_libraries(base_driver utils framework ${APR_LIBRARY})
+
+target_link_libraries(base_driver celix_utils celix_framework ${APR_LIBRARY})
Modified:
incubator/celix/trunk/device_access/example/consuming_driver/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/example/consuming_driver/CMakeLists.txt?rev=1360690&r1=1360689&r2=1360690&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/example/consuming_driver/CMakeLists.txt
(original)
+++ incubator/celix/trunk/device_access/example/consuming_driver/CMakeLists.txt
Thu Jul 12 14:10:35 2012
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-include(FindAPR)
+find_package(APR REQUIRED)
bundle(word_consumingdriver SOURCES
private/src/activator
@@ -27,4 +27,5 @@ include_directories(${PROJECT_SOURCE_DIR
include_directories(private/include)
include_directories("${PROJECT_SOURCE_DIR}/framework/include")
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
-target_link_libraries(word_consumingdriver utils framework ${APR_LIBRARY})
+
+target_link_libraries(word_consumingdriver celix_utils celix_framework
${APR_LIBRARY})
Modified:
incubator/celix/trunk/device_access/example/refining_driver/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/example/refining_driver/CMakeLists.txt?rev=1360690&r1=1360689&r2=1360690&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/example/refining_driver/CMakeLists.txt
(original)
+++ incubator/celix/trunk/device_access/example/refining_driver/CMakeLists.txt
Thu Jul 12 14:10:35 2012
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-include(FindAPR)
+find_package(APR REQUIRED)
bundle(char_refiningdriver SOURCES
private/src/activator
@@ -28,4 +28,5 @@ include_directories(private/include)
include_directories(public/include)
include_directories("${PROJECT_SOURCE_DIR}/framework/public/include")
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
-target_link_libraries(char_refiningdriver utils framework ${APR_LIBRARY})
+
+target_link_libraries(char_refiningdriver celix_utils celix_framework
${APR_LIBRARY})
Modified: incubator/celix/trunk/examples/echo_service/client/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/examples/echo_service/client/CMakeLists.txt?rev=1360690&r1=1360689&r2=1360690&view=diff
==============================================================================
--- incubator/celix/trunk/examples/echo_service/client/CMakeLists.txt (original)
+++ incubator/celix/trunk/examples/echo_service/client/CMakeLists.txt Thu Jul
12 14:10:35 2012
@@ -2,4 +2,4 @@ bundle(echo_client SOURCES echo_client_a
include_directories("${PROJECT_SOURCE_DIR}/celix")
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
include_directories("../server")
-target_link_libraries(echo_client framework)
+target_link_libraries(echo_client celix_framework)
Modified: incubator/celix/trunk/examples/echo_service/server/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/examples/echo_service/server/CMakeLists.txt?rev=1360690&r1=1360689&r2=1360690&view=diff
==============================================================================
--- incubator/celix/trunk/examples/echo_service/server/CMakeLists.txt (original)
+++ incubator/celix/trunk/examples/echo_service/server/CMakeLists.txt Thu Jul
12 14:10:35 2012
@@ -1,4 +1,4 @@
bundle(echo_server SOURCES echo_server_activator echo_server)
include_directories("${PROJECT_SOURCE_DIR}/celix")
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
-target_link_libraries(echo_server framework)
+target_link_libraries(echo_server celix_framework)
Modified: incubator/celix/trunk/examples/hello_world/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/examples/hello_world/CMakeLists.txt?rev=1360690&r1=1360689&r2=1360690&view=diff
==============================================================================
--- incubator/celix/trunk/examples/hello_world/CMakeLists.txt (original)
+++ incubator/celix/trunk/examples/hello_world/CMakeLists.txt Thu Jul 12
14:10:35 2012
@@ -17,4 +17,4 @@
bundle(hello_world SOURCES activator)
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
-target_link_libraries(hello_world framework)
+target_link_libraries(hello_world celix_framework)
Modified: incubator/celix/trunk/examples/mongoose/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/examples/mongoose/CMakeLists.txt?rev=1360690&r1=1360689&r2=1360690&view=diff
==============================================================================
--- incubator/celix/trunk/examples/mongoose/CMakeLists.txt (original)
+++ incubator/celix/trunk/examples/mongoose/CMakeLists.txt Thu Jul 12 14:10:35
2012
@@ -20,6 +20,6 @@ SET_TARGET_PROPERTIES(mongoose PROPERTIE
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
bundle(celix.mongoose SOURCES activator DIRECTORIES root)
-target_link_libraries(celix.mongoose framework mongoose)
+target_link_libraries(celix.mongoose celix_framework mongoose)
Modified:
incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/client/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/client/CMakeLists.txt?rev=1360690&r1=1360689&r2=1360690&view=diff
==============================================================================
---
incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/client/CMakeLists.txt
(original)
+++
incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/client/CMakeLists.txt
Thu Jul 12 14:10:35 2012
@@ -18,4 +18,4 @@
bundle(chapter01-greeting-example-client SOURCES private/src/client)
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
include_directories("../greeting/public/include")
-target_link_libraries(chapter01-greeting-example-client framework)
+target_link_libraries(chapter01-greeting-example-client celix_framework)
Modified:
incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/greeting/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/greeting/CMakeLists.txt?rev=1360690&r1=1360689&r2=1360690&view=diff
==============================================================================
---
incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/greeting/CMakeLists.txt
(original)
+++
incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/greeting/CMakeLists.txt
Thu Jul 12 14:10:35 2012
@@ -19,4 +19,4 @@ bundle(chapter01-greeting-example SOURCE
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
include_directories("public/include")
include_directories("private/include")
-target_link_libraries(chapter01-greeting-example framework)
+target_link_libraries(chapter01-greeting-example celix_framework)
Modified:
incubator/celix/trunk/examples/osgi-in-action/chapter04-correct-listener/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-correct-listener/CMakeLists.txt?rev=1360690&r1=1360689&r2=1360690&view=diff
==============================================================================
---
incubator/celix/trunk/examples/osgi-in-action/chapter04-correct-listener/CMakeLists.txt
(original)
+++
incubator/celix/trunk/examples/osgi-in-action/chapter04-correct-listener/CMakeLists.txt
Thu Jul 12 14:10:35 2012
@@ -18,4 +18,4 @@
bundle(chapter04-correct-listener SOURCES private/src/listener_example)
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
include_directories("${PROJECT_SOURCE_DIR}/log_service/public/include")
-target_link_libraries(chapter04-correct-listener framework)
+target_link_libraries(chapter04-correct-listener celix_framework)
Modified:
incubator/celix/trunk/examples/osgi-in-action/chapter04-correct-lookup/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-correct-lookup/CMakeLists.txt?rev=1360690&r1=1360689&r2=1360690&view=diff
==============================================================================
---
incubator/celix/trunk/examples/osgi-in-action/chapter04-correct-lookup/CMakeLists.txt
(original)
+++
incubator/celix/trunk/examples/osgi-in-action/chapter04-correct-lookup/CMakeLists.txt
Thu Jul 12 14:10:35 2012
@@ -18,4 +18,4 @@
bundle(chapter04-correct-lookup SOURCES private/src/activator)
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
include_directories("${PROJECT_SOURCE_DIR}/log_service/public/include")
-target_link_libraries(chapter04-correct-lookup framework pthread)
+target_link_libraries(chapter04-correct-lookup celix_framework pthread)
Modified:
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/circle/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/circle/CMakeLists.txt?rev=1360690&r1=1360689&r2=1360690&view=diff
==============================================================================
---
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/circle/CMakeLists.txt
(original)
+++
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/circle/CMakeLists.txt
Thu Jul 12 14:10:35 2012
@@ -39,5 +39,5 @@ bundle(circle SOURCES
)
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
include_directories("${PROJECT_SOURCE_DIR}/log_service/public/include")
-target_link_libraries(circle framework ${GLIB_LIBRARIES} ${GTK_LIBRARIES}
${GTHR_LIBRARIES})
+target_link_libraries(circle celix_framework ${GLIB_LIBRARIES}
${GTK_LIBRARIES} ${GTHR_LIBRARIES})
Modified:
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/CMakeLists.txt?rev=1360690&r1=1360689&r2=1360690&view=diff
==============================================================================
---
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/CMakeLists.txt
(original)
+++
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/CMakeLists.txt
Thu Jul 12 14:10:35 2012
@@ -48,4 +48,4 @@ bundle(chapter04-paint-example SOURCES
)
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
include_directories("${PROJECT_SOURCE_DIR}/log_service/public/include")
-target_link_libraries(chapter04-paint-example framework ${MODULE_LIBRARIES}
${GLIB_LIBRARIES} ${GTK_LIBRARIES} ${GTHR_LIBRARIES})
+target_link_libraries(chapter04-paint-example celix_framework
${MODULE_LIBRARIES} ${GLIB_LIBRARIES} ${GTK_LIBRARIES} ${GTHR_LIBRARIES})
Modified:
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/square/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/square/CMakeLists.txt?rev=1360690&r1=1360689&r2=1360690&view=diff
==============================================================================
---
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/square/CMakeLists.txt
(original)
+++
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/square/CMakeLists.txt
Thu Jul 12 14:10:35 2012
@@ -39,4 +39,4 @@ bundle(square SOURCES
)
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
include_directories("${PROJECT_SOURCE_DIR}/log_service/public/include")
-target_link_libraries(square framework ${GLIB_LIBRARIES} ${GTK_LIBRARIES}
${GTHR_LIBRARIES})
+target_link_libraries(square celix_framework ${GLIB_LIBRARIES}
${GTK_LIBRARIES} ${GTHR_LIBRARIES})
Modified:
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/triangle/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/triangle/CMakeLists.txt?rev=1360690&r1=1360689&r2=1360690&view=diff
==============================================================================
---
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/triangle/CMakeLists.txt
(original)
+++
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/triangle/CMakeLists.txt
Thu Jul 12 14:10:35 2012
@@ -39,4 +39,4 @@ bundle(triangle SOURCES
)
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
include_directories("${PROJECT_SOURCE_DIR}/log_service/public/include")
-target_link_libraries(triangle framework ${GLIB_LIBRARIES} ${GTK_LIBRARIES}
${GTHR_LIBRARIES})
+target_link_libraries(triangle celix_framework ${GLIB_LIBRARIES}
${GTK_LIBRARIES} ${GTHR_LIBRARIES})
Modified: incubator/celix/trunk/examples/receiver-2.0/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/examples/receiver-2.0/CMakeLists.txt?rev=1360690&r1=1360689&r2=1360690&view=diff
==============================================================================
--- incubator/celix/trunk/examples/receiver-2.0/CMakeLists.txt (original)
+++ incubator/celix/trunk/examples/receiver-2.0/CMakeLists.txt Thu Jul 12
14:10:35 2012
@@ -18,6 +18,6 @@
bundle(receiver-2.0 SOURCES activator serviceTest)
include_directories("${PROJECT_SOURCE_DIR}/celix"
"${PROJECT_SOURCE_DIR}/dependency_manager")
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
-target_link_libraries(receiver-2.0 dependency_manager framework)
+target_link_libraries(receiver-2.0 dependency_manager celix_framework)
package(receiver-2.0 FILES serviceTest.h)
\ No newline at end of file
Modified: incubator/celix/trunk/examples/receiver/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/examples/receiver/CMakeLists.txt?rev=1360690&r1=1360689&r2=1360690&view=diff
==============================================================================
--- incubator/celix/trunk/examples/receiver/CMakeLists.txt (original)
+++ incubator/celix/trunk/examples/receiver/CMakeLists.txt Thu Jul 12 14:10:35
2012
@@ -18,6 +18,6 @@
bundle(receiver SOURCES activator serviceTest)
include_directories("${PROJECT_SOURCE_DIR}/celix")
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
-target_link_libraries(receiver framework)
+target_link_libraries(receiver celix_framework)
package(receiver FILES serviceTest.h)
\ No newline at end of file
Modified: incubator/celix/trunk/examples/sender/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/examples/sender/CMakeLists.txt?rev=1360690&r1=1360689&r2=1360690&view=diff
==============================================================================
--- incubator/celix/trunk/examples/sender/CMakeLists.txt (original)
+++ incubator/celix/trunk/examples/sender/CMakeLists.txt Thu Jul 12 14:10:35
2012
@@ -19,6 +19,6 @@ bundle(sender SOURCES test_activator lis
include_directories("${PROJECT_SOURCE_DIR}/celix"
"${PROJECT_SOURCE_DIR}/dependency_manager")
include_directories("${PROJECT_SOURCE_DIR}/receiver")
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
-target_link_libraries(sender framework dependency_manager)
+target_link_libraries(sender celix_framework dependency_manager)
package(sender)
Modified: incubator/celix/trunk/examples/whiteboard/publisherA/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/examples/whiteboard/publisherA/CMakeLists.txt?rev=1360690&r1=1360689&r2=1360690&view=diff
==============================================================================
--- incubator/celix/trunk/examples/whiteboard/publisherA/CMakeLists.txt
(original)
+++ incubator/celix/trunk/examples/whiteboard/publisherA/CMakeLists.txt Thu Jul
12 14:10:35 2012
@@ -19,6 +19,6 @@ bundle(publisherA SOURCES activator publ
include_directories("${PROJECT_SOURCE_DIR}/celix")
include_directories("../publisherService")
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
-target_link_libraries(publisherA framework)
+target_link_libraries(publisherA celix_framework)
package(publisherA FILES ../publisherService/publisher.h)
\ No newline at end of file
Modified: incubator/celix/trunk/examples/whiteboard/publisherB/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/examples/whiteboard/publisherB/CMakeLists.txt?rev=1360690&r1=1360689&r2=1360690&view=diff
==============================================================================
--- incubator/celix/trunk/examples/whiteboard/publisherB/CMakeLists.txt
(original)
+++ incubator/celix/trunk/examples/whiteboard/publisherB/CMakeLists.txt Thu Jul
12 14:10:35 2012
@@ -18,7 +18,7 @@
bundle(publisherB SOURCES activator publisher)
include_directories("${PROJECT_SOURCE_DIR}/celix")
include_directories("../publisherService")
-target_link_libraries(publisherB framework)
+target_link_libraries(publisherB celix_framework)
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
package(publisherB FILES ../publisherService/publisher.h)
\ No newline at end of file
Modified: incubator/celix/trunk/examples/whiteboard/tracker/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/examples/whiteboard/tracker/CMakeLists.txt?rev=1360690&r1=1360689&r2=1360690&view=diff
==============================================================================
--- incubator/celix/trunk/examples/whiteboard/tracker/CMakeLists.txt (original)
+++ incubator/celix/trunk/examples/whiteboard/tracker/CMakeLists.txt Thu Jul 12
14:10:35 2012
@@ -19,4 +19,4 @@ bundle(tracker SOURCES activator)
include_directories("${PROJECT_SOURCE_DIR}/celix")
include_directories("../publisherService")
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
-target_link_libraries(tracker framework)
+target_link_libraries(tracker celix_framework)
Modified:
incubator/celix/trunk/examples/whiteboard/tracker_depman/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/examples/whiteboard/tracker_depman/CMakeLists.txt?rev=1360690&r1=1360689&r2=1360690&view=diff
==============================================================================
--- incubator/celix/trunk/examples/whiteboard/tracker_depman/CMakeLists.txt
(original)
+++ incubator/celix/trunk/examples/whiteboard/tracker_depman/CMakeLists.txt Thu
Jul 12 14:10:35 2012
@@ -21,4 +21,4 @@ include_directories("${PROJECT_SOURCE_DI
include_directories("../publisherService")
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
include_directories("${PROJECT_SOURCE_DIR}/log_service/public/include")
-target_link_libraries(tracker_depman framework dependency_manager)
+target_link_libraries(tracker_depman celix_framework dependency_manager)
Modified: incubator/celix/trunk/framework/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/framework/CMakeLists.txt?rev=1360690&r1=1360689&r2=1360690&view=diff
==============================================================================
--- incubator/celix/trunk/framework/CMakeLists.txt (original)
+++ incubator/celix/trunk/framework/CMakeLists.txt Thu Jul 12 14:10:35 2012
@@ -18,22 +18,18 @@ celix_subproject(FRAMEWORK "Option to bu
if (FRAMEWORK)
cmake_minimum_required(VERSION 2.6)
- include(FindZLIB)
- IF(ZLIB_FOUND)
- MESSAGE(STATUS "Looking for ZLIB - found")
- ELSE(ZLIB_FOUND)
- MESSAGE(FATAL_ERROR "Looking for ZLIB - not found")
- ENDIF(ZLIB_FOUND)
-
- include(FindCURL)
- IF(CURL_FOUND)
- MESSAGE(STATUS "Looking for CURL - found")
- ELSE(CURL_FOUND)
- MESSAGE(FATAL_ERROR "Looking for CURL - not found")
- ENDIF(CURL_FOUND)
+ find_package(CURL REQUIRED)
+ find_package(ZLIB REQUIRED)
+ include(CPackComponent)
include(UseDoxygen)
+ cpack_add_component(framework
+ DISPLAY_NAME framework
+ DESCRIPTION "The Apache Celix framework library"
+ REQUIRED
+ )
+
add_definitions(-DUSE_FILE32API)
aux_source_directory("private/src" SRC)
#include_directories(${CURL_INCLUDE_DIR})
@@ -41,10 +37,11 @@ if (FRAMEWORK)
include_directories("private/include")
include_directories("public/include")
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
- add_library(framework SHARED ${SRC})
- target_link_libraries(framework utils ${ZLIB_LIBRARY} ${APR_LIBRARY})
+ add_library(celix_framework SHARED ${SRC})
+ target_link_libraries(celix_framework celix_utils ${ZLIB_LIBRARY}
${APR_LIBRARY})
- install(TARGETS framework DESTINATION lib COMPONENT framework)
+ install(TARGETS celix_framework DESTINATION lib COMPONENT framework)
FILE(GLOB files "public/include/*.h")
- INSTALL(FILES ${files} DESTINATION include COMPONENT framework)
+ INSTALL(FILES ${files} DESTINATION include/celix COMPONENT framework)
+
endif (FRAMEWORK)
Modified: incubator/celix/trunk/launcher/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/launcher/CMakeLists.txt?rev=1360690&r1=1360689&r2=1360690&view=diff
==============================================================================
--- incubator/celix/trunk/launcher/CMakeLists.txt (original)
+++ incubator/celix/trunk/launcher/CMakeLists.txt Thu Jul 12 14:10:35 2012
@@ -16,11 +16,11 @@
# under the License.
celix_subproject(LAUNCHER "Option to build the launcher" "ON" DEPS UTILS
FRAMEWORK)
if (LAUNCHER)
- add_executable(launcher launcher.c)
+ add_executable(celix launcher.c)
- target_link_libraries(launcher framework)
+ target_link_libraries(celix celix_framework)
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
include_directories("${PROJECT_SOURCE_DIR}/framework/private/include")
- install(TARGETS launcher RUNTIME DESTINATION bin COMPONENT framework)
+ install(TARGETS celix RUNTIME DESTINATION bin COMPONENT framework)
endif (LAUNCHER)
\ No newline at end of file
Modified: incubator/celix/trunk/log_service/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/log_service/CMakeLists.txt?rev=1360690&r1=1360689&r2=1360690&view=diff
==============================================================================
--- incubator/celix/trunk/log_service/CMakeLists.txt (original)
+++ incubator/celix/trunk/log_service/CMakeLists.txt Thu Jul 12 14:10:35 2012
@@ -27,11 +27,11 @@ if (LOG_SERVICE)
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
include_directories("${PROJECT_SOURCE_DIR}/log_service/public/include")
include_directories("${PROJECT_SOURCE_DIR}/log_service/private/include")
- target_link_libraries(log_service framework)
+ target_link_libraries(log_service celix_framework)
package(log_service FILES public/include/log_service.h)
FILE(GLOB files public/include/log_service.h)
- INSTALL(FILES ${files} DESTINATION include/log_service COMPONENT framework)
+ INSTALL(FILES ${files} DESTINATION include/celix/log_service COMPONENT
framework)
INSTALL(FILES ${PROJECT_BINARY_DIR}/bundles/log_service.zip DESTINATION
bundles COMPONENT framework)
endif (LOG_SERVICE)
Modified: incubator/celix/trunk/log_writer/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/log_writer/CMakeLists.txt?rev=1360690&r1=1360689&r2=1360690&view=diff
==============================================================================
--- incubator/celix/trunk/log_writer/CMakeLists.txt (original)
+++ incubator/celix/trunk/log_writer/CMakeLists.txt Thu Jul 12 14:10:35 2012
@@ -21,7 +21,7 @@ if (LOG_WRITER)
include_directories("${PROJECT_SOURCE_DIR}/dependency_manager")
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
include_directories("${PROJECT_SOURCE_DIR}/log_service/public/include")
- target_link_libraries(log_writer framework dependency_manager)
+ target_link_libraries(log_writer celix_framework dependency_manager)
INSTALL(FILES ${PROJECT_BINARY_DIR}/bundles/log_writer.zip DESTINATION
bundles COMPONENT framework)
endif (LOG_WRITER)
\ No newline at end of file
Modified: incubator/celix/trunk/remote_services/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/CMakeLists.txt?rev=1360690&r1=1360689&r2=1360690&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/CMakeLists.txt (original)
+++ incubator/celix/trunk/remote_services/CMakeLists.txt Thu Jul 12 14:10:35
2012
@@ -27,10 +27,6 @@ if (REMOTE_SERVICE_ADMIN)
endif(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
endif(CMAKE_UNAME)
endif(UNIX AND NOT WIN32)
-
- find_package(Jansson REQUIRED)
- find_package(CURL REQUIRED)
- find_package(Slp REQUIRED)
add_subdirectory(utils)
Modified: incubator/celix/trunk/remote_services/calc_shell/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/calc_shell/CMakeLists.txt?rev=1360690&r1=1360689&r2=1360690&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/calc_shell/CMakeLists.txt (original)
+++ incubator/celix/trunk/remote_services/calc_shell/CMakeLists.txt Thu Jul 12
14:10:35 2012
@@ -25,5 +25,5 @@ include_directories("${PROJECT_SOURCE_DI
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
include_directories("${PROJECT_SOURCE_DIR}/remote_services/example_service/public/include")
include_directories("${PROJECT_SOURCE_DIR}/shell")
-target_link_libraries(calc_shell framework)
+target_link_libraries(calc_shell celix_framework)
Modified: incubator/celix/trunk/remote_services/discovery/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/discovery/CMakeLists.txt?rev=1360690&r1=1360689&r2=1360690&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/discovery/CMakeLists.txt (original)
+++ incubator/celix/trunk/remote_services/discovery/CMakeLists.txt Thu Jul 12
14:10:35 2012
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+find_package(Slp REQUIRED)
+
include_directories("/opt/local/include")
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
include_directories("${PROJECT_SOURCE_DIR}/remote_services/utils/public/include")
@@ -27,5 +29,5 @@ bundle(discovery SOURCES
private/src/discovery
private/src/discovery_activator
)
-target_link_libraries(discovery framework ${APRUTIL_LIBRARY} ${SLP_LIBRARIES})
+target_link_libraries(discovery celix_framework ${APRUTIL_LIBRARY}
${SLP_LIBRARIES})
Modified: incubator/celix/trunk/remote_services/example_endpoint/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/example_endpoint/CMakeLists.txt?rev=1360690&r1=1360689&r2=1360690&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/example_endpoint/CMakeLists.txt
(original)
+++ incubator/celix/trunk/remote_services/example_endpoint/CMakeLists.txt Thu
Jul 12 14:10:35 2012
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+find_package(Jansson REQUIRED)
+
link_directories("/opt/local/lib")
include_directories("/opt/local/include")
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
@@ -26,4 +28,4 @@ bundle(example_endpoint SOURCES
private/src/example_endpoint_activator
private/src/example_endpoint_impl.c
)
-target_link_libraries(example_endpoint framework ${JANSSON_LIBRARIES})
+target_link_libraries(example_endpoint celix_framework ${JANSSON_LIBRARIES})
Modified: incubator/celix/trunk/remote_services/example_proxy/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/example_proxy/CMakeLists.txt?rev=1360690&r1=1360689&r2=1360690&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/example_proxy/CMakeLists.txt
(original)
+++ incubator/celix/trunk/remote_services/example_proxy/CMakeLists.txt Thu Jul
12 14:10:35 2012
@@ -15,6 +15,9 @@
# specific language governing permissions and limitations
# under the License.
+find_package(Jansson REQUIRED)
+find_package(CURL REQUIRED)
+
link_directories("/opt/local/lib")
include_directories("/opt/local/include")
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
@@ -28,4 +31,4 @@ bundle(example_proxy SOURCES
private/src/example_proxy_activator
private/src/example_proxy_impl.c
)
-target_link_libraries(example_proxy framework ${JANSSON_LIBRARIES}
${CURL_LIBRARIES})
+target_link_libraries(example_proxy celix_framework ${JANSSON_LIBRARIES}
${CURL_LIBRARIES})
Modified: incubator/celix/trunk/remote_services/example_service/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/example_service/CMakeLists.txt?rev=1360690&r1=1360689&r2=1360690&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/example_service/CMakeLists.txt
(original)
+++ incubator/celix/trunk/remote_services/example_service/CMakeLists.txt Thu
Jul 12 14:10:35 2012
@@ -25,4 +25,4 @@ bundle(example SOURCES
private/src/example_impl
private/src/example_activator
)
-target_link_libraries(example framework)
+target_link_libraries(example celix_framework)
Modified:
incubator/celix/trunk/remote_services/remote_service_admin/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin/CMakeLists.txt?rev=1360690&r1=1360689&r2=1360690&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin/CMakeLists.txt
(original)
+++ incubator/celix/trunk/remote_services/remote_service_admin/CMakeLists.txt
Thu Jul 12 14:10:35 2012
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+find_package(Jansson REQUIRED)
+
link_directories("/opt/local/lib")
include_directories("/opt/local/include")
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
@@ -30,4 +32,4 @@ bundle(remote_service_admin SOURCES
private/src/remote_service_admin_activator
private/src/mongoose.c
)
-target_link_libraries(remote_service_admin framework ${APRUTIL_LIBRARY}
${JANSSON_LIBRARIES})
+target_link_libraries(remote_service_admin celix_framework ${APRUTIL_LIBRARY}
${JANSSON_LIBRARIES})
Modified:
incubator/celix/trunk/remote_services/remote_service_admin_http/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin_http/CMakeLists.txt?rev=1360690&r1=1360689&r2=1360690&view=diff
==============================================================================
---
incubator/celix/trunk/remote_services/remote_service_admin_http/CMakeLists.txt
(original)
+++
incubator/celix/trunk/remote_services/remote_service_admin_http/CMakeLists.txt
Thu Jul 12 14:10:35 2012
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+find_package(Jansson REQUIRED)
+
link_directories("/opt/local/lib")
include_directories("/opt/local/include")
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
@@ -30,4 +32,4 @@ bundle(remote_service_admin_http SOURCES
private/src/remote_service_admin_activator
private/src/mongoose.c
)
-target_link_libraries(remote_service_admin_http framework ${APRUTIL_LIBRARY}
${JANSSON_LIBRARIES})
+target_link_libraries(remote_service_admin_http celix_framework
${APRUTIL_LIBRARY} ${JANSSON_LIBRARIES})
Modified: incubator/celix/trunk/remote_services/topology_manager/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/topology_manager/CMakeLists.txt?rev=1360690&r1=1360689&r2=1360690&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/topology_manager/CMakeLists.txt
(original)
+++ incubator/celix/trunk/remote_services/topology_manager/CMakeLists.txt Thu
Jul 12 14:10:35 2012
@@ -22,4 +22,4 @@ include_directories("${PROJECT_SOURCE_DI
include_directories("${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/public/include")
bundle(topology_manager SOURCES private/src/topology_manager
private/src/activator)
-target_link_libraries(topology_manager framework remote_services_utils
${APRUTIL_LIBRARY})
+target_link_libraries(topology_manager celix_framework remote_services_utils
${APRUTIL_LIBRARY})
Modified: incubator/celix/trunk/shell/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/shell/CMakeLists.txt?rev=1360690&r1=1360689&r2=1360690&view=diff
==============================================================================
--- incubator/celix/trunk/shell/CMakeLists.txt (original)
+++ incubator/celix/trunk/shell/CMakeLists.txt Thu Jul 12 14:10:35 2012
@@ -25,11 +25,11 @@ if (SHELL)
inspect_command)
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
include_directories("${PROJECT_SOURCE_DIR}/log_service/public/include")
- target_link_libraries(shell framework ${CURL_LIBRARIES})
+ target_link_libraries(shell celix_framework ${CURL_LIBRARIES})
package(shell FILES shell.h command.h)
FILE(GLOB files shell.h command.h)
- INSTALL(FILES ${files} DESTINATION include/shell COMPONENT framework)
+ INSTALL(FILES ${files} DESTINATION include/celix/shell COMPONENT framework)
INSTALL(FILES ${PROJECT_BINARY_DIR}/bundles/shell.zip DESTINATION bundles
COMPONENT framework)
endif (SHELL)
\ No newline at end of file
Modified: incubator/celix/trunk/shell_tui/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/shell_tui/CMakeLists.txt?rev=1360690&r1=1360689&r2=1360690&view=diff
==============================================================================
--- incubator/celix/trunk/shell_tui/CMakeLists.txt (original)
+++ incubator/celix/trunk/shell_tui/CMakeLists.txt Thu Jul 12 14:10:35 2012
@@ -19,7 +19,7 @@ if (SHELL_TUI)
bundle(shell_tui SOURCES shell_tui)
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
include_directories("${PROJECT_SOURCE_DIR}/shell")
- target_link_libraries(shell_tui framework)
+ target_link_libraries(shell_tui celix_framework)
package(shell_tui)
Modified: incubator/celix/trunk/utils/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/utils/CMakeLists.txt?rev=1360690&r1=1360689&r2=1360690&view=diff
==============================================================================
--- incubator/celix/trunk/utils/CMakeLists.txt (original)
+++ incubator/celix/trunk/utils/CMakeLists.txt Thu Jul 12 14:10:35 2012
@@ -22,32 +22,32 @@ if (UTILS)
aux_source_directory("private/src" SRC)
include_directories("private/include")
include_directories("public/include")
- add_library(utils SHARED ${SRC})
+ add_library(celix_utils SHARED ${SRC})
IF(UNIX)
- target_link_libraries(utils m)
+ target_link_libraries(celix_utils m)
ENDIF(UNIX)
- target_link_libraries(utils ${APR_LIBRARY})
+ target_link_libraries(celix_utils ${APR_LIBRARY})
- install(TARGETS utils DESTINATION lib COMPONENT framework)
+ install(TARGETS celix_utils DESTINATION lib COMPONENT framework)
FILE(GLOB files "public/include/*.h")
- INSTALL(FILES ${files} DESTINATION include COMPONENT framework)
+ INSTALL(FILES ${files} DESTINATION include/celix COMPONENT framework)
include_directories(${CUNIT_INCLUDE_DIRS})
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
include_directories("${PROJECT_SOURCE_DIR}/utils/private/include")
add_executable(hash_map_test private/test/hash_map_test.c)
- target_link_libraries(hash_map_test utils ${CUNIT_LIBRARIES})
+ target_link_libraries(hash_map_test celix_utils ${CUNIT_LIBRARIES})
add_executable(hash_map_test_hash private/test/hash_map_test_hash.c)
- target_link_libraries(hash_map_test_hash utils ${CUNIT_LIBRARIES})
+ target_link_libraries(hash_map_test_hash celix_utils ${CUNIT_LIBRARIES})
add_executable(array_list_test private/test/array_list_test.c)
- target_link_libraries(array_list_test utils ${CUNIT_LIBRARIES})
+ target_link_libraries(array_list_test celix_utils ${CUNIT_LIBRARIES})
add_executable(linked_list_test private/test/linked_list_test.c)
- target_link_libraries(linked_list_test utils ${CUNIT_LIBRARIES})
+ target_link_libraries(linked_list_test celix_utils ${CUNIT_LIBRARIES})
run_test(array_list_test)
run_test(hash_map_test)
