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.

Sign up for GitHub

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

Jump to bottom

[CMake] Correcting last versions of CMake modules #194

Merged
merged 1 commit into from
Dec 19, 2022
Merged

[CMake] Correcting last versions of CMake modules #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions cmake/tools/FindMMG2D.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)

Expand Down Expand Up @@ -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)
6 changes: 3 additions & 3 deletions cmake/tools/FindMMG3D.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)

Expand Down Expand Up @@ -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)
6 changes: 3 additions & 3 deletions cmake/tools/FindMMGS.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)

Expand Down Expand Up @@ -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)