Restrict regular expression on main as well

LuigiGiuffrida98 · Mar 16, 2024 · 849539d · 849539d
1 parent 9d9308b
commit 849539d
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/sw/CMakeLists.txt b/sw/CMakeLists.txt
@@ -128,10 +128,10 @@ FOREACH(file_path IN LISTS new_list)
     SET(add 1)
   elseif( ${file_path} MATCHES "${SOURCE_PATH}external/" )
     SET(add 1)
-  elseif( ( ${file_path} MATCHES "${SOURCE_PATH}applications/${PROJECT}/" ) AND ( NOT ${file_path} MATCHES ${MAINFILE} ) )
-    SET(add 1)
-    elseif( ( ${file_path} MATCHES "${SOURCE_PATH}applications/${PROJECT}/" ) AND ( ${file_path} MATCHES ${MAINFILE} ) )
+  elseif( ${file_path} MATCHES "${SOURCE_PATH}applications/${PROJECT}/.*${MAINFILE}\." ) # look for main.*
     SET(app_found 1)
+  elseif( ${file_path} MATCHES "${SOURCE_PATH}applications/${PROJECT}/" ) # other sources
+    SET(add 1)
   endif()
 
   if( add EQUAL 1 ) # If the file path mathced one of the criterion, add it to the list
@@ -155,7 +155,7 @@ if( app_found EQUAL 0 )
     SET(add 0) # This variable is set to 1 if the file_pth needs to be added to the list
     if(${file_path} MATCHES "${ROOT_PROJECT}device/")
       SET(add 1)
-    elseif( ( ${file_path} MATCHES "${ROOT_PROJECT}/applications/${PROJECT}/" ) AND ( NOT ${file_path} MATCHES ${MAINFILE} ) )
+    elseif( ( ${file_path} MATCHES "${ROOT_PROJECT}/applications/${PROJECT}/" ) AND ( NOT ${file_path} MATCHES "${ROOT_PROJECT}applications/${PROJECT}/.*${MAINFILE}\." ) )
       SET(add 1)
     endif()