Skip to content

Commit da96c6d

Browse files
committed
iox-#2485 Force update dependent options
Use `set(... CACHE BOOL "" FORCE)` to ensure the cache is updated so these options are truly enabled
1 parent a22f16a commit da96c6d

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

doc/website/release-notes/iceoryx-unreleased.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@
160160
- Fix call to non-existing `getService` in channel.inl [#2426](https://github.com/eclipse-iceoryx/iceoryx/issues/2426)
161161
- Fix chunk management race condition causing failed management allocation [#2440](https://github.com/eclipse-iceoryx/iceoryx/issues/2440)
162162
- Fix compile error with GCC 8 [#2480](https://github.com/eclipse-iceoryx/iceoryx/issues/2480)
163+
- Fix cmake cache inconsistency [#2485](https://github.com/eclipse-iceoryx/iceoryx/issues/2485)
163164

164165
**Refactoring:**
165166

iceoryx_meta/build_options.cmake

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,21 +44,21 @@ option(IOX_ROUDI_DEFAULT_MONITORING_MODE "Enable roudi monitoring mode by defaul
4444
set(CMAKE_EXPORT_COMPILE_COMMANDS ON) # "Create compile_commands.json file"
4545

4646
if(BUILD_ALL)
47-
set(EXAMPLES ON)
48-
set(BUILD_TEST ON)
49-
set(INTROSPECTION ON)
50-
set(BINDING_C ON)
47+
set(EXAMPLES ON CACHE BOOL "" FORCE)
48+
set(BUILD_TEST ON CACHE BOOL "" FORCE)
49+
set(INTROSPECTION ON CACHE BOOL "" FORCE)
50+
set(BINDING_C ON CACHE BOOL "" FORCE)
5151
endif()
5252

5353
## must be before the BUILD_TEST check
5454
if(COVERAGE AND NOT BUILD_TEST)
55-
set(BUILD_TEST ON)
55+
set(BUILD_TEST ON CACHE BOOL "" FORCE)
5656
set(BUILD_TEST_HINT "${BUILD_TEST_HINT} (activated by COVERAGE=ON)")
5757
endif()
5858

5959
if(BUILD_TEST AND NOT ROUDI_ENVIRONMENT)
6060
set(ROUDI_ENV_HINT "${ROUDI_ENV_HINT} (activated by BUILD_TEST=ON)")
61-
set(ROUDI_ENVIRONMENT ON)
61+
set(ROUDI_ENVIRONMENT ON CACHE BOOL "" FORCE)
6262
endif()
6363

6464
if(CCACHE)

0 commit comments

Comments
 (0)