Cleaning up.

agarny · May 30, 2024 · 2d52604 · 2d52604
2 parents f20ee11 + 6e972db
commit 2d52604
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 24 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -103,4 +103,4 @@ jobs:
           check_filenames: true
           skip: ./i18n,./res/flags,./res/ui.qrc,./src/3rdparty,./src/plugins/thirdParty/Python/scripts,./src/plugins/thirdParty/PythonPackages/scripts,*_fr.ts,*.out,*.xml
           exclude_file: .codespellexclude
-          ignore_words_list: filetests,pevent,pres,dependees
+          ignore_words_list: dependees,filetests,notin,pevent,pres,thirdParty,ThirdParty
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -164,19 +164,10 @@ endif()
 
 set(SILENTRUN ${PROJECT_BUILD_DIR}/silentrun)
 
-if(WIN32)
-    execute_process(COMMAND ${C_COMPILER} /O2 /Fe${SILENTRUN} ${CMAKE_SOURCE_DIR}/cmake/silentrun.c
-                    RESULT_VARIABLE RESULT OUTPUT_QUIET ERROR_QUIET)
-else()
-    if(APPLE)
-        set(INCLUDE_ARGUMENT -I ${CMAKE_OSX_SYSROOT}/usr/include)
-    endif()
-
-    execute_process(COMMAND ${C_COMPILER} -std=c99 -O3 ${INCLUDE_ARGUMENT} -o ${SILENTRUN} ${CMAKE_SOURCE_DIR}/cmake/silentrun.c
-                    RESULT_VARIABLE RESULT OUTPUT_QUIET ERROR_QUIET)
-endif()
+try_compile(SILENTRUN_EXE ${PROJECT_BUILD_DIR} ${CMAKE_SOURCE_DIR}/cmake/silentrun.c
+            COPY_FILE ${SILENTRUN})
 
-if(NOT RESULT EQUAL 0)
+if(NOT SILENTRUN_EXE)
     message(FATAL_ERROR "silentrun could not be built...")
 endif()
 
@@ -185,10 +176,10 @@ endif()
 if(NOT WIN32 AND NOT APPLE)
     set(RUNPATH2RPATH ${PROJECT_BUILD_DIR}/runpath2rpath)
 
-    execute_process(COMMAND ${C_COMPILER} -O3 -o ${RUNPATH2RPATH} ${CMAKE_SOURCE_DIR}/cmake/runpath2rpath.c
-                    RESULT_VARIABLE RESULT OUTPUT_QUIET ERROR_QUIET)
+    try_compile(RUNPATH2RPATH_EXE ${PROJECT_BUILD_DIR} ${CMAKE_SOURCE_DIR}/cmake/runpath2rpath.c
+                COPY_FILE ${RUNPATH2RPATH})
 
-    if(NOT RESULT EQUAL 0)
+    if(NOT RUNPATH2RPATH_EXE)
         message(FATAL_ERROR "runpath2rpath could not be built...")
     endif()
 endif()
@@ -231,12 +222,12 @@ else()
         find_program(CLCACHE clcache)
 
         if(CLCACHE)
-            set(CLCACHEWRAPPER ${PROJECT_BUILD_DIR}/clcachewrapper)
+            set(CLCACHEWRAPPER ${CMAKE_BINARY_DIR}/clcachewrapper)
 
-            execute_process(COMMAND ${C_COMPILER} /O2 /Fe${CLCACHEWRAPPER} ${CMAKE_SOURCE_DIR}/cmake/clcachewrapper.c
-                            RESULT_VARIABLE RESULT OUTPUT_QUIET ERROR_QUIET)
+            try_compile(CLCACHEWRAPPER_EXE ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/cmake/clcachewrapper.c
+                        COPY_FILE ${CLCACHEWRAPPER})
 
-            if(RESULT EQUAL 0)
+            if(CLCACHEWRAPPER_EXE)
                 set(CMAKE_C_COMPILER_LAUNCHER ${CLCACHEWRAPPER})
                 set(CMAKE_CXX_COMPILER_LAUNCHER ${CLCACHEWRAPPER})
                 set(COMPILER_LAUNCHER_NAME clcache)

diff --git a/src/plugins/editing/CellMLAnnotationView/i18n/CellMLAnnotationView_fr.ts b/src/plugins/editing/CellMLAnnotationView/i18n/CellMLAnnotationView_fr.ts
@@ -176,10 +176,6 @@
         <source>The subject of the referenced resource (&quot;Biological Entity B&quot;) is a version or an instance of the biological entity represented by the model element. This relation may be used to represent an isoform or modified form of a biological entity.</source>
         <translation>Le sujet dont la ressource est référencée (&quot;Biological Entity B&quot;) est une version ou une instance de l&apos;entité biologique représentée par l&apos;élément du modèle. Cette relation peut être utilisée pour représenter une isoforme ou forme modifiée d&apos;une entité biologique.</translation>
     </message>
-    <message>
-        <source>Identity</source>
-        <translation>Identité</translation>
-    </message>
     <message>
         <source>The biological entity represented by the model element has identity with the subject of the referenced resource (&quot;Biological Entity B&quot;). This relation might be used to link a reaction to its exact counterpart in a database, for instance.</source>
         <translation>L&apos;entité biologique représentée par l&apos;élément du modèle a identité avec le sujet dont la ressource est référencée (&quot;Biological Entity B&quot;). Cette relation pourrait être utilisée pour associer une réaction à son homologue exact dans une base de données, par exemple.</translation>