From 9d15f21659702f5cc7346ba23ab2bded1c2cdc60 Mon Sep 17 00:00:00 2001 From: Damian Rouson Date: Thu, 14 Dec 2017 14:50:58 -0800 Subject: [PATCH] CMake build works for base, krylov, prec, util --- CMakeLists.txt | 10 +- base/CMakeLists.txt | 396 +++--------------------------------------- krylov/CMakeLists.txt | 64 ++----- prec/CMakeLists.txt | 81 ++------- util/CMakeLists.txt | 52 ++---- 5 files changed, 67 insertions(+), 536 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d973266b6..b849e1338 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -501,8 +501,6 @@ define_property(TARGET #------------------------------- #include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/src) -#add_subdirectory(src) - #----------------------------------------------------- # Publicize installed location to other CMake projects #----------------------------------------------------- @@ -612,8 +610,8 @@ add_definitions( -DHAVE_METIS_ -DLowerUnderscore -DPtr64Bits ) -add_subdirectory(base) -add_subdirectory(prec) -add_subdirectory(krylov) -add_subdirectory(util) +set(directory_list base prec krylov util) # TODO: add cbind +foreach(directory ${directory_list}) + add_subdirectory("${directory}") +endforeach() #add_subdirectory(cbind) diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt index 723aa533d..0ebc102e0 100644 --- a/base/CMakeLists.txt +++ b/base/CMakeLists.txt @@ -85,7 +85,7 @@ foreach( lib IN LISTS MPI_Fortran_LIBRARIES) endforeach() string(STRIP "${MPI_LIBS}" MPI_LIBS) -add_library(base SHARED +set(base_source_files internals/psi_desc_impl.f90 internals/psi_crea_bnd_elem.f90 internals/psi_bld_tmphalo.f90 @@ -444,368 +444,26 @@ serial/impl/psb_d_mat_impl.F90 serial/impl/psb_z_base_mat_impl.F90 modules/cutil.c ) +if (SERIAL_MPI) + set(base_source_files ${base_source_files} modules/fakempi.c) +endif() -# Add this above and below if the SERIAL_MPI flag is passed: -# modules/fakempi.c +add_library(base SHARED ${base_source_files}) +add_library(base_static STATIC ${base_source_files}) -add_library(base_static STATIC -internals/psi_desc_impl.f90 -internals/psi_crea_bnd_elem.f90 -internals/psi_bld_tmphalo.f90 -internals/psi_list_search.f90 -internals/psi_crea_ovr_elem.f90 -internals/psi_compute_size.f90 -internals/psi_dl_check.f90 -internals/psi_exist_ovr_elem.f90 -internals/psi_srtlist.f90 -internals/psi_bld_tmpovrl.f90 -internals/psi_crea_index.f90 -internals/psi_sort_dl.f90 -tools/psb_iallc.f90 -tools/psb_c_map.f90 -tools/psb_dspalloc.f90 -tools/psb_cspasb.f90 -tools/psb_dins.f90 -tools/psb_iasb.f90 -tools/psb_sspfree.f90 -tools/psb_cd_lstext.f90 -tools/psb_dsprn.f90 -tools/psb_cins.f90 -tools/psb_csprn.f90 -tools/psb_ifree.f90 -tools/psb_sspasb.f90 -tools/psb_z_map.f90 -tools/psb_zspins.f90 -tools/psb_sins.f90 -tools/psb_cdins.f90 -tools/psb_cspfree.f90 -tools/psb_cdalv.f90 -tools/psb_zallc.f90 -tools/psb_cspins.f90 -tools/psb_dallc.f90 -tools/psb_cdrep.f90 -tools/psb_dspfree.f90 -tools/psb_zspfree.f90 -tools/psb_get_overlap.f90 -tools/psb_cdals.f90 -tools/psb_dfree.f90 -tools/psb_dasb.f90 -tools/psb_zfree.f90 -tools/psb_zins.f90 -tools/psb_cd_switch_ovl_indxmap.f90 -tools/psb_sasb.f90 -./internals/psi_desc_impl.f90 -./internals/psi_crea_bnd_elem.f90 -./internals/psi_bld_tmphalo.f90 -./internals/psi_list_search.f90 -./internals/psi_crea_ovr_elem.f90 -./internals/psi_compute_size.f90 -./internals/psi_dl_check.f90 -./internals/psi_exist_ovr_elem.f90 -./internals/psi_srtlist.f90 -./internals/psi_bld_tmpovrl.f90 -./internals/psi_crea_index.f90 -./internals/psi_sort_dl.f90 -./tools/psb_iallc.f90 -./tools/psb_c_map.f90 -./tools/psb_dspalloc.f90 -./tools/psb_cspasb.f90 -./tools/psb_dins.f90 -./tools/psb_iasb.f90 -./tools/psb_sspfree.f90 -./tools/psb_cd_lstext.f90 -./tools/psb_dsprn.f90 -./tools/psb_cins.f90 -./tools/psb_csprn.f90 -./tools/psb_ifree.f90 -./tools/psb_sspasb.f90 -./tools/psb_z_map.f90 -./tools/psb_zspins.f90 -./tools/psb_sins.f90 -./tools/psb_cdins.f90 -./tools/psb_cspfree.f90 -./tools/psb_cdalv.f90 -./tools/psb_zallc.f90 -./tools/psb_cspins.f90 -./tools/psb_dallc.f90 -./tools/psb_cdrep.f90 -./tools/psb_dspfree.f90 -./tools/psb_zspfree.f90 -./tools/psb_get_overlap.f90 -./tools/psb_cdals.f90 -./tools/psb_dfree.f90 -./tools/psb_dasb.f90 -./tools/psb_zfree.f90 -./tools/psb_zins.f90 -./tools/psb_cd_switch_ovl_indxmap.f90 -./tools/psb_sasb.f90 -./tools/psb_callc.f90 -./tools/psb_cd_reinit.f90 -./tools/psb_cd_set_bld.f90 -./tools/psb_s_map.f90 -./tools/psb_cdprt.f90 -./tools/psb_glob_to_loc.f90 -./tools/psb_zasb.f90 -./tools/psb_zspalloc.f90 -./tools/psb_cspalloc.f90 -./tools/psb_iins.f90 -./tools/psb_d_map.f90 -./tools/psb_cdren.f90 -./tools/psb_casb.f90 -./tools/psb_zsprn.f90 -./tools/psb_sspins.f90 -./tools/psb_zspasb.f90 -./tools/psb_loc_to_glob.f90 -./tools/psb_dspasb.f90 -./tools/psb_cdall.f90 -./tools/psb_sallc.f90 -./tools/psb_ssprn.f90 -./tools/psb_dspins.f90 -./tools/psb_sspalloc.f90 -./tools/psb_cd_inloc.f90 -./tools/psb_sfree.f90 -./tools/psb_cfree.f90 -./modules/psi_c_mod.f90 -./modules/psi_mod.f90 -./modules/aux/psb_string_mod.f90 -./modules/aux/psb_sort_mod.f90 -./modules/aux/psb_s_sort_mod.f90 -./modules/aux/psi_d_serial_mod.f90 -./modules/aux/psi_serial_mod.f90 -./modules/aux/psb_i_sort_mod.f90 -./modules/aux/psi_z_serial_mod.f90 -./modules/aux/psi_i_serial_mod.f90 -./modules/aux/psb_ip_reord_mod.f90 -./modules/aux/psb_c_sort_mod.f90 -./modules/aux/psb_hash_mod.f90 -./modules/aux/psb_d_sort_mod.f90 -./modules/aux/psi_s_serial_mod.f90 -./modules/aux/psi_c_serial_mod.f90 -./modules/aux/psb_z_sort_mod.f90 -./modules/psb_base_mod.f90 -./modules/psi_z_mod.f90 -./modules/desc/psb_indx_map_mod.f90 -./modules/desc/psb_repl_map_mod.f90 -./modules/desc/psb_desc_const_mod.f90 -./modules/desc/psb_gen_block_map_mod.f90 -./modules/desc/psb_hash_map_mod.f90 -./modules/desc/psb_glist_map_mod.f90 -./modules/desc/psb_list_map_mod.f90 -./modules/psi_d_mod.f90 -./modules/tools/psb_i_tools_mod.f90 -./modules/tools/psb_d_tools_mod.f90 -./modules/tools/psb_s_tools_mod.f90 -./modules/tools/psb_tools_mod.f90 -./modules/tools/psb_cd_tools_mod.f90 -./modules/tools/psb_z_tools_mod.f90 -./modules/tools/psb_c_tools_mod.f90 -./modules/psi_s_mod.f90 -./modules/comm/psb_d_linmap_mod.f90 -./modules/comm/psb_s_linmap_mod.f90 -./modules/comm/psb_base_linmap_mod.f90 -./modules/comm/psb_i_comm_mod.f90 -./modules/comm/psb_c_linmap_mod.f90 -./modules/comm/psb_c_comm_mod.f90 -./modules/comm/psb_z_comm_mod.f90 -./modules/comm/psb_z_linmap_mod.f90 -./modules/comm/psb_s_comm_mod.f90 -./modules/comm/psb_d_comm_mod.f90 -./modules/comm/psb_comm_mod.f90 -./modules/comm/psb_linmap_mod.f90 -./modules/psblas/psb_psblas_mod.f90 -./modules/psi_i_mod.f90 -./modules/serial/psb_s_csr_mat_mod.f90 -./modules/serial/psb_z_mat_mod.f90 -./modules/serial/psb_s_base_mat_mod.f90 -./modules/serial/psb_s_base_vect_mod.f90 -./modules/serial/psb_z_csc_mat_mod.f90 -./modules/serial/psb_d_csr_mat_mod.f90 -./modules/serial/psb_s_csc_mat_mod.f90 -./modules/serial/psb_i_base_vect_mod.f90 -./modules/serial/psb_z_base_vect_mod.f90 -./modules/serial/psb_c_csr_mat_mod.f90 -./modules/serial/psb_c_serial_mod.f90 -./modules/serial/psb_c_base_vect_mod.f90 -./modules/serial/psb_s_serial_mod.f90 -./modules/serial/psb_d_csc_mat_mod.f90 -./modules/serial/psb_vect_mod.f90 -./modules/serial/psb_base_mat_mod.f90 -./modules/serial/psb_c_csc_mat_mod.f90 -./modules/serial/psb_z_base_mat_mod.f90 -./modules/serial/psb_z_csr_mat_mod.f90 -./modules/serial/psb_c_mat_mod.f90 -./modules/serial/psb_d_base_mat_mod.f90 -./modules/serial/psb_d_serial_mod.f90 -./modules/serial/psb_c_base_mat_mod.f90 -./modules/serial/psb_d_base_vect_mod.f90 -./modules/serial/psb_serial_mod.f90 -./modules/serial/psb_s_mat_mod.f90 -./modules/serial/psb_z_serial_mod.f90 -./modules/serial/psb_d_mat_mod.f90 -./modules/serial/psb_mat_mod.f90 -./modules/error.f90 -./modules/psb_check_mod.f90 -./comm/psb_shalo.f90 -./comm/psb_dhalo.f90 -./comm/psb_igather.f90 -./comm/internals/psi_iovrl_restr.f90 -./comm/internals/psi_covrl_upd.f90 -./comm/internals/psi_covrl_save.f90 -./comm/internals/psi_sovrl_upd.f90 -./comm/internals/psi_dovrl_restr.f90 -./comm/internals/psi_zovrl_restr.f90 -./comm/internals/psi_dovrl_save.f90 -./comm/internals/psi_zovrl_save.f90 -./comm/internals/psi_sovrl_restr.f90 -./comm/internals/psi_zovrl_upd.f90 -./comm/internals/psi_sovrl_save.f90 -./comm/internals/psi_iovrl_upd.f90 -./comm/internals/psi_covrl_restr.f90 -./comm/internals/psi_iovrl_save.f90 -./comm/internals/psi_dovrl_upd.f90 -./comm/psb_iovrl.f90 -./comm/psb_cgather.f90 -./comm/psb_covrl.f90 -./comm/psb_zovrl.f90 -./comm/psb_ihalo.f90 -./comm/psb_dgather.f90 -./comm/psb_sovrl.f90 -./comm/psb_dovrl.f90 -./comm/psb_zgather.f90 -./comm/psb_zhalo.f90 -./comm/psb_sgather.f90 -./comm/psb_chalo.f90 -./psblas/psb_snrmi.f90 -./psblas/psb_dspmm.f90 -./psblas/psb_samax.f90 -./psblas/psb_dspnrm1.f90 -./psblas/psb_sspnrm1.f90 -./psblas/psb_sspmm.f90 -./psblas/psb_dnrmi.f90 -./psblas/psb_zamax.f90 -./psblas/psb_cspmm.f90 -./psblas/psb_dspsm.f90 -./psblas/psb_casum.f90 -./psblas/psb_cnrmi.f90 -./psblas/psb_znrm2.f90 -./psblas/psb_zspsm.f90 -./psblas/psb_camax.f90 -./psblas/psb_dnrm2.f90 -./psblas/psb_znrmi.f90 -./psblas/psb_cspsm.f90 -./psblas/psb_sdot.f90 -./psblas/psb_dasum.f90 -./psblas/psb_zasum.f90 -./psblas/psb_damax.f90 -./psblas/psb_zspmm.f90 -./psblas/psb_cnrm2.f90 -./psblas/psb_ddot.f90 -./psblas/psb_caxpby.f90 -./psblas/psb_cdot.f90 -./psblas/psb_snrm2.f90 -./psblas/psb_sspsm.f90 -./psblas/psb_daxpby.f90 -./psblas/psb_zdot.f90 -./psblas/psb_zaxpby.f90 -./psblas/psb_zspnrm1.f90 -./psblas/psb_sasum.f90 -./psblas/psb_saxpby.f90 -./psblas/psb_cspnrm1.f90 -serial/impl/psb_c_coo_impl.f90 -serial/smmp.f90 -serial/psb_srwextd.f90 -serial/psb_camax_s.f90 -serial/psb_ssymbmm.f90 -serial/psb_cgeprt.f90 -serial/psb_zasum_s.f90 -serial/psi_d_serial_impl.f90 -serial/psb_znumbmm.f90 -serial/psb_cspspmm.f90 -serial/psb_sgeprt.f90 -serial/psb_samax_s.f90 -serial/psb_sasum_s.f90 -serial/psi_i_serial_impl.f90 -serial/psb_aspxpby.f90 -serial/psb_zamax_s.f90 -serial/psi_c_serial_impl.f90 -serial/psb_sspspmm.f90 -serial/psb_cnumbmm.f90 -serial/psi_s_serial_impl.f90 -serial/psb_dspspmm.f90 -serial/psb_zsymbmm.f90 -serial/psb_cgelp.f90 -serial/psb_dnumbmm.f90 -serial/psb_csymbmm.f90 -serial/psb_zgelp.f90 -serial/psb_dsymbmm.f90 -serial/psb_damax_s.f90 -serial/psb_snumbmm.f90 -serial/psb_drwextd.f90 -serial/psb_spge_dot.f90 -serial/psb_spdot_srtd.f90 -serial/psb_crwextd.f90 -internals/psb_indx_map_fnd_owner.F90 -internals/psi_desc_index.F90 -internals/psi_fnd_owner.F90 -internals/psi_extrct_dl.F90 -tools/psb_icdasb.F90 -tools/psb_dsphalo.F90 -tools/psb_zcdbldext.F90 -tools/psb_scdbldext.F90 -tools/psb_zsphalo.F90 -tools/psb_ccdbldext.F90 -tools/psb_cdcpy.F90 -tools/psb_ssphalo.F90 -tools/psb_csphalo.F90 -tools/psb_dcdbldext.F90 -modules/psb_penv_mod.F90 -modules/psi_comm_buffers_mod.F90 -modules/psi_p2p_mod.F90 -modules/desc/psb_desc_mod.F90 -modules/psi_penv_mod.F90 -modules/psb_error_impl.F90 -modules/psb_realloc_mod.F90 -modules/psb_error_mod.F90 -modules/psblas/psb_s_psblas_mod.F90 -modules/psblas/psb_d_psblas_mod.F90 -modules/psblas/psb_c_psblas_mod.F90 -modules/psblas/psb_z_psblas_mod.F90 -modules/psi_reduce_mod.F90 -modules/psb_const_mod.F90 -modules/serial/psb_i_vect_mod.F90 -modules/serial/psb_c_vect_mod.F90 -modules/serial/psb_d_vect_mod.F90 -modules/serial/psb_z_vect_mod.F90 -modules/serial/psb_s_vect_mod.F90 -modules/psi_bcast_mod.F90 -comm/psb_zspgather.F90 -comm/psb_dscatter.F90 -comm/psb_zscatter.F90 -comm/internals/psi_dswapdata.F90 -comm/internals/psi_sswaptran.F90 -comm/internals/psi_sswapdata.F90 -comm/internals/psi_cswaptran.F90 -comm/internals/psi_iswapdata.F90 -comm/internals/psi_zswaptran.F90 -comm/internals/psi_iswaptran.F90 -comm/internals/psi_dswaptran.F90 -comm/internals/psi_zswapdata.F90 -comm/internals/psi_cswapdata.F90 -comm/psb_cspgather.F90 -comm/psb_iscatter.F90 -comm/psb_sscatter.F90 -comm/psb_sspgather.F90 -comm/psb_cscatter.F90 -comm/psb_dspgather.F90 -serial/impl/psb_c_base_mat_impl.F90 -serial/impl/psb_s_mat_impl.F90 -serial/impl/psb_z_mat_impl.F90 -serial/impl/psb_d_base_mat_impl.F90 -serial/impl/psb_c_mat_impl.F90 -serial/impl/psb_s_base_mat_impl.F90 -serial/impl/psb_d_mat_impl.F90 -serial/impl/psb_z_base_mat_impl.F90 -modules/cutil.c +set_target_properties(base + PROPERTIES + Fortran_MODULE_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/${mod_dir_tail}" + POSITION_INDEPENDENT_CODE TRUE + SOVERSION ${PSBLAS_SO_VERSION} + OUTPUT_NAME base +) +set_target_properties(base_static + PROPERTIES + Fortran_MODULE_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/${mod_dir_tail}" + POSITION_INDEPENDENT_CODE TRUE + SOVERSION ${PSBLAS_SO_VERSION} + OUTPUT_NAME base_static ) target_link_libraries(base PRIVATE ${MPI_C_LIBRARIES} ${MPI_Fortran_LIBRARIES}) target_link_libraries(base_static PRIVATE ${MPI_C_LIBRARIES} ${MPI_Fortran_LIBRARIES}) @@ -813,24 +471,16 @@ target_link_libraries(base_static PRIVATE ${MPI_C_LIBRARIES} ${MPI_Fortran_LIBRA install(DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" FILES_MATCHING PATTERN "*.mod") -set_target_properties( base_static - PROPERTIES - SOVERSION ${PSBLAS_SO_VERSION} -) -set_target_properties ( base - PROPERTIES - SOVERSION ${PSBLAS_SO_VERSION} -) -set_target_properties(base_static PROPERTIES OUTPUT_NAME base) get_target_property(libbase_static base_static OUTPUT_NAME) set(PSBLAS_LIBS "${CMAKE_INSTALL_LIBDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}${libbase_static}${CMAKE_STATIC_LIBRARY_SUFFIX}") -install(TARGETS base EXPORT PSBLAS_Targets +install(TARGETS base + EXPORT PSBLAS_Targets DESTINATION "${CMAKE_INSTALL_LIBDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" ) - -install(TARGETS base_static EXPORT PSBLAS_Targets +install(TARGETS base_static + EXPORT PSBLAS_Targets ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" ) diff --git a/krylov/CMakeLists.txt b/krylov/CMakeLists.txt index 78e52f4b1..f929cae60 100644 --- a/krylov/CMakeLists.txt +++ b/krylov/CMakeLists.txt @@ -85,7 +85,7 @@ foreach( lib IN LISTS MPI_Fortran_LIBRARIES) endforeach() string(STRIP "${MPI_LIBS}" MPI_LIBS) -add_library(krylov SHARED +set(krylov_source_files psb_base_krylov_conv_mod.f90 psb_cbicg.f90 psb_ccg.F90 @@ -131,67 +131,30 @@ psb_zkrylov.f90 psb_zrgmres.f90 ) -add_library(krylov_static STATIC -psb_base_krylov_conv_mod.f90 -psb_cbicg.f90 -psb_ccg.F90 -psb_ccgs.f90 -psb_ccgstab.f90 -psb_ccgstabl.f90 -psb_cfcg.F90 -psb_cgcr.f90 -psb_c_krylov_conv_mod.f90 -psb_ckrylov.f90 -psb_crgmres.f90 -psb_dbicg.f90 -psb_dcg.F90 -psb_dcgs.f90 -psb_dcgstab.f90 -psb_dcgstabl.f90 -psb_dfcg.F90 -psb_dgcr.f90 -psb_d_krylov_conv_mod.f90 -psb_dkrylov.f90 -psb_drgmres.f90 -psb_krylov_conv_mod.f90 -psb_krylov_mod.f90 -psb_sbicg.f90 -psb_scg.F90 -psb_scgs.f90 -psb_scgstab.f90 -psb_scgstabl.f90 -psb_sfcg.F90 -psb_sgcr.f90 -psb_s_krylov_conv_mod.f90 -psb_skrylov.f90 -psb_srgmres.f90 -psb_zbicg.f90 -psb_zcg.F90 -psb_zcgs.f90 -psb_zcgstab.f90 -psb_zcgstabl.f90 -psb_zfcg.F90 -psb_zgcr.f90 -psb_z_krylov_conv_mod.f90 -psb_zkrylov.f90 -psb_zrgmres.f90 -) +add_library(krylov SHARED ${krylov_source_files}) +add_library(krylov_static STATIC ${krylov_source_files}) target_link_libraries(krylov PRIVATE ${MPI_C_LIBRARIES} ${MPI_Fortran_LIBRARIES} prec) -target_link_libraries(krylov_static PRIVATE ${MPI_C_LIBRARIES} ${MPI_Fortran_LIBRARIES} prec) +target_link_libraries(krylov_static PRIVATE ${MPI_C_LIBRARIES} ${MPI_Fortran_LIBRARIES} prec_static) install(DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" FILES_MATCHING PATTERN "*.mod") -set_target_properties( krylov_static +set_target_properties ( krylov PROPERTIES SOVERSION ${PSBLAS_SO_VERSION} + Fortran_MODULE_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/${mod_dir_tail}" + POSITION_INDEPENDENT_CODE TRUE + OUTPUT_NAME krylov ) -set_target_properties ( krylov +set_target_properties( krylov_static PROPERTIES SOVERSION ${PSBLAS_SO_VERSION} + Fortran_MODULE_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/${mod_dir_tail}" + POSITION_INDEPENDENT_CODE TRUE + OUTPUT_NAME krylov_static ) -set_target_properties(krylov_static PROPERTIES OUTPUT_NAME krylov) + get_target_property(libkrylov_static krylov_static OUTPUT_NAME) set(PSBLAS_LIBS "${CMAKE_INSTALL_LIBDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}${libkrylov_static}${CMAKE_STATIC_LIBRARY_SUFFIX}") @@ -199,7 +162,6 @@ install(TARGETS krylov EXPORT PSBLAS_Targets DESTINATION "${CMAKE_INSTALL_LIBDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" ) - install(TARGETS krylov_static EXPORT PSBLAS_Targets ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" diff --git a/prec/CMakeLists.txt b/prec/CMakeLists.txt index d2d05b629..313f3097f 100644 --- a/prec/CMakeLists.txt +++ b/prec/CMakeLists.txt @@ -85,68 +85,7 @@ foreach( lib IN LISTS MPI_Fortran_LIBRARIES) endforeach() string(STRIP "${MPI_LIBS}" MPI_LIBS) -add_library(prec SHARED -./psb_prec_const_mod.f90 -./psb_c_prec_mod.f90 -./psb_c_base_prec_mod.f90 -./psb_d_bjacprec.f90 -./psb_z_base_prec_mod.f90 -./psb_d_diagprec.f90 -./impl/psb_dprecbld.f90 -./impl/psb_cprecinit.f90 -./impl/psb_dprecinit.f90 -./impl/psb_zilu_fct.f90 -./impl/psb_silu_fct.f90 -./impl/psb_cprecset.f90 -./impl/psb_s_prec_type_impl.f90 -./impl/psb_dilu_fct.f90 -./impl/psb_cprecbld.f90 -./impl/psb_c_diagprec_impl.f90 -./impl/psb_s_bjacprec_impl.f90 -./impl/psb_z_prec_type_impl.f90 -./impl/psb_d_nullprec_impl.f90 -./impl/psb_c_nullprec_impl.f90 -./impl/psb_d_diagprec_impl.f90 -./impl/psb_zprecinit.f90 -./impl/psb_d_prec_type_impl.f90 -./impl/psb_c_prec_type_impl.f90 -./impl/psb_s_nullprec_impl.f90 -./impl/psb_sprecinit.f90 -./impl/psb_z_bjacprec_impl.f90 -./impl/psb_d_bjacprec_impl.f90 -./impl/psb_z_nullprec_impl.f90 -./impl/psb_dprecset.f90 -./impl/psb_c_bjacprec_impl.f90 -./impl/psb_zprecset.f90 -./impl/psb_sprecbld.f90 -./impl/psb_cilu_fct.f90 -./impl/psb_z_diagprec_impl.f90 -./impl/psb_sprecset.f90 -./impl/psb_zprecbld.f90 -./impl/psb_s_diagprec_impl.f90 -./psb_s_base_prec_mod.f90 -./psb_s_bjacprec.f90 -./psb_c_prec_type.f90 -./psb_s_nullprec.f90 -./psb_d_nullprec.f90 -./psb_prec_mod.f90 -./psb_d_prec_type.f90 -./psb_z_prec_type.f90 -./psb_z_prec_mod.f90 -./psb_z_nullprec.f90 -./psb_c_diagprec.f90 -./psb_z_bjacprec.f90 -./psb_s_prec_type.f90 -./psb_c_nullprec.f90 -./psb_prec_type.f90 -./psb_d_prec_mod.f90 -./psb_s_diagprec.f90 -./psb_c_bjacprec.f90 -./psb_s_prec_mod.f90 -./psb_z_diagprec.f90 -./psb_d_base_prec_mod.f90 -) -add_library(prec_static STATIC +set(prec_source_files ./psb_prec_const_mod.f90 ./psb_c_prec_mod.f90 ./psb_c_base_prec_mod.f90 @@ -208,21 +147,30 @@ add_library(prec_static STATIC ./psb_d_base_prec_mod.f90 ) +add_library(prec SHARED ${prec_source_files}) +add_library(prec_static STATIC ${prec_source_files}) + target_link_libraries(prec PRIVATE ${MPI_C_LIBRARIES} ${MPI_Fortran_LIBRARIES} base) -target_link_libraries(prec_static PRIVATE ${MPI_C_LIBRARIES} ${MPI_Fortran_LIBRARIES} base) +target_link_libraries(prec_static PRIVATE ${MPI_C_LIBRARIES} ${MPI_Fortran_LIBRARIES} base_static) install(DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" FILES_MATCHING PATTERN "*.mod") -set_target_properties( prec_static +set_target_properties ( prec PROPERTIES SOVERSION ${PSBLAS_SO_VERSION} + Fortran_MODULE_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/${mod_dir_tail}" + POSITION_INDEPENDENT_CODE TRUE + OUTPUT_NAME prec ) -set_target_properties ( prec +set_target_properties( prec_static PROPERTIES SOVERSION ${PSBLAS_SO_VERSION} + Fortran_MODULE_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/${mod_dir_tail}" + POSITION_INDEPENDENT_CODE TRUE + OUTPUT_NAME prec_static ) -set_target_properties(prec_static PROPERTIES OUTPUT_NAME prec) + get_target_property(libprec_static prec_static OUTPUT_NAME) set(PSBLAS_LIBS "${CMAKE_INSTALL_LIBDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}${libprec_static}${CMAKE_STATIC_LIBRARY_SUFFIX}") @@ -230,7 +178,6 @@ install(TARGETS prec EXPORT PSBLAS_Targets DESTINATION "${CMAKE_INSTALL_LIBDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" ) - install(TARGETS prec_static EXPORT PSBLAS_Targets ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt index b99d8c19b..07178d66c 100644 --- a/util/CMakeLists.txt +++ b/util/CMakeLists.txt @@ -85,7 +85,7 @@ foreach( lib IN LISTS MPI_Fortran_LIBRARIES) endforeach() string(STRIP "${MPI_LIBS}" MPI_LIBS) -add_library(util SHARED +set(util_source_files metis_int.c psb_amd_order.c psb_blockpart_mod.f90 @@ -119,55 +119,30 @@ psb_z_mmio_impl.f90 psb_z_renum_impl.F90 ) -add_library(util_static STATIC -metis_int.c -psb_amd_order.c -psb_blockpart_mod.f90 -psb_c_hbio_impl.f90 -psb_c_mat_dist_impl.f90 -psb_c_mat_dist_mod.f90 -psb_c_mmio_impl.f90 -psb_c_renum_impl.F90 -psb_d_hbio_impl.f90 -psb_d_mat_dist_impl.f90 -psb_d_mat_dist_mod.f90 -psb_d_mmio_impl.f90 -psb_d_renum_impl.F90 -psb_gps_mod.f90 -psb_hbio_mod.f90 -psb_i_mmio_impl.f90 -psb_mat_dist_mod.f90 -psb_metispart_mod.F90 -psb_mmio_mod.F90 -psb_renum_mod.f90 -psb_s_hbio_impl.f90 -psb_s_mat_dist_impl.f90 -psb_s_mat_dist_mod.f90 -psb_s_mmio_impl.f90 -psb_s_renum_impl.F90 -psb_util_mod.f90 -psb_z_hbio_impl.f90 -psb_z_mat_dist_impl.f90 -psb_z_mat_dist_mod.f90 -psb_z_mmio_impl.f90 -psb_z_renum_impl.F90 -) +add_library(util SHARED ${util_source_files}) +add_library(util_static STATIC ${util_source_files}) target_link_libraries(util PRIVATE ${MPI_C_LIBRARIES} ${MPI_Fortran_LIBRARIES} base) -target_link_libraries(util_static PRIVATE ${MPI_C_LIBRARIES} ${MPI_Fortran_LIBRARIES} base) +target_link_libraries(util_static PRIVATE ${MPI_C_LIBRARIES} ${MPI_Fortran_LIBRARIES} base_static) install(DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" FILES_MATCHING PATTERN "*.mod") -set_target_properties( util_static +set_target_properties ( util PROPERTIES SOVERSION ${PSBLAS_SO_VERSION} + Fortran_MODULE_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/${mod_dir_tail}" + POSITION_INDEPENDENT_CODE TRUE + OUTPUT_NAME util ) -set_target_properties ( util +set_target_properties( util_static PROPERTIES SOVERSION ${PSBLAS_SO_VERSION} + Fortran_MODULE_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/${mod_dir_tail}" + POSITION_INDEPENDENT_CODE TRUE + OUTPUT_NAME util_static ) -set_target_properties(util_static PROPERTIES OUTPUT_NAME util) + get_target_property(libutil_static util_static OUTPUT_NAME) set(PSBLAS_LIBS "${CMAKE_INSTALL_LIBDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}${libutil_static}${CMAKE_STATIC_LIBRARY_SUFFIX}") @@ -175,7 +150,6 @@ install(TARGETS util EXPORT PSBLAS_Targets DESTINATION "${CMAKE_INSTALL_LIBDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" ) - install(TARGETS util_static EXPORT PSBLAS_Targets ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"