From 0a97ea2924b0c6f50ce74c02f9acdf7763a51874 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Thu, 26 Mar 2026 15:22:23 +0100 Subject: [PATCH] Fix makefile --- CMakeLists.txt | 9 ++++----- base/modules/Makefile | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 91005a79..4b265b69 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -848,12 +848,11 @@ endif() # Set the Fortran module output directory for all targets -set(CMAKE_Fortran_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/modules) -#set(CMAKE_Fortran_MODULE_DIRECTORY "${CMAKE_BINARY_DIR}/include") +#set(CMAKE_Fortran_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/modules) - -message(STATUS "fortran module direcotry ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}") +set(CMAKE_Fortran_MODULE_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_MODULDIR}") +message(STATUS "fortran module directory ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_MODULDIR}") include_directories(${MPI_Fortran_INCLUDE_PATH}) @@ -1274,7 +1273,7 @@ install(DIRECTORY ${CMAKE_BINARY_DIR}/include/ # Install module files install(DIRECTORY ${CMAKE_BINARY_DIR}/modules/ - DESTINATION "${CMAKE_INSTALL_MODULDIR}" # This will place .mod files in /modules + DESTINATION "${CMAKE_Fortran_MODULE_DIRECTORY}" # This will place .mod files in /modules FILES_MATCHING PATTERN "*.mod" ) diff --git a/base/modules/Makefile b/base/modules/Makefile index d7f6a484..ab164d8c 100644 --- a/base/modules/Makefile +++ b/base/modules/Makefile @@ -305,7 +305,7 @@ serial/psb_d_vect_mod.o: serial/psb_d_base_vect_mod.o serial/psb_i_vect_mod.o serial/psb_c_vect_mod.o: serial/psb_c_base_vect_mod.o serial/psb_i_vect_mod.o serial/psb_z_vect_mod.o: serial/psb_z_base_vect_mod.o serial/psb_i_vect_mod.o serial/psb_s_serial_mod.o serial/psb_d_serial_mod.o serial/psb_c_serial_mod.o serial/psb_z_serial_mod.o: serial/psb_mat_mod.o auxil/psb_string_mod.o auxil/psb_sort_mod.o auxil/psi_serial_mod.o -serial/psb_vect_mod.o: serial/psb_i_vect_mod.o serial/psb_l_vect_mod.o serial/psb_d_vect_mod.o serial/psb_s_vect_mod.o serial/psb_c_vect_mod.o serial/psb_z_vect_mod.o +serial/psb_vect_mod.o: serial/psb_i2_vect_mod.o serial/psb_i_vect_mod.o serial/psb_l_vect_mod.o serial/psb_d_vect_mod.o serial/psb_s_vect_mod.o serial/psb_c_vect_mod.o serial/psb_z_vect_mod.o auxil/psb_s_rb_idx_tree_mod.o: serial/psb_s_csr_mat_mod.o psb_realloc_mod.o auxil/psb_d_rb_idx_tree_mod.o: serial/psb_d_csr_mat_mod.o psb_realloc_mod.o