Skip to content

Commit

Permalink
Fix issue with fortran headers installation when perls is not found […
Browse files Browse the repository at this point in the history
…skip ci].
  • Loading branch information
Algiane committed Dec 13, 2022
1 parent f6a715b commit 9eea7ec
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 14 deletions.
27 changes: 18 additions & 9 deletions cmake/modules/mmg.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -89,23 +89,28 @@ IF ( LIBMMG_STATIC OR LIBMMG_SHARED )
SET( mmg2d_headers
${MMG2D_SOURCE_DIR}/mmg2d_export.h
${MMG2D_SOURCE_DIR}/libmmg2d.h
${MMG2D_BINARY_DIR}/libmmg2df.h
)
SET( mmg3d_headers
${MMG3D_SOURCE_DIR}/mmg3d_export.h
${MMG3D_SOURCE_DIR}/libmmg3d.h
${MMG3D_BINARY_DIR}/libmmg3df.h
)
SET( mmgs_headers
${MMGS_SOURCE_DIR}/mmgs_export.h
${MMGS_SOURCE_DIR}/libmmgs.h
${MMGS_BINARY_DIR}/libmmgsf.h
)
SET( mmg_headers
# ${PROJECT_SOURCE_DIR}/src/common/mmg_core_export.h
${PROJECT_SOURCE_DIR}/src/mmg/libmmg.h
${PROJECT_SOURCE_DIR}/src/mmg/libmmgf.h
${PROJECT_SOURCE_DIR}/src/mmg/libmmg.h
)

IF ( PERL_FOUND )
LIST ( APPEND mmg3d_headers ${MMG3D_BINARY_DIR}/libmmg3df.h )
LIST ( APPEND mmg2d_headers ${MMG2D_BINARY_DIR}/libmmg2df.h )
LIST ( APPEND mmgs_headers ${MMGS_BINARY_DIR}/libmmgsf.h )
LIST ( APPEND mmg_headers ${PROJECT_SOURCE_DIR}/libmmgf.h )
ENDIF()


SET(MMG2D_INCLUDE ${PROJECT_BINARY_DIR}/include/mmg/mmg2d )
SET(MMGS_INCLUDE ${PROJECT_BINARY_DIR}/include/mmg/mmgs )
SET(MMG3D_INCLUDE ${PROJECT_BINARY_DIR}/include/mmg/mmg3d )
Expand All @@ -122,7 +127,9 @@ IF ( LIBMMG_STATIC OR LIBMMG_SHARED )
INSTALL(FILES ${mmg3d_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mmg/mmg3d)
INSTALL(FILES ${mmg_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mmg)

FILE(INSTALL ${PROJECT_SOURCE_DIR}/src/mmg/libmmgf.h DESTINATION ${PROJECT_BINARY_DIR}/include/mmg/)
IF ( PERL_FOUND )
FILE(INSTALL ${PROJECT_SOURCE_DIR}/src/mmg/libmmgf.h DESTINATION ${PROJECT_BINARY_DIR}/include/mmg/)
ENDIF()

# Install header files in project directory
FILE(INSTALL ${mmg2d_headers}
Expand All @@ -138,12 +145,14 @@ IF ( LIBMMG_STATIC OR LIBMMG_SHARED )
DESTINATION ${PROJECT_BINARY_DIR}/include/mmg/
PATTERN "libmmg*f.h" EXCLUDE)

set ( mmg_tgt_list ${PROJECT_BINARY_DIR}/include/mmg/libmmg.h )
IF ( PERL_FOUND )
list ( APPEND mmg_tgt_list ${PROJECT_BINARY_DIR}/include/mmg/libmmgf.h)
ENDIF( )

ADD_CUSTOM_TARGET(copy_mmg_headers ALL
DEPENDS
copy_2d_headers copy_s_headers copy_3d_headers
${PROJECT_BINARY_DIR}/include/mmg/libmmgf.h
${PROJECT_BINARY_DIR}/include/mmg/libmmg.h
copy_2d_headers copy_s_headers copy_3d_headers mmg_tgt_lit
)

ENDIF()
Expand Down
5 changes: 4 additions & 1 deletion cmake/modules/mmg2d.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,12 @@ ENDIF ( )
SET( mmg2d_headers
${MMG2D_SOURCE_DIR}/mmg2d_export.h
${MMG2D_SOURCE_DIR}/libmmg2d.h
${MMG2D_BINARY_DIR}/libmmg2df.h
)

IF ( PERL_FOUND )
LIST ( APPEND mmg2d_headers ${MMG2D_BINARY_DIR}/libmmg2df.h )
ENDIF()

IF ( MMG_INSTALL_PRIVATE_HEADERS )
LIST ( APPEND mmg2d_headers
${MMG2D_SOURCE_DIR}/libmmg2d_private.h
Expand Down
5 changes: 4 additions & 1 deletion cmake/modules/mmg3d.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -144,9 +144,12 @@ ENDIF()
SET( mmg3d_headers
${MMG3D_SOURCE_DIR}/mmg3d_export.h
${MMG3D_SOURCE_DIR}/libmmg3d.h
${MMG3D_BINARY_DIR}/libmmg3df.h
)

IF ( PERL_FOUND )
LIST ( APPEND mmg3d_headers ${MMG3D_BINARY_DIR}/libmmg3df.h )
ENDIF()

IF ( MMG_INSTALL_PRIVATE_HEADERS )
LIST ( APPEND mmg3d_headers
${MMG3D_SOURCE_DIR}/libmmg3d_private.h
Expand Down
7 changes: 5 additions & 2 deletions cmake/modules/mmgcommon.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,15 @@ SET(MMGCOMMON_INCLUDE ${PROJECT_BINARY_DIR}/include/${MMGCOMMON_SHRT_INC
SET( mmgcommon_headers
${MMGCOMMON_SOURCE_DIR}/mmg_export.h
${MMGCOMMON_SOURCE_DIR}/libmmgtypes.h
${MMGCOMMON_BINARY_DIR}/libmmgtypesf.h
${MMGCOMMON_BINARY_DIR}/mmgcmakedefines.h
${MMGCOMMON_BINARY_DIR}/mmgcmakedefinesf.h
${MMGCOMMON_BINARY_DIR}/mmgversion.h
)

IF ( PERL_FOUND )
LIST ( APPEND mmgcommon_headers ${MMGCOMMON_BINARY_DIR}/libmmgtypesf.h )
ENDIF ( )

IF ( MMG_INSTALL_PRIVATE_HEADERS )
LIST ( APPEND mmgcommon_headers
${MMGCOMMON_SOURCE_DIR}/libmmgcommon_private.h
Expand All @@ -66,7 +70,6 @@ IF ( MMG_INSTALL_PRIVATE_HEADERS )
)
ENDIF()


IF (NOT WIN32 OR MINGW)
LIST(APPEND mmgcommon_headers ${MMGCOMMON_BINARY_DIR}/git_log_mmg.h )
ENDIF()
Expand Down
5 changes: 4 additions & 1 deletion cmake/modules/mmgs.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,12 @@ ENDIF()
SET( mmgs_headers
${MMGS_SOURCE_DIR}/mmgs_export.h
${MMGS_SOURCE_DIR}/libmmgs.h
${MMGS_BINARY_DIR}/libmmgsf.h
)

IF ( PERL_FOUND )
LIST ( APPEND mmgs_headers ${MMGS_BINARY_DIR}/libmmgsf.h )
ENDIF()

IF ( MMG_INSTALL_PRIVATE_HEADERS )
LIST ( APPEND mmgs_headers
${MMGS_SOURCE_DIR}/libmmgs_private.h
Expand Down

0 comments on commit 9eea7ec

Please sign in to comment.