-
Notifications
You must be signed in to change notification settings - Fork 14
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.
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
CMake : add support for RLM protection #1780
base: main
Are you sure you want to change the base?
CMake : add support for RLM protection #1780
Conversation
export ARCANE_CONFIG_ENABLED_PACKAGES="FLEXLM" cmake -DPROTECTION=RLM .. Default value for Protection is FLEXLM.
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #1780 +/- ##
==========================================
+ Coverage 70.15% 70.26% +0.10%
==========================================
Files 2256 2258 +2
Lines 161018 162285 +1267
Branches 18571 18694 +123
==========================================
+ Hits 112969 114036 +1067
- Misses 41328 41479 +151
- Partials 6721 6770 +49 ☔ View full report in Codecov by Sentry. 🚨 Try these New Features:
|
@stdcm : si tu as des remarques, n'hésite pas. |
# - arcane/src/arcane/impl/FlexLMTools.h | ||
# - arcane/src/arcane/impl/FlexLMTools.cc | ||
if("${FLEXLM_PROTECTION_NAME}" STREQUAL "RLM") | ||
ADD_DEFINITIONS(-DARCANE_TEST_RLM) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
il faudrait déplacer cet ajout de définition dans le cmake de arcane_impl : arcane/src/arcane/impl/CMakeLists.txt et écrire plutôt, dans la section if (FLEXLM_FOUND)
avec un target_compile_definition
:
target_compile_definition(arcane_impl PUBLIC ARCANE_TEST_RLM)
La procédure d'installation avec la protection FlexLM ne change pas.
Pour réaliser l'installation avec la protection RLM, il faut charger le module
RLM_LIcenseAPI
(qui fournit la variableRLM_ROOT
) à la place du module FlexLM et ajouter l'option-DPROTECTION=RLM
à la commandecmake
.On garde
FLEXLM
comme nom de paquet pour ne pas casser la compatibilité avec les applications déjà existantes basées sur le framework Arcane.A noter que la défintion
ARCANE_TEST_RLM
devra être supprimée des fichiers suivants le moment voulu :arcane/CMakeLists.txt
arcane/src/arcane/impl/FlexLMTools.cc
arcane/src/arcane/impl/FlexLMTools.h