[#439] Create static and shared C++ libraries

eclipse-iceoryx · Oct 9, 2024 · f66d1f0 · f66d1f0
1 parent 016eaba
commit f66d1f0
Show file tree

Hide file tree

Showing 11 changed files with 49 additions and 25 deletions.
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -49,17 +49,23 @@ alias(
     visibility = ["//visibility:public"],
 )
 
-# NOTE: the following lines can be removed once 'rules_foreign_cc' is retired from building the C and C++ bindings
+alias(
+    name = "iceoryx2-cxx-shared",
+    actual = "//iceoryx2-ffi/cxx:iceoryx2-cxx-shared",
+    visibility = ["//visibility:public"],
+)
 
 alias(
-    name = "iceoryx2-c",
-    actual = "//iceoryx2-ffi/c:iceoryx2-c-foreigncc",
+    name = "iceoryx2-cxx-static",
+    actual = "//iceoryx2-ffi/cxx:iceoryx2-cxx-static",
     visibility = ["//visibility:public"],
 )
 
+# NOTE: the following lines can be removed once 'rules_foreign_cc' is retired from building the C and C++ bindings
+
 alias(
-    name = "iceoryx2-cxx",
-    actual = "//iceoryx2-ffi/cxx:iceoryx2-cxx",
+    name = "iceoryx2-c",
+    actual = "//iceoryx2-ffi/c:iceoryx2-c-foreigncc",
     visibility = ["//visibility:public"],
 )
 

diff --git a/examples/cxx/complex_data_types/BUILD.bazel b/examples/cxx/complex_data_types/BUILD.bazel
@@ -19,6 +19,6 @@ cc_binary(
     ],
     deps = [
         "@iceoryx//:iceoryx_hoofs",
-        "//:iceoryx2-cxx",
+        "//:iceoryx2-cxx-static",
     ],
 )
diff --git a/examples/cxx/discovery/BUILD.bazel b/examples/cxx/discovery/BUILD.bazel
@@ -19,6 +19,6 @@ cc_binary(
     ],
     deps = [
         "@iceoryx//:iceoryx_hoofs",
-        "//:iceoryx2-cxx",
+        "//:iceoryx2-cxx-shared",
     ],
 )
diff --git a/examples/cxx/domains/BUILD.bazel b/examples/cxx/domains/BUILD.bazel
@@ -20,7 +20,7 @@ cc_binary(
     ],
     deps = [
         "@iceoryx//:iceoryx_hoofs",
-        "//:iceoryx2-cxx",
+        "//:iceoryx2-cxx-static",
     ],
 )
 
@@ -32,7 +32,7 @@ cc_binary(
     ],
     deps = [
         "@iceoryx//:iceoryx_hoofs",
-        "//:iceoryx2-cxx",
+        "//:iceoryx2-cxx-static",
     ],
 )
 
@@ -43,6 +43,6 @@ cc_binary(
     ],
     deps = [
         "@iceoryx//:iceoryx_hoofs",
-        "//:iceoryx2-cxx",
+        "//:iceoryx2-cxx-static",
     ],
 )
diff --git a/examples/cxx/event/BUILD.bazel b/examples/cxx/event/BUILD.bazel
@@ -19,7 +19,7 @@ cc_binary(
     ],
     deps = [
         "@iceoryx//:iceoryx_hoofs",
-        "//:iceoryx2-cxx",
+        "//:iceoryx2-cxx-static",
     ],
 )
 
@@ -30,6 +30,6 @@ cc_binary(
     ],
     deps = [
         "@iceoryx//:iceoryx_hoofs",
-        "//:iceoryx2-cxx",
+        "//:iceoryx2-cxx-static",
     ],
 )
diff --git a/examples/cxx/publish_subscribe/BUILD.bazel b/examples/cxx/publish_subscribe/BUILD.bazel
@@ -20,7 +20,7 @@ cc_binary(
     ],
     deps = [
         "@iceoryx//:iceoryx_hoofs",
-        "//:iceoryx2-cxx",
+        "//:iceoryx2-cxx-static",
     ],
 )
 
@@ -32,6 +32,6 @@ cc_binary(
     ],
     deps = [
         "@iceoryx//:iceoryx_hoofs",
-        "//:iceoryx2-cxx",
+        "//:iceoryx2-cxx-static",
     ],
 )
diff --git a/examples/cxx/publish_subscribe_dynamic_data/BUILD.bazel b/examples/cxx/publish_subscribe_dynamic_data/BUILD.bazel
@@ -19,7 +19,7 @@ cc_binary(
     ],
     deps = [
         "@iceoryx//:iceoryx_hoofs",
-        "//:iceoryx2-cxx",
+        "//:iceoryx2-cxx-static",
     ],
 )
 
@@ -30,6 +30,6 @@ cc_binary(
     ],
     deps = [
         "@iceoryx//:iceoryx_hoofs",
-        "//:iceoryx2-cxx",
+        "//:iceoryx2-cxx-static",
     ],
 )
diff --git a/examples/cxx/publish_subscribe_with_user_header/BUILD.bazel b/examples/cxx/publish_subscribe_with_user_header/BUILD.bazel
@@ -20,7 +20,7 @@ cc_binary(
     ],
     deps = [
         "@iceoryx//:iceoryx_hoofs",
-        "//:iceoryx2-cxx",
+        "//:iceoryx2-cxx-static",
     ],
 )
 
@@ -32,6 +32,6 @@ cc_binary(
     ],
     deps = [
         "@iceoryx//:iceoryx_hoofs",
-        "//:iceoryx2-cxx",
+        "//:iceoryx2-cxx-static",
     ],
 )
diff --git a/examples/cxx/service_attributes/BUILD.bazel b/examples/cxx/service_attributes/BUILD.bazel
@@ -19,7 +19,7 @@ cc_binary(
     ],
     deps = [
         "@iceoryx//:iceoryx_hoofs",
-        "//:iceoryx2-cxx",
+        "//:iceoryx2-cxx-static",
     ],
 )
 
@@ -30,7 +30,7 @@ cc_binary(
     ],
     deps = [
         "@iceoryx//:iceoryx_hoofs",
-        "//:iceoryx2-cxx",
+        "//:iceoryx2-cxx-static",
     ],
 )
 
@@ -41,6 +41,6 @@ cc_binary(
     ],
     deps = [
         "@iceoryx//:iceoryx_hoofs",
-        "//:iceoryx2-cxx",
+        "//:iceoryx2-cxx-static",
     ],
 )
diff --git a/iceoryx2-ffi/cxx/BUILD.bazel b/iceoryx2-ffi/cxx/BUILD.bazel
@@ -10,20 +10,38 @@
 #
 # SPDX-License-Identifier: Apache-2.0 OR MIT
 
+package(default_visibility = ["//visibility:public"])
+
 load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library")
 
 cc_library(
-    name = "iceoryx2-cxx",
+    name = "iceoryx2-cxx-shared",
+    srcs = glob(
+        [
+            "src/**",
+        ],
+    ),
+    hdrs = glob(["include/**"]),
+    strip_include_prefix = "include",
+    deps = [
+        "//:iceoryx2-c-shared",
+        "@iceoryx//:iceoryx_hoofs",
+    ],
+    linkstatic = False,
+)
+
+cc_library(
+    name = "iceoryx2-cxx-static",
     srcs = glob(
         [
             "src/**",
         ],
     ),
     hdrs = glob(["include/**"]),
     strip_include_prefix = "include",
-    visibility = ["//visibility:public"],
     deps = [
-        "//:iceoryx2-c",
+        "//:iceoryx2-c-static",
         "@iceoryx//:iceoryx_hoofs",
     ],
+    linkstatic = True,
 )
diff --git a/iceoryx2-ffi/cxx/tests/BUILD.bazel b/iceoryx2-ffi/cxx/tests/BUILD.bazel
@@ -30,7 +30,7 @@ cc_test(
     visibility = ["//visibility:private"],
     deps = [
         "@iceoryx//:iceoryx_hoofs",
-        "//:iceoryx2-cxx",
+        "//:iceoryx2-cxx-static",
         "@googletest//:gtest",
     ],
 )