You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by pn...@apache.org on 2015/11/25 17:35:42 UTC
celix git commit: CELIX-63: Using cmake's PROJECT_NAME (lower case)
install location for bundles.
Repository: celix
Updated Branches:
refs/heads/develop 52528fdc3 -> c33e47581
CELIX-63: Using cmake's PROJECT_NAME (lower case) install location for bundles.
Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/c33e4758
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/c33e4758
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/c33e4758
Branch: refs/heads/develop
Commit: c33e475813715c0bb7ebc90ed13f47fe4a6e7774
Parents: 52528fd
Author: Pepijn Noltes <pe...@gmail.com>
Authored: Wed Nov 25 17:34:31 2015 +0100
Committer: Pepijn Noltes <pe...@gmail.com>
Committed: Wed Nov 25 17:34:31 2015 +0100
----------------------------------------------------------------------
cmake/cmake_celix/Packaging.cmake | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/celix/blob/c33e4758/cmake/cmake_celix/Packaging.cmake
----------------------------------------------------------------------
diff --git a/cmake/cmake_celix/Packaging.cmake b/cmake/cmake_celix/Packaging.cmake
index ed2a7fb..f802a9c 100644
--- a/cmake/cmake_celix/Packaging.cmake
+++ b/cmake/cmake_celix/Packaging.cmake
@@ -290,15 +290,18 @@ MACRO(install_bundle)
GROUP bundles
)
add_dependencies( install-${INT_BUNDLE_NAME} ${INT_BUNDLE_NAME} )
+
+
+ string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
if (BUNDLE_HEADERS)
- install (FILES ${BUNDLE_HEADERS} DESTINATION include/celix/${INT_BUNDLE_NAME} COMPONENT ${INT_BUNDLE_NAME})
+ install (FILES ${BUNDLE_HEADERS} DESTINATION include/${PROJECT_NAME_LOWER}/${INT_BUNDLE_NAME} COMPONENT ${INT_BUNDLE_NAME})
endif(BUNDLE_HEADERS)
if (BUNDLE_RESOURCES)
- install (FILES ${BUNDLE_RESOURCES} DESTINATION share/celix/${INT_BUNDLE_NAME} COMPONENT ${INT_BUNDLE_NAME})
+ install (FILES ${BUNDLE_RESOURCES} DESTINATION share/${PROJECT_NAME_LOWER}/${INT_BUNDLE_NAME} COMPONENT ${INT_BUNDLE_NAME})
endif(BUNDLE_RESOURCES)
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${INT_BUNDLE_NAME}.zip DESTINATION share/celix/bundles COMPONENT ${INT_BUNDLE_NAME})
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${INT_BUNDLE_NAME}.zip DESTINATION share/${PROJECT_NAME_LOWER}/bundles COMPONENT ${INT_BUNDLE_NAME})
ENDMACRO(install_bundle)
MACRO(package)