incubator-celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnol...@apache.org
Subject svn commit: r1487640 - in /incubator/celix/trunk: log_service/CMakeLists.txt log_writer/CMakeLists.txt shell/CMakeLists.txt shell_tui/CMakeLists.txt
Date Wed, 29 May 2013 20:53:18 GMT
Author: pnoltes
Date: Wed May 29 20:53:18 2013
New Revision: 1487640

URL: http://svn.apache.org/r1487640
Log:
CELIX-70: updated CMakeLists for shell, shell_tui, log_service and log_writer to point to
the current build bundle path.

Modified:
    incubator/celix/trunk/log_service/CMakeLists.txt
    incubator/celix/trunk/log_writer/CMakeLists.txt
    incubator/celix/trunk/shell/CMakeLists.txt
    incubator/celix/trunk/shell_tui/CMakeLists.txt

Modified: incubator/celix/trunk/log_service/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/log_service/CMakeLists.txt?rev=1487640&r1=1487639&r2=1487640&view=diff
==============================================================================
--- incubator/celix/trunk/log_service/CMakeLists.txt (original)
+++ incubator/celix/trunk/log_service/CMakeLists.txt Wed May 29 20:53:18 2013
@@ -38,5 +38,5 @@ if (LOG_SERVICE)
     
     FILE(GLOB files public/include/log_service.h)
     INSTALL(FILES ${files} DESTINATION include/celix/log_service COMPONENT framework)
-    INSTALL(FILES ${PROJECT_BINARY_DIR}/bundles/log_service.zip DESTINATION share/celix/bundles
COMPONENT framework)
+    INSTALL(FILES ${PROJECT_BINARY_DIR}/log_service/log_service.zip DESTINATION share/celix/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=1487640&r1=1487639&r2=1487640&view=diff
==============================================================================
--- incubator/celix/trunk/log_writer/CMakeLists.txt (original)
+++ incubator/celix/trunk/log_writer/CMakeLists.txt Wed May 29 20:53:18 2013
@@ -30,5 +30,5 @@ if (LOG_WRITER)
     include_directories("${PROJECT_SOURCE_DIR}/log_service/public/include")
     target_link_libraries(log_writer celix_framework dependency_manager)
     
-    INSTALL(FILES ${PROJECT_BINARY_DIR}/bundles/log_writer.zip DESTINATION share/celix/bundles
COMPONENT framework)
+    INSTALL(FILES ${PROJECT_BINARY_DIR}/log_writer/log_writer.zip DESTINATION share/celix/bundles
COMPONENT framework)
 endif (LOG_WRITER)
\ No newline at end of file

Modified: incubator/celix/trunk/shell/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/shell/CMakeLists.txt?rev=1487640&r1=1487639&r2=1487640&view=diff
==============================================================================
--- incubator/celix/trunk/shell/CMakeLists.txt (original)
+++ incubator/celix/trunk/shell/CMakeLists.txt Wed May 29 20:53:18 2013
@@ -43,5 +43,5 @@ if (SHELL)
     
     FILE(GLOB files public/include/shell.h public/include/command.h public/include/command_private.h)
     INSTALL(FILES ${files} DESTINATION include/celix/shell COMPONENT framework)
-    INSTALL(FILES ${PROJECT_BINARY_DIR}/bundles/shell.zip DESTINATION share/celix/bundles
COMPONENT framework)
+    INSTALL(FILES ${PROJECT_BINARY_DIR}/shell/shell.zip DESTINATION share/celix/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=1487640&r1=1487639&r2=1487640&view=diff
==============================================================================
--- incubator/celix/trunk/shell_tui/CMakeLists.txt (original)
+++ incubator/celix/trunk/shell_tui/CMakeLists.txt Wed May 29 20:53:18 2013
@@ -27,5 +27,5 @@ if (SHELL_TUI)
     
     package(shell_tui)
     
-    INSTALL(FILES ${PROJECT_BINARY_DIR}/bundles/shell_tui.zip DESTINATION share/celix/bundles
COMPONENT framework)
+    INSTALL(FILES ${PROJECT_BINARY_DIR}/shell_tui/shell_tui.zip DESTINATION share/celix/bundles
COMPONENT framework)
 endif (SHELL_TUI)
\ No newline at end of file



Mime
View raw message