You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by ab...@apache.org on 2014/05/19 11:46:12 UTC
svn commit: r1595804 - in /incubator/celix/trunk: cmake/Packaging.cmake
examples/hello_world/CMakeLists.txt examples/hello_world_test/CMakeLists.txt
Author: abroekhuis
Date: Mon May 19 09:46:12 2014
New Revision: 1595804
URL: http://svn.apache.org/r1595804
Log:
CELIX-111, CELIX-112: Removed version from library name to make CMake files more readable. Eventually versions should be supported as well, for now focus on code sharing.
Modified:
incubator/celix/trunk/cmake/Packaging.cmake
incubator/celix/trunk/examples/hello_world/CMakeLists.txt
incubator/celix/trunk/examples/hello_world_test/CMakeLists.txt
Modified: incubator/celix/trunk/cmake/Packaging.cmake
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/cmake/Packaging.cmake?rev=1595804&r1=1595803&r2=1595804&view=diff
==============================================================================
--- incubator/celix/trunk/cmake/Packaging.cmake (original)
+++ incubator/celix/trunk/cmake/Packaging.cmake Mon May 19 09:46:12 2014
@@ -107,17 +107,17 @@ MACRO(BUNDLE_PRIVATE_LIBRARY)
CHECK_HEADERS()
- SET(BUNDLE_LIBRARY_VERSIONED_NAME ${BUNDLE_SYMBOLICNAME}-${BUNDLE_LIBRARY_NAME}-${BUNDLE_VERSION})
+ SET(BUNDLE_LIBRARY_VERSIONED_NAME ${BUNDLE_SYMBOLICNAME}-${BUNDLE_LIBRARY_NAME})
add_library(${BUNDLE_LIBRARY_VERSIONED_NAME} SHARED ${BUNDLE_LIBRARY_SOURCES})
target_link_libraries(${BUNDLE_LIBRARY_VERSIONED_NAME} ${BUNDLE_LIBRARY_LINK_LIBRARIES})
ENDMACRO(BUNDLE_PRIVATE_LIBRARY)
MACRO(BUNDLE_LIBRARY)
- PARSE_ARGUMENTS(BUNDLE_LIBRARY "SOURCES;VERSION;LINK_LIBRARIES" "" ${ARGN})
+ PARSE_ARGUMENTS(BUNDLE_LIBRARY "SOURCES;LINK_LIBRARIES" "" ${ARGN})
LIST(GET BUNDLE_LIBRARY_DEFAULT_ARGS 0 BUNDLE_LIBRARY_NAME)
- SET(BUNDLE_LIBRARY_VERSIONED_NAME ${BUNDLE_LIBRARY_NAME}-${BUNDLE_LIBRARY_VERSION})
+ SET(BUNDLE_LIBRARY_VERSIONED_NAME ${BUNDLE_LIBRARY_NAME})
add_library(${BUNDLE_LIBRARY_VERSIONED_NAME} SHARED ${BUNDLE_LIBRARY_SOURCES})
target_link_libraries(${BUNDLE_LIBRARY_VERSIONED_NAME} ${BUNDLE_LIBRARY_LINK_LIBRARIES})
@@ -176,7 +176,7 @@ MACRO(bundle)
SET(TEMP)
foreach(_PRIVATE_LIBRARY ${_BUNDLE_PRIVATE_LIBRARIES})
- SET(_BUNDLE_LIBRARY_VERSIONED_NAME ${BUNDLE_SYMBOLICNAME}-${_PRIVATE_LIBRARY}-${BUNDLE_VERSION})
+ SET(_BUNDLE_LIBRARY_VERSIONED_NAME ${BUNDLE_SYMBOLICNAME}-${_PRIVATE_LIBRARY})
add_dependencies(${_BUNDLE_NAME} "${_BUNDLE_LIBRARY_VERSIONED_NAME}")
install(TARGETS ${_BUNDLE_LIBRARY_VERSIONED_NAME} DESTINATION . COMPONENT ${_BUNDLE_NAME}_install)
Modified: incubator/celix/trunk/examples/hello_world/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/hello_world/CMakeLists.txt?rev=1595804&r1=1595803&r2=1595804&view=diff
==============================================================================
--- incubator/celix/trunk/examples/hello_world/CMakeLists.txt (original)
+++ incubator/celix/trunk/examples/hello_world/CMakeLists.txt Mon May 19 09:46:12 2014
@@ -24,19 +24,18 @@ include_directories("public/include")
BUNDLE_LIBRARY(org.apache.incubator.celix.helloworld.sub
SOURCES private/src/test
- VERSION 0.1
LINK_LIBRARIES celix_framework
)
BUNDLE_PRIVATE_LIBRARY(private
SOURCES private/src/activator
- LINK_LIBRARIES celix_framework org.apache.incubator.celix.helloworld.sub-0.1
+ LINK_LIBRARIES celix_framework org.apache.incubator.celix.helloworld.sub
)
BUNDLE(org.apache.incubator.celix.helloworld
- ACTIVATOR "apache_celix_examples_hello_world-private-0.0.1"
+ ACTIVATOR "apache_celix_examples_hello_world-private"
PRIVATE_LIBRARIES "private"
- EXPORT_LIBRARIES org.apache.incubator.celix.helloworld.sub|version="0.1"
+ EXPORT_LIBRARIES org.apache.incubator.celix.helloworld.sub
)
Modified: incubator/celix/trunk/examples/hello_world_test/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/hello_world_test/CMakeLists.txt?rev=1595804&r1=1595803&r2=1595804&view=diff
==============================================================================
--- incubator/celix/trunk/examples/hello_world_test/CMakeLists.txt (original)
+++ incubator/celix/trunk/examples/hello_world_test/CMakeLists.txt Mon May 19 09:46:12 2014
@@ -21,10 +21,10 @@ SET_HEADERS("Bundle-Name: Apache Celix S
bundle(hello_world_test
SOURCES private/src/activator
- IMPORT_LIBRARIES "org.apache.incubator.celix.helloworld.sub|version=\"[0.0.1,1.0.0)\"")
+ IMPORT_LIBRARIES "org.apache.incubator.celix.helloworld.sub")
#IMPORT_LIBRARIES "org.apache.incubator.celix.helloworld.sub;version=\"[1.0,2.0\)\"")
target_link_libraries(hello_world_test celix_framework)
-target_link_libraries(hello_world_test org.apache.incubator.celix.helloworld.sub-0.1)
+target_link_libraries(hello_world_test org.apache.incubator.celix.helloworld.sub)
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
include_directories("${PROJECT_SOURCE_DIR}/examples/hello_world/public/include")
include_directories("private/include")