Merge pull request #2362 from elBoberido/iox-1176-fix-acl-feature-fla…

…g-for-cmake iox-#1176 Fix ACL feature flag for cmake builds
eclipse-iceoryx · Oct 15, 2024 · 8d9324b · 8d9324b
2 parents 361030e + 05959a1
commit 8d9324b
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 50 deletions.
diff --git a/iceoryx_platform/CMakeLists.txt b/iceoryx_platform/CMakeLists.txt
@@ -73,10 +73,12 @@ file ( GLOB_RECURSE ICEORYX_PLATFORM_FILES
     ${ICEORYX_PLATFORM}/source/*.cpp
 )
 
-
-set(ACL_LIB)
 if(IOX_PLATFORM_FEATURE_ACL)
+    set(IOX_CFG_FEATURE_ACL "1")
     set(ACL_LIB acl)
+else()
+    set(IOX_CFG_FEATURE_ACL "0")
+    set(ACL_LIB)
 endif()
 
 iox_add_library(

diff --git a/iceoryx_platform/freertos/cmake/IceoryxPlatformDeployment.cmake b/iceoryx_platform/freertos/cmake/IceoryxPlatformDeployment.cmake
@@ -34,15 +34,11 @@ configure_option(
     DEFAULT_VALUE "/tmp/"
 )
 
-configure_option(
-    NAME IOX_PLATFORM_FEATURE_ACL
-    DEFAULT_VALUE OFF
-)
+option(IOX_PLATFORM_FEATURE_ACL "Use ACLs for access control" OFF)
+message(STATUS "[i] IOX_PLATFORM_FEATURE_ACL: ${IOX_PLATFORM_FEATURE_ACL}")
 
 if(IOX_PLATFORM_FEATURE_ACL)
-     message(FATAL_ERROR "ACLs are not supported on this platform! Don't use 'IOX_PLATFORM_FEATURE_ACL=ON'")
-else()
-     set(IOX_CFG_FEATURE_ACL "0")
+    message(FATAL_ERROR "ACLs are not supported on this platform! Don't use 'IOX_PLATFORM_FEATURE_ACL=ON'")
 endif()
 
 message(STATUS "[i] <<<<<<<<<<<<<< End iceoryx_platform configuration: >>>>>>>>>>>>>>")
diff --git a/iceoryx_platform/linux/cmake/IceoryxPlatformDeployment.cmake b/iceoryx_platform/linux/cmake/IceoryxPlatformDeployment.cmake
@@ -34,15 +34,7 @@ configure_option(
     DEFAULT_VALUE "/tmp/"
 )
 
-configure_option(
-    NAME IOX_PLATFORM_FEATURE_ACL
-    DEFAULT_VALUE ON
-)
-
-if(IOX_PLATFORM_FEATURE_ACL)
-     set(IOX_CFG_FEATURE_ACL "1")
-else()
-     set(IOX_CFG_FEATURE_ACL "0")
-endif()
+option(IOX_PLATFORM_FEATURE_ACL "Use ACLs for access control" ON)
+message(STATUS "[i] IOX_PLATFORM_FEATURE_ACL: ${IOX_PLATFORM_FEATURE_ACL}")
 
 message(STATUS "[i] <<<<<<<<<<<<<< End iceoryx_platform configuration: >>>>>>>>>>>>>>")
diff --git a/iceoryx_platform/mac/cmake/IceoryxPlatformDeployment.cmake b/iceoryx_platform/mac/cmake/IceoryxPlatformDeployment.cmake
@@ -34,15 +34,11 @@ configure_option(
     DEFAULT_VALUE "/tmp/"
 )
 
-configure_option(
-    NAME IOX_PLATFORM_FEATURE_ACL
-    DEFAULT_VALUE OFF
-)
+option(IOX_PLATFORM_FEATURE_ACL "Use ACLs for access control" OFF)
+message(STATUS "[i] IOX_PLATFORM_FEATURE_ACL: ${IOX_PLATFORM_FEATURE_ACL}")
 
 if(IOX_PLATFORM_FEATURE_ACL)
-     message(FATAL_ERROR "ACLs are not supported on this platform! Don't use 'IOX_PLATFORM_FEATURE_ACL=ON'")
-else()
-     set(IOX_CFG_FEATURE_ACL "0")
+    message(FATAL_ERROR "ACLs are not supported on this platform! Don't use 'IOX_PLATFORM_FEATURE_ACL=ON'")
 endif()
 
 message(STATUS "[i] <<<<<<<<<<<<<< End iceoryx_platform configuration: >>>>>>>>>>>>>>")
diff --git a/iceoryx_platform/qnx/cmake/IceoryxPlatformDeployment.cmake b/iceoryx_platform/qnx/cmake/IceoryxPlatformDeployment.cmake
@@ -34,15 +34,7 @@ configure_option(
     DEFAULT_VALUE "/tmp/"
 )
 
-configure_option(
-    NAME IOX_PLATFORM_FEATURE_ACL
-    DEFAULT_VALUE ON
-)
-
-if(IOX_PLATFORM_FEATURE_ACL)
-     set(IOX_CFG_FEATURE_ACL "1")
-else()
-     set(IOX_CFG_FEATURE_ACL "0")
-endif()
+option(IOX_PLATFORM_FEATURE_ACL "Use ACLs for access control" ON)
+message(STATUS "[i] IOX_PLATFORM_FEATURE_ACL: ${IOX_PLATFORM_FEATURE_ACL}")
 
 message(STATUS "[i] <<<<<<<<<<<<<< End iceoryx_platform configuration: >>>>>>>>>>>>>>")
diff --git a/iceoryx_platform/unix/cmake/IceoryxPlatformDeployment.cmake b/iceoryx_platform/unix/cmake/IceoryxPlatformDeployment.cmake
@@ -34,15 +34,11 @@ configure_option(
     DEFAULT_VALUE "/tmp/"
 )
 
-configure_option(
-    NAME IOX_PLATFORM_FEATURE_ACL
-    DEFAULT_VALUE OFF
-)
+option(IOX_PLATFORM_FEATURE_ACL "Use ACLs for access control" OFF)
+message(STATUS "[i] IOX_PLATFORM_FEATURE_ACL: ${IOX_PLATFORM_FEATURE_ACL}")
 
 if(IOX_PLATFORM_FEATURE_ACL)
-     message(FATAL_ERROR "ACLs are not supported on this platform! Don't use 'IOX_PLATFORM_FEATURE_ACL=ON'")
-else()
-     set(IOX_CFG_FEATURE_ACL "0")
+    message(FATAL_ERROR "ACLs are not supported on this platform! Don't use 'IOX_PLATFORM_FEATURE_ACL=ON'")
 endif()
 
 message(STATUS "[i] <<<<<<<<<<<<<< End iceoryx_platform configuration: >>>>>>>>>>>>>>")
diff --git a/iceoryx_platform/win/cmake/IceoryxPlatformDeployment.cmake b/iceoryx_platform/win/cmake/IceoryxPlatformDeployment.cmake
@@ -35,15 +35,11 @@ configure_option(
     DEFAULT_VALUE ""
 )
 
-configure_option(
-    NAME IOX_PLATFORM_FEATURE_ACL
-    DEFAULT_VALUE OFF
-)
+option(IOX_PLATFORM_FEATURE_ACL "Use ACLs for access control" OFF)
+message(STATUS "[i] IOX_PLATFORM_FEATURE_ACL: ${IOX_PLATFORM_FEATURE_ACL}")
 
 if(IOX_PLATFORM_FEATURE_ACL)
-     message(FATAL_ERROR "ACLs are not supported on this platform! Don't use 'IOX_PLATFORM_FEATURE_ACL=ON'")
-else()
-     set(IOX_CFG_FEATURE_ACL "0")
+    message(FATAL_ERROR "ACLs are not supported on this platform! Don't use 'IOX_PLATFORM_FEATURE_ACL=ON'")
 endif()
 
 message(STATUS "[i] <<<<<<<<<<<<<< End iceoryx_platform configuration: >>>>>>>>>>>>>>")