Skip to content

Commit

Permalink
Fix problem setting property on P4OVS_MODE (#698)
Browse files Browse the repository at this point in the history
- Moved the set_property() for the STRINGS property on P4OVS_MODE
  after its definition. This fixes a CMake configuration error
  that cropped up in the Tofino build.

Signed-off-by: Derek Foster <[email protected]>
  • Loading branch information
ffoulkes authored Oct 25, 2024
1 parent 46aab66 commit dd5fd8d
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,12 @@ endif()
# OVS build mode #
##################

set_property(CACHE P4OVS_MODE PROPERTY STRINGS
"NONE;P4OVS;OVSP4RT;STUBS")

set(P4OVS_MODE "p4ovs" CACHE STRING "P4OVS build mode")
string(TOLOWER "${P4OVS_MODE}" P4OVS_MODE)

set_property(CACHE P4OVS_MODE PROPERTY STRINGS
"NONE;P4OVS;OVSP4RT;STUBS")

if(NOT WITH_OVSP4RT OR P4OVS_MODE STREQUAL "none")
unset(WITH_OVSP4RT)
set(WITH_OVSP4RT OFF CACHE STRING "" FORCE)
Expand Down

0 comments on commit dd5fd8d

Please sign in to comment.