Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

iox-#1176 Fix ACL feature flag for cmake builds #2362

Merged
merged 1 commit into from
Oct 15, 2024
Merged

iox-#1176 Fix ACL feature flag for cmake builds #2362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions iceoryx_platform/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
10 changes: 3 additions & 7 deletions iceoryx_platform/freertos/cmake/IceoryxPlatformDeployment.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: >>>>>>>>>>>>>>")
12 changes: 2 additions & 10 deletions iceoryx_platform/linux/cmake/IceoryxPlatformDeployment.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: >>>>>>>>>>>>>>")
10 changes: 3 additions & 7 deletions iceoryx_platform/mac/cmake/IceoryxPlatformDeployment.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: >>>>>>>>>>>>>>")
12 changes: 2 additions & 10 deletions iceoryx_platform/qnx/cmake/IceoryxPlatformDeployment.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: >>>>>>>>>>>>>>")
10 changes: 3 additions & 7 deletions iceoryx_platform/unix/cmake/IceoryxPlatformDeployment.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: >>>>>>>>>>>>>>")
10 changes: 3 additions & 7 deletions iceoryx_platform/win/cmake/IceoryxPlatformDeployment.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: >>>>>>>>>>>>>>")
Loading