Skip to content
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

Merged

Conversation

cedricga91
Copy link
Contributor

@cedricga91 cedricga91 commented Nov 21, 2024

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 variable RLM_ROOT) à la place du module FlexLM et ajouter l'option -DPROTECTION=RLM à la commande cmake.

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.

module load RLM_LicenseAPI
export ARCANE_CONFIG_ENABLED_PACKAGES="FLEXLM"
cmake -DREMOVE_UID_ON_DETACH=ON -DCMAKE_DISABLE_FIND_PACKAGE_Xdmf=TRUE -DUSE_GTEST_DEATH_TEST=OFF -DUSE_GRAPH_CONNECTIVITY_POLICY=ON -DALIEN_BUILD_COMPONENT=all -DPROTECTION=RLM ..

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

Copy link

codecov bot commented Nov 21, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 70.26%. Comparing base (e156f5e) to head (141cd82).
Report is 218 commits behind head on main.

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.
📢 Have feedback on the report? Share it here.


🚨 Try these New Features:

@cedricga91 cedricga91 changed the title CMake : add support for rlm protection CMake : add support for RLM protection Nov 21, 2024
@cedricga91 cedricga91 requested a review from stdcm November 21, 2024 14:21
@cedricga91
Copy link
Contributor Author

@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)
Copy link
Member

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)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bonjour @stdcm, c'est fait.

@stdcm stdcm force-pushed the cmake/add-support-for-rlm-protection branch from 9c974a5 to d6083b4 Compare January 14, 2025 18:58
@stdcm stdcm force-pushed the cmake/add-support-for-rlm-protection branch from d6083b4 to 0297f10 Compare January 15, 2025 07:52
@stdcm stdcm marked this pull request as ready for review January 15, 2025 08:54
@stdcm stdcm merged commit f9e19ad into arcaneframework:main Jan 15, 2025
27 of 28 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants