Skip to content

Commit

Permalink
Update subproject references, set C++ standard to C++17 for oRatioLib…
Browse files Browse the repository at this point in the history
…, and modify default case handling in solver_api
  • Loading branch information
riccardodebenedictis committed Nov 11, 2024
1 parent 3d3df76 commit 6e4d0f9
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ add_subdirectory(extern/riddle)
add_subdirectory(extern/semitone)

add_library(oRatioLib src/solver.cpp src/graph.cpp src/flaw.cpp src/resolver.cpp src/smart_type.cpp src/flaws/atom_flaw.cpp src/flaws/bool_flaw.cpp src/flaws/disj_flaw.cpp src/flaws/disjunction_flaw.cpp src/flaws/enum_flaw.cpp src/types/agent.cpp src/types/state_variable.cpp src/types/consumable_resource.cpp src/types/reusable_resource.cpp $<$<BOOL:${ENABLE_API}>:${CMAKE_CURRENT_SOURCE_DIR}/src/solver_api.cpp>)
target_compile_features(oRatioLib PUBLIC cxx_std_17)
add_dependencies(oRatioLib RiDDLe SeMiTONE)
target_link_libraries(oRatioLib PUBLIC RiDDLe SeMiTONE)
target_include_directories(oRatioLib PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/flaws> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/types> $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>)
Expand Down
2 changes: 1 addition & 1 deletion extern/riddle
Submodule riddle updated 1 files
+1 −0 CMakeLists.txt
2 changes: 1 addition & 1 deletion extern/semitone
Submodule semitone updated 1 files
+6 −4 src/ov/ov_theory.cpp
3 changes: 1 addition & 2 deletions src/solver_api.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -280,10 +280,9 @@ namespace ratio
return "active";
case utils::False:
return "forbidden";
case utils::Undefined:
default:
return "inactive";
}
assert(false);
}

[[nodiscard]] json::json to_json(const resolver &r) noexcept
Expand Down

0 comments on commit 6e4d0f9

Please sign in to comment.