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 2016/10/16 12:47:02 UTC
[2/8] celix git commit: CELIX-282: Disable importing/exporting
libraries example for OSX.
CELIX-282: Disable importing/exporting libraries example for OSX.
Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/24894196
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/24894196
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/24894196
Branch: refs/heads/develop
Commit: 24894196b959da980a1b6798299af572e9be2782
Parents: 2c74cc3
Author: Pepijn Noltes <pe...@gmail.com>
Authored: Sat Oct 15 16:37:15 2016 +0200
Committer: Pepijn Noltes <pe...@gmail.com>
Committed: Sat Oct 15 16:37:15 2016 +0200
----------------------------------------------------------------------
examples/hello_world/CMakeLists.txt | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/celix/blob/24894196/examples/hello_world/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/examples/hello_world/CMakeLists.txt b/examples/hello_world/CMakeLists.txt
index 04c79ed..e3a5c59 100644
--- a/examples/hello_world/CMakeLists.txt
+++ b/examples/hello_world/CMakeLists.txt
@@ -15,6 +15,9 @@
# specific language governing permissions and limitations
# under the License.
+if(NOT APPLE)
+#Importing and exporting libraries not (yet) work under OSX.
+
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
include_directories("public/include")
@@ -36,7 +39,7 @@ add_bundle(hello
IMPORT_LIBRARIES hello_test2lib
)
-add_bundle(hello_import
+add_bundle(hello_export
VERSION "1.0"
NO_ACTIVATOR
EXPORT_LIBRARIES hello_test2lib
@@ -54,5 +57,7 @@ add_deploy(helloworld_byref
add_deploy(helloworld_withcopy
GROUP hello
COPY #Ensures that bundles are copied in the deploy location
- BUNDLES hello_import hello shell shell_tui
+ BUNDLES hello_export hello shell shell_tui
)
+
+endif()
\ No newline at end of file