Skip to content

Commit 8d9324b

Browse files
elBoberidoelBoberido
authored
Merge pull request #2362 from elBoberido/iox-1176-fix-acl-feature-flag-for-cmake
iox-#1176 Fix ACL feature flag for cmake builds
2 parents 361030e + 05959a1 commit 8d9324b

File tree

7 files changed

+20
-50
lines changed

7 files changed

+20
-50
lines changed

‎iceoryx_platform/CMakeLists.txt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,12 @@ file ( GLOB_RECURSE ICEORYX_PLATFORM_FILES
7373
${ICEORYX_PLATFORM}/source/*.cpp
7474
)
7575

76-
77-
set(ACL_LIB)
7876
if(IOX_PLATFORM_FEATURE_ACL)
77+
set(IOX_CFG_FEATURE_ACL "1")
7978
set(ACL_LIB acl)
79+
else()
80+
set(IOX_CFG_FEATURE_ACL "0")
81+
set(ACL_LIB)
8082
endif()
8183

8284
iox_add_library(

‎iceoryx_platform/freertos/cmake/IceoryxPlatformDeployment.cmake‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,11 @@ configure_option(
3434
DEFAULT_VALUE "/tmp/"
3535
)
3636

37-
configure_option(
38-
NAME IOX_PLATFORM_FEATURE_ACL
39-
DEFAULT_VALUE OFF
40-
)
37+
option(IOX_PLATFORM_FEATURE_ACL "Use ACLs for access control" OFF)
38+
message(STATUS "[i] IOX_PLATFORM_FEATURE_ACL: ${IOX_PLATFORM_FEATURE_ACL}")
4139

4240
if(IOX_PLATFORM_FEATURE_ACL)
43-
message(FATAL_ERROR "ACLs are not supported on this platform! Don't use 'IOX_PLATFORM_FEATURE_ACL=ON'")
44-
else()
45-
set(IOX_CFG_FEATURE_ACL "0")
41+
message(FATAL_ERROR "ACLs are not supported on this platform! Don't use 'IOX_PLATFORM_FEATURE_ACL=ON'")
4642
endif()
4743

4844
message(STATUS "[i] <<<<<<<<<<<<<< End iceoryx_platform configuration: >>>>>>>>>>>>>>")

‎iceoryx_platform/linux/cmake/IceoryxPlatformDeployment.cmake‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,7 @@ configure_option(
3434
DEFAULT_VALUE "/tmp/"
3535
)
3636

37-
configure_option(
38-
NAME IOX_PLATFORM_FEATURE_ACL
39-
DEFAULT_VALUE ON
40-
)
41-
42-
if(IOX_PLATFORM_FEATURE_ACL)
43-
set(IOX_CFG_FEATURE_ACL "1")
44-
else()
45-
set(IOX_CFG_FEATURE_ACL "0")
46-
endif()
37+
option(IOX_PLATFORM_FEATURE_ACL "Use ACLs for access control" ON)
38+
message(STATUS "[i] IOX_PLATFORM_FEATURE_ACL: ${IOX_PLATFORM_FEATURE_ACL}")
4739

4840
message(STATUS "[i] <<<<<<<<<<<<<< End iceoryx_platform configuration: >>>>>>>>>>>>>>")

‎iceoryx_platform/mac/cmake/IceoryxPlatformDeployment.cmake‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,11 @@ configure_option(
3434
DEFAULT_VALUE "/tmp/"
3535
)
3636

37-
configure_option(
38-
NAME IOX_PLATFORM_FEATURE_ACL
39-
DEFAULT_VALUE OFF
40-
)
37+
option(IOX_PLATFORM_FEATURE_ACL "Use ACLs for access control" OFF)
38+
message(STATUS "[i] IOX_PLATFORM_FEATURE_ACL: ${IOX_PLATFORM_FEATURE_ACL}")
4139

4240
if(IOX_PLATFORM_FEATURE_ACL)
43-
message(FATAL_ERROR "ACLs are not supported on this platform! Don't use 'IOX_PLATFORM_FEATURE_ACL=ON'")
44-
else()
45-
set(IOX_CFG_FEATURE_ACL "0")
41+
message(FATAL_ERROR "ACLs are not supported on this platform! Don't use 'IOX_PLATFORM_FEATURE_ACL=ON'")
4642
endif()
4743

4844
message(STATUS "[i] <<<<<<<<<<<<<< End iceoryx_platform configuration: >>>>>>>>>>>>>>")

‎iceoryx_platform/qnx/cmake/IceoryxPlatformDeployment.cmake‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,7 @@ configure_option(
3434
DEFAULT_VALUE "/tmp/"
3535
)
3636

37-
configure_option(
38-
NAME IOX_PLATFORM_FEATURE_ACL
39-
DEFAULT_VALUE ON
40-
)
41-
42-
if(IOX_PLATFORM_FEATURE_ACL)
43-
set(IOX_CFG_FEATURE_ACL "1")
44-
else()
45-
set(IOX_CFG_FEATURE_ACL "0")
46-
endif()
37+
option(IOX_PLATFORM_FEATURE_ACL "Use ACLs for access control" ON)
38+
message(STATUS "[i] IOX_PLATFORM_FEATURE_ACL: ${IOX_PLATFORM_FEATURE_ACL}")
4739

4840
message(STATUS "[i] <<<<<<<<<<<<<< End iceoryx_platform configuration: >>>>>>>>>>>>>>")

‎iceoryx_platform/unix/cmake/IceoryxPlatformDeployment.cmake‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,11 @@ configure_option(
3434
DEFAULT_VALUE "/tmp/"
3535
)
3636

37-
configure_option(
38-
NAME IOX_PLATFORM_FEATURE_ACL
39-
DEFAULT_VALUE OFF
40-
)
37+
option(IOX_PLATFORM_FEATURE_ACL "Use ACLs for access control" OFF)
38+
message(STATUS "[i] IOX_PLATFORM_FEATURE_ACL: ${IOX_PLATFORM_FEATURE_ACL}")
4139

4240
if(IOX_PLATFORM_FEATURE_ACL)
43-
message(FATAL_ERROR "ACLs are not supported on this platform! Don't use 'IOX_PLATFORM_FEATURE_ACL=ON'")
44-
else()
45-
set(IOX_CFG_FEATURE_ACL "0")
41+
message(FATAL_ERROR "ACLs are not supported on this platform! Don't use 'IOX_PLATFORM_FEATURE_ACL=ON'")
4642
endif()
4743

4844
message(STATUS "[i] <<<<<<<<<<<<<< End iceoryx_platform configuration: >>>>>>>>>>>>>>")

‎iceoryx_platform/win/cmake/IceoryxPlatformDeployment.cmake‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,11 @@ configure_option(
3535
DEFAULT_VALUE ""
3636
)
3737

38-
configure_option(
39-
NAME IOX_PLATFORM_FEATURE_ACL
40-
DEFAULT_VALUE OFF
41-
)
38+
option(IOX_PLATFORM_FEATURE_ACL "Use ACLs for access control" OFF)
39+
message(STATUS "[i] IOX_PLATFORM_FEATURE_ACL: ${IOX_PLATFORM_FEATURE_ACL}")
4240

4341
if(IOX_PLATFORM_FEATURE_ACL)
44-
message(FATAL_ERROR "ACLs are not supported on this platform! Don't use 'IOX_PLATFORM_FEATURE_ACL=ON'")
45-
else()
46-
set(IOX_CFG_FEATURE_ACL "0")
42+
message(FATAL_ERROR "ACLs are not supported on this platform! Don't use 'IOX_PLATFORM_FEATURE_ACL=ON'")
4743
endif()
4844

4945
message(STATUS "[i] <<<<<<<<<<<<<< End iceoryx_platform configuration: >>>>>>>>>>>>>>")

0 commit comments

Comments
 (0)