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

Avoid compiler warnings about implicit function declarations. #488

Merged
merged 1 commit into from
Jul 15, 2024
Merged

Avoid compiler warnings about implicit function declarations. #488

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
13 changes: 7 additions & 6 deletions fem/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,18 +179,19 @@ ENDIF()
# ElmerSolver libraries
IF(UMFPACK_FOUND)
SET(ELMERSOLVER_LIBRARIES matc fhuti binio arpack
${UMFPACK_LIBRARIES}
${LAPACK_LIBRARIES} ${BLAS_LIBRARIES}
${UMFPACK_LIBRARIES}
${CMAKE_DL_LIBS})
INCLUDE_DIRECTORIES(${UMFPACK_INCLUDE_DIR})

TARGET_INCLUDE_DIRECTORIES(elmersolver PRIVATE ${UMFPACK_INCLUDE_DIR})
#LIST(APPEND ELMERSOLVER_LIBRARIES ${UMFPACK_LIBRARIES})
#TARGET_LINK_LIBRARIES(elmersolver "${UMFPACK_LIBRARIES}")
ELSE()
SET(ELMERSOLVER_LIBRARIES matc umfpack
amd fhuti binio arpack
${LAPACK_LIBRARIES} ${BLAS_LIBRARIES}
SET(ELMERSOLVER_LIBRARIES matc fhuti binio arpack
umfpack amd
${LAPACK_LIBRARIES} ${BLAS_LIBRARIES}
${CMAKE_DL_LIBS})
TARGET_INCLUDE_DIRECTORIES(elmersolver PRIVATE ${PROJECT_SOURCE_DIR}/umfpack/src/umfpack/include)
ENDIF()

IF(WITH_LUA)
Expand Down
2 changes: 2 additions & 0 deletions fem/src/umf4_f77wrapper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@

#include "../config.h"

#include "umfpack.h"

#ifdef NULL
#undef NULL
#endif
Expand Down