Add IceBT CMakeLists.txt (#282)

Author: externl

.github/workflows/ci.yml

@@ -83,6 +83,12 @@ jobs:
         working-directory: ice-demos/cpp
         run: |
           set -o pipefail
+
+          # No IceBT on macOS
+          if [[ "$(uname)" == "Darwin" ]]; then
+            rm -rf IceBT
+          fi
+
           find . -name CMakeLists.txt -type f | while IFS= read -r file; do
             dir=$(dirname "$file");
             cmake -B "$dir/build" -S "$dir" -DIce_DEBUG=ON
@@ -94,6 +100,9 @@ jobs:
         timeout-minutes: 20
         working-directory: ice-demos/cpp
         run: |
+            # No IceBT on Windows
+            Remove-Item -Recurse -Force "IceBT"
+
             Get-ChildItem -Recurse -Filter CMakeLists.txt | ForEach-Object {
               $dir = $_.DirectoryName
               cmake -B "$dir/build" -S "$dir" -DIce_DEBUG=ON

cpp/IceBT/talk/CMakeLists.txt

@@ -0,0 +1,14 @@
+cmake_minimum_required(VERSION 3.16)
+
+project(icegrid_allocate CXX)
+
+include(../../cmake/common.cmake)
+
+if(NOT TARGET Ice::IceBT)
+    message(FATAL_ERROR "IceBT is not available")
+    return()
+endif()
+
+add_executable(app App.cpp Talk.ice)
+slice2cpp_generate(app)
+target_link_libraries(app Ice::Ice Ice::IceBT)

cpp/IceBT/talk/README.md

@@ -1,10 +1,19 @@
+# IceBT Talk
+
 This demo shows how to use [IceBT][1], the Bluetooth transport plug-in.
 The command-line program allows you to hold a peer-to-peer talk session
 with another device on Linux or Android.
 
-To run the demo, just start the program:
+To build the demo, run:
 
+```shell
+cmake -B build -S .
+cmake --build build --config Release
 ```
+
+To run the demo, just start the program:
+
+```shell
 talk
 ```
 

cpp/cmake/IceConfig.cmake

@@ -11,27 +11,6 @@ if (NOT EXISTS ${Ice_HOME})
   message(FATAL_ERROR "The specified Ice_HOME directory does not exist: ${Ice_HOME}")
 endif()
 
-# List of all available Ice components
-set(Ice_AVAILABLE_COMPONENTS DataStorm Glacier2 Ice IceBox IceGrid IceStorm)
-
-# IceBT is only available on Linux
-# TODO: Check for required dependency
-if(UNIX AND NOT APPLE)
-  list(APPEND Ice_AVAILABLE_COMPONENTS IceBT)
-endif()
-
-# Ensure Ice is always in the components list
-if(NOT "Ice" IN_LIST Ice_FIND_COMPONENTS)
-    list(APPEND Ice_FIND_COMPONENTS Ice)
-endif()
-
-# Ensure requested components are valid
-foreach(component ${Ice_FIND_COMPONENTS})
-    if(NOT component IN_LIST Ice_AVAILABLE_COMPONENTS)
-        message(FATAL_ERROR "Ice component '${component}' not found. Available: ${Ice_AVAILABLE_COMPONENTS}")
-    endif()
-endforeach()
-
 if(NOT DEFINED Ice_ARCHITECTURE)
   if (CMAKE_LIBRARY_ARCHITECTURE)
     set(Ice_ARCHITECTURE ${CMAKE_LIBRARY_ARCHITECTURE} CACHE STRING "Library architecture")

cpp/cmake/common.cmake

@@ -7,4 +7,5 @@ find_package(Threads REQUIRED)
 
 set(Ice_DIR ${CMAKE_CURRENT_LIST_DIR} CACHE PATH "Path to Ice CMake configuration file")
 
-find_package(Ice REQUIRED CONFIG COMPONENTS DataStorm Glacier2 IceGrid IceBox IceStorm)
+# IceBT is an optional component as it is not available in all distributions.
+find_package(Ice REQUIRED CONFIG COMPONENTS Ice DataStorm Glacier2 IceGrid IceBox IceStorm OPTIONAL_COMPONENTS IceBT)