Merge pull request #194 from loumalouomega/master

[CMake] Correcting last versions of CMake modules
MmgTools · Dec 19, 2022 · adf56d6 · adf56d6
2 parents b2e3075 + 2f5ea39
commit adf56d6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/cmake/tools/FindMMG2D.cmake b/cmake/tools/FindMMG2D.cmake
@@ -91,6 +91,7 @@ if(MMG_INCDIR)
     NAMES libmmgtypes.h
     HINTS ${MMG_INCDIR}
     PATH_SUFFIXES "mmg/mmg2d" "mmg2d")
+else()
   if(MMG_DIR)
     set(MMG2D_libmmgtypes.h_DIRS "MMG2D_libmmgtypes.h_DIRS-NOTFOUND")
     find_path(MMG2D_libmmgtypes.h_DIRS
@@ -105,8 +106,7 @@ if(MMG_INCDIR)
       PATH_SUFFIXES  "mmg" "mmg/common")
   endif()
 endif()
-STRING(REGEX REPLACE "(mmg/mmg2d)|(mmg/common)" ""
-  MMG2D_libmmgtypes.h_DIRS ${MMG2D_libmmgtypes.h_DIRS} )
+STRING(REGEX REPLACE "(mmg/mmg2d)|(mmg/common)" "" MMG2D_libmmgtypes.h_DIRS "${MMG2D_libmmgtypes.h_DIRS}")
 
 mark_as_advanced(MMG2D_libmmgtypes.h_DIRS)
 
@@ -257,4 +257,4 @@ mark_as_advanced(MMG_DIR_FOUND)
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(MMG2D DEFAULT_MSG
   MMG2D_LIBRARIES
-  MMG2D_WORKS)
+  MMG2D_WORKS)
diff --git a/cmake/tools/FindMMG3D.cmake b/cmake/tools/FindMMG3D.cmake
@@ -91,6 +91,7 @@ if(MMG_INCDIR)
     NAMES libmmgtypes.h
     HINTS ${MMG_INCDIR}
     PATH_SUFFIXES "mmg/mmg3d" "mmg3d")
+else()
   if(MMG_DIR)
     set(MMG3D_libmmgtypes.h_DIRS "MMG3D_libmmgtypes.h_DIRS-NOTFOUND")
     find_path(MMG3D_libmmgtypes.h_DIRS
@@ -105,8 +106,7 @@ if(MMG_INCDIR)
       PATH_SUFFIXES  "mmg" "mmg/common")
   endif()
 endif()
-STRING(REGEX REPLACE "(mmg/mmg3d)|(mmg/common)" ""
-  MMG3D_libmmgtypes.h_DIRS ${MMG3D_libmmgtypes.h_DIRS} )
+STRING(REGEX REPLACE "(mmg/mmg3d)|(mmg/common)" "" MMG3D_libmmgtypes.h_DIRS "${MMG3D_libmmgtypes.h_DIRS}" )
 
 mark_as_advanced(MMG3D_libmmgtypes.h_DIRS)
 
@@ -257,4 +257,4 @@ mark_as_advanced(MMG_DIR_FOUND)
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(MMG3D DEFAULT_MSG
   MMG3D_LIBRARIES
-  MMG3D_WORKS)
+  MMG3D_WORKS)
diff --git a/cmake/tools/FindMMGS.cmake b/cmake/tools/FindMMGS.cmake
@@ -91,6 +91,7 @@ if(MMG_INCDIR)
     NAMES libmmgtypes.h
     HINTS ${MMG_INCDIR}
     PATH_SUFFIXES "mmg/mmgs" "mmgs")
+else()
   if(MMG_DIR)
     set(MMGS_libmmgtypes.h_DIRS "MMGS_libmmgtypes.h_DIRS-NOTFOUND")
     find_path(MMGS_libmmgtypes.h_DIRS
@@ -105,8 +106,7 @@ if(MMG_INCDIR)
       PATH_SUFFIXES  "mmg" "mmg/common")
   endif()
 endif()
-STRING(REGEX REPLACE "(mmg/mmgs)|(mmg/common)" ""
-  MMGS_libmmgtypes.h_DIRS ${MMGS_libmmgtypes.h_DIRS} )
+STRING(REGEX REPLACE "(mmg/mmgs)|(mmg/common)" "" MMGS_libmmgtypes.h_DIRS "${MMGS_libmmgtypes.h_DIRS}" )
 
 mark_as_advanced(MMGS_libmmgtypes.h_DIRS)
 
@@ -257,4 +257,4 @@ mark_as_advanced(MMG_DIR_FOUND)
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(MMGS DEFAULT_MSG
   MMGS_LIBRARIES
-  MMGS_WORKS)
+  MMGS_WORKS)