Skip to content

Commit 9eea7ec

Browse files
committed
Fix issue with fortran headers installation when perls is not found [skip ci].
1 parent f6a715b commit 9eea7ec

5 files changed

Lines changed: 35 additions & 14 deletions

File tree

cmake/modules/mmg.cmake

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -89,23 +89,28 @@ IF ( LIBMMG_STATIC OR LIBMMG_SHARED )
8989
SET( mmg2d_headers
9090
${MMG2D_SOURCE_DIR}/mmg2d_export.h
9191
${MMG2D_SOURCE_DIR}/libmmg2d.h
92-
${MMG2D_BINARY_DIR}/libmmg2df.h
9392
)
9493
SET( mmg3d_headers
9594
${MMG3D_SOURCE_DIR}/mmg3d_export.h
9695
${MMG3D_SOURCE_DIR}/libmmg3d.h
97-
${MMG3D_BINARY_DIR}/libmmg3df.h
9896
)
9997
SET( mmgs_headers
10098
${MMGS_SOURCE_DIR}/mmgs_export.h
10199
${MMGS_SOURCE_DIR}/libmmgs.h
102-
${MMGS_BINARY_DIR}/libmmgsf.h
103100
)
104101
SET( mmg_headers
105102
# ${PROJECT_SOURCE_DIR}/src/common/mmg_core_export.h
106-
${PROJECT_SOURCE_DIR}/src/mmg/libmmg.h
107-
${PROJECT_SOURCE_DIR}/src/mmg/libmmgf.h
103+
${PROJECT_SOURCE_DIR}/src/mmg/libmmg.h
108104
)
105+
106+
IF ( PERL_FOUND )
107+
LIST ( APPEND mmg3d_headers ${MMG3D_BINARY_DIR}/libmmg3df.h )
108+
LIST ( APPEND mmg2d_headers ${MMG2D_BINARY_DIR}/libmmg2df.h )
109+
LIST ( APPEND mmgs_headers ${MMGS_BINARY_DIR}/libmmgsf.h )
110+
LIST ( APPEND mmg_headers ${PROJECT_SOURCE_DIR}/libmmgf.h )
111+
ENDIF()
112+
113+
109114
SET(MMG2D_INCLUDE ${PROJECT_BINARY_DIR}/include/mmg/mmg2d )
110115
SET(MMGS_INCLUDE ${PROJECT_BINARY_DIR}/include/mmg/mmgs )
111116
SET(MMG3D_INCLUDE ${PROJECT_BINARY_DIR}/include/mmg/mmg3d )
@@ -122,7 +127,9 @@ IF ( LIBMMG_STATIC OR LIBMMG_SHARED )
122127
INSTALL(FILES ${mmg3d_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mmg/mmg3d)
123128
INSTALL(FILES ${mmg_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mmg)
124129

125-
FILE(INSTALL ${PROJECT_SOURCE_DIR}/src/mmg/libmmgf.h DESTINATION ${PROJECT_BINARY_DIR}/include/mmg/)
130+
IF ( PERL_FOUND )
131+
FILE(INSTALL ${PROJECT_SOURCE_DIR}/src/mmg/libmmgf.h DESTINATION ${PROJECT_BINARY_DIR}/include/mmg/)
132+
ENDIF()
126133

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

148+
set ( mmg_tgt_list ${PROJECT_BINARY_DIR}/include/mmg/libmmg.h )
149+
IF ( PERL_FOUND )
150+
list ( APPEND mmg_tgt_list ${PROJECT_BINARY_DIR}/include/mmg/libmmgf.h)
151+
ENDIF( )
141152

142153
ADD_CUSTOM_TARGET(copy_mmg_headers ALL
143154
DEPENDS
144-
copy_2d_headers copy_s_headers copy_3d_headers
145-
${PROJECT_BINARY_DIR}/include/mmg/libmmgf.h
146-
${PROJECT_BINARY_DIR}/include/mmg/libmmg.h
155+
copy_2d_headers copy_s_headers copy_3d_headers mmg_tgt_lit
147156
)
148157

149158
ENDIF()

cmake/modules/mmg2d.cmake

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,12 @@ ENDIF ( )
117117
SET( mmg2d_headers
118118
${MMG2D_SOURCE_DIR}/mmg2d_export.h
119119
${MMG2D_SOURCE_DIR}/libmmg2d.h
120-
${MMG2D_BINARY_DIR}/libmmg2df.h
121120
)
122121

122+
IF ( PERL_FOUND )
123+
LIST ( APPEND mmg2d_headers ${MMG2D_BINARY_DIR}/libmmg2df.h )
124+
ENDIF()
125+
123126
IF ( MMG_INSTALL_PRIVATE_HEADERS )
124127
LIST ( APPEND mmg2d_headers
125128
${MMG2D_SOURCE_DIR}/libmmg2d_private.h

cmake/modules/mmg3d.cmake

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,12 @@ ENDIF()
144144
SET( mmg3d_headers
145145
${MMG3D_SOURCE_DIR}/mmg3d_export.h
146146
${MMG3D_SOURCE_DIR}/libmmg3d.h
147-
${MMG3D_BINARY_DIR}/libmmg3df.h
148147
)
149148

149+
IF ( PERL_FOUND )
150+
LIST ( APPEND mmg3d_headers ${MMG3D_BINARY_DIR}/libmmg3df.h )
151+
ENDIF()
152+
150153
IF ( MMG_INSTALL_PRIVATE_HEADERS )
151154
LIST ( APPEND mmg3d_headers
152155
${MMG3D_SOURCE_DIR}/libmmg3d_private.h

cmake/modules/mmgcommon.cmake

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,15 @@ SET(MMGCOMMON_INCLUDE ${PROJECT_BINARY_DIR}/include/${MMGCOMMON_SHRT_INC
4747
SET( mmgcommon_headers
4848
${MMGCOMMON_SOURCE_DIR}/mmg_export.h
4949
${MMGCOMMON_SOURCE_DIR}/libmmgtypes.h
50-
${MMGCOMMON_BINARY_DIR}/libmmgtypesf.h
5150
${MMGCOMMON_BINARY_DIR}/mmgcmakedefines.h
5251
${MMGCOMMON_BINARY_DIR}/mmgcmakedefinesf.h
5352
${MMGCOMMON_BINARY_DIR}/mmgversion.h
5453
)
54+
55+
IF ( PERL_FOUND )
56+
LIST ( APPEND mmgcommon_headers ${MMGCOMMON_BINARY_DIR}/libmmgtypesf.h )
57+
ENDIF ( )
58+
5559
IF ( MMG_INSTALL_PRIVATE_HEADERS )
5660
LIST ( APPEND mmgcommon_headers
5761
${MMGCOMMON_SOURCE_DIR}/libmmgcommon_private.h
@@ -66,7 +70,6 @@ IF ( MMG_INSTALL_PRIVATE_HEADERS )
6670
)
6771
ENDIF()
6872

69-
7073
IF (NOT WIN32 OR MINGW)
7174
LIST(APPEND mmgcommon_headers ${MMGCOMMON_BINARY_DIR}/git_log_mmg.h )
7275
ENDIF()

cmake/modules/mmgs.cmake

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,12 @@ ENDIF()
109109
SET( mmgs_headers
110110
${MMGS_SOURCE_DIR}/mmgs_export.h
111111
${MMGS_SOURCE_DIR}/libmmgs.h
112-
${MMGS_BINARY_DIR}/libmmgsf.h
113112
)
114113

114+
IF ( PERL_FOUND )
115+
LIST ( APPEND mmgs_headers ${MMGS_BINARY_DIR}/libmmgsf.h )
116+
ENDIF()
117+
115118
IF ( MMG_INSTALL_PRIVATE_HEADERS )
116119
LIST ( APPEND mmgs_headers
117120
${MMGS_SOURCE_DIR}/libmmgs_private.h

0 commit comments

Comments
 (0)