adapting Cmakelist.txt files to recent changes

and adding more files.
upflib and libbeef added as directories for now
This commit is contained in:
Pietro Delugas 2020-07-03 09:54:07 +02:00 committed by Federico Ficarelli
parent 6477bd9fb9
commit 65567619a1
8 changed files with 472 additions and 653 deletions

View File

@ -18,6 +18,7 @@ project(qe
# Build helpers
###########################################################
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include")
include(cmake/qeHelpers.cmake)
###########################################################
@ -388,6 +389,8 @@ add_subdirectory(dft-d3)
add_subdirectory(PW)
add_subdirectory(CPV)
add_subdirectory(atomic)
add_subdirectory(upflib)
add_subdirectory(LIBBEEF)
add_subdirectory(COUPLE)
add_subdirectory(LR_Modules)
add_subdirectory(PHonon)
@ -400,7 +403,6 @@ add_subdirectory(PlotPhon)
add_subdirectory(PWCOND)
add_subdirectory(QHA)
add_subdirectory(TDDFPT)
add_subdirectory(upftools)
add_subdirectory(XSpectra)
if(QE_ENABLE_DOC)
add_subdirectory(Doc)

16
LIBBEEF/CMakeLists.txt Normal file
View File

@ -0,0 +1,16 @@
set(sources
pbecor.c
beefun.c
)
qe_add_library(qe_libbeef ${sources})
add_library(QE::libbeef ALIAS qe_libbeef)
if(CMAKE_C_COMPILER_ID STREQUAL "PGI")
target_compile_options(qe_libbeef PUBLIC "-c11")
endif()
###########################################################
qe_install_targets(qe_libbeef)

View File

@ -1,5 +1,4 @@
set(sources
atom.f90
autopilot.f90
basic_algebra_routines.f90
becmod.f90
@ -31,7 +30,6 @@ set(sources
fsockets.f90
funct.f90
generate_function.f90
gth.f90
gradutils.f90
gvecw.f90
input_parameters.f90
@ -58,20 +56,14 @@ set(sources
plugin_flags.f90
plugin_arguments.f90
plugin_variables.f90
pseudo_types.f90
powell.f90
pw_dot.f90
qmmm.f90
radial_grids.f90
random_numbers.f90
read_cards.f90
read_input.f90
read_namelists.f90
read_ncpp.f90
read_pseudo.f90
read_upf_v1.f90
read_upf_v2.f90
read_upf_schema.f90
read_uspp.f90
recvec.f90
recvec_subs.f90
run_info.f90
@ -79,22 +71,14 @@ set(sources
set_signal.f90
set_vdw_corr.f90
setqf.f90
splinelib.f90
timestep.f90
tsvdw.f90
emend_upf.f90
upf.f90
upf_to_internal.f90
uspp.f90
version.f90
wannier_gw.f90
wannier_new.f90
wave_base.f90
wavefunctions.f90
wrappers.f90
write_upf.f90
write_upf_v2.f90
write_upf_schema.f90
ws_base.f90
xc_vdW_DF.f90
xc_rVV10.f90
@ -122,8 +106,9 @@ set(sources
wypos.f90
zvscal.f90
# list of subroutines and functions (not modules) previously found in flib/
atomic_number.f90
atom_weight.f90
capital.f90
correlation_gga.f90
cryst_to_car.f90
erf.f90
exchange_gga.f90
@ -144,7 +129,6 @@ set(sources
remove_tot_torque.f90
set_hubbard_l.f90
set_hubbard_n.f90
simpsn.f90
sort.f90
sph_bes.f90
sph_dbes.f90
@ -168,6 +152,7 @@ target_link_libraries(qe_modules
QE::OpenMP_Fortran
QE::FFTX
QE::LAX
QE::upflib
QE::CLIB # this is needed only by wrappers.f90
QE::MPI_Fortran
PUBLIC

View File

@ -298,31 +298,31 @@ target_link_libraries(qe_phonon_q2r_exe
###########################################################
# q2trans.x
###########################################################
set(sources PH/q2trans.f90)
qe_add_executable(qe_phonon_q2trans_exe ${sources})
set_target_properties(qe_phonon_q2trans_exe PROPERTIES OUTPUT_NAME q2trans.x)
target_link_libraries(qe_phonon_q2trans_exe
PRIVATE
QE::FFTX
QE::Modules
QE::IOTK
QE::UTILX
QE::PHonon::PH
)
#set(sources PH/q2trans.f90)
#qe_add_executable(qe_phonon_q2trans_exe ${sources})
#set_target_properties(qe_phonon_q2trans_exe PROPERTIES OUTPUT_NAME q2trans.x)
#target_link_libraries(qe_phonon_q2trans_exe
# PRIVATE
# QE::FFTX
# QE::Modules
# QE::IOTK
# QE::UTILX
# QE::PHonon::PH
#)
###########################################################
# q2trans_fd.x
###########################################################
set(sources PH/q2trans_fd.f90)
qe_add_executable(qe_phonon_q2transfd_exe ${sources})
set_target_properties(qe_phonon_q2transfd_exe PROPERTIES OUTPUT_NAME q2trans_fd.x)
target_link_libraries(qe_phonon_q2transfd_exe
PRIVATE
QE::Modules
QE::IOTK
QE::UTILX
QE::PHonon::PH
)
#set(sources PH/q2trans_fd.f90)
#qe_add_executable(qe_phonon_q2transfd_exe ${sources})
#set_target_properties(qe_phonon_q2transfd_exe PROPERTIES OUTPUT_NAME q2trans_fd.x)
#target_link_libraries(qe_phonon_q2transfd_exe
# PRIVATE
# QE::Modules
# QE::IOTK
# QE::UTILX
# QE::PHonon::PH
#)
###########################################################
# q2qstar.x
@ -448,8 +448,8 @@ qe_install_targets(
qe_phonon_ph_exe
qe_phonon_dynmat_exe
qe_phonon_q2r_exe
qe_phonon_q2trans_exe
qe_phonon_q2transfd_exe
# qe_phonon_q2trans_exe
# qe_phonon_q2transfd_exe
qe_phonon_q2qstar_exe
qe_phonon_lambda_exe
qe_phonon_alpha2f_exe

View File

@ -19,6 +19,7 @@ set(sources
src/average_pp.f90
src/acfdt_in_pw.f90
src/newd.f90
src/beef.f90
src/bp_mod.f90
src/bp_c_phase.f90
src/bp_calc_btq.f90
@ -84,6 +85,7 @@ set(sources
src/gradcorr.f90
src/gweights.f90
src/g2_kin.f90
src/hs_psi.f90
src/hs_1psi.f90
src/h_epsi_her_apply.f90
src/h_epsi_her_set.f90
@ -104,6 +106,9 @@ set(sources
src/io_rho_xml.f90
src/irrek.f90
src/iweights.f90
src/intersite_V.f90
src/init_nsg.f90
src/nsg_adj.f90
src/start_k.f90
src/kpoint_grid.f90
src/lchk_tauxk.f90
@ -118,6 +123,8 @@ set(sources
src/multable.f90
src/n_plane_waves.f90
src/new_ns.f90
src/new_nsb.f90
src/new_nsg.f90
src/new_occ.f90
src/ns_adj.f90
src/non_scf.f90
@ -232,7 +239,7 @@ set(sources
src/wannier_check.f90
src/wannier_clean.f90
src/wannier_occ.f90
src/hs_psi.f90)
)
qe_add_library(qe_pw ${sources})
add_library(QE::PW ALIAS qe_pw)
@ -247,6 +254,8 @@ target_link_libraries(qe_pw
QE::KS_Solvers::CG
QE::KS_Solvers::PPCG
QE::KS_Solvers::ParO
QE::upflib # TODO turn to vendorized library from MaX gitrepo ?
QE::libbeef # FIXME will go together with libxc
QE::Modules
QE::FFTX
QE::DFTD3

View File

@ -9,5 +9,5 @@ URL: https://gitlab.com/QEF/q-e.git
Version: 6.5.0
Requires: @PKGCONF_REQ_PUB@
Cflags: -I"${includedir}"/qe_fox -I"${includedir}"/qe_iotk -I"${includedir}"/qe_wannier90 -I"${includedir}"/qe_fftx -I"${includedir}"/qe_clib -I"${includedir}"/qe_utilx_tests -I"${includedir}"/qe_utilx -I"${includedir}"/qe_modules -I"${includedir}"/qe_lax -I"${includedir}"/qe_dftd3 -I"${includedir}"/qe_pw -I"${includedir}"/qe_cpv -I"${includedir}"/qe_atomic -I"${includedir}"/qe_couple -I"${includedir}"/qe_lr_modules -I"${includedir}"/qe_phonon_ph -I"${includedir}"/qe_pp -I"${includedir}"/qe_epw -I"${includedir}"/qe_hp -I"${includedir}"/qe_plotphon_kforbands_exe -I"${includedir}"/qe_neb -I"${includedir}"/qe_qha_atominfo_exe -I"${includedir}"/qe_pwcond_exe -I"${includedir}"/qe_tddfpt -I"${includedir}"/qe_kssolver_davidson -I"${includedir}"/qe_gww -I"${includedir}"/qe_upftools_extractcore_exe -I"${includedir}"/qe_xspectra_gipaw
Cflags: -I"${includedir}"/qe_fox -I"${includedir}"/qe_iotk -I"${includedir}"/qe_wannier90 -I"${includedir}"/qe_fftx -I"${includedir}"/qe_clib -I"${includedir}"/qe_utilx_tests -I"${includedir}"/qe_utilx -I"${includedir}"/qe_modules -I"${includedir}"/qe_lax -I"${includedir}"/qe_dftd3 -I"${includedir}"/qe_pw -I"${includedir}"/qe_cpv -I"${includedir}"/qe_atomic -I"${includedir}"/qe_couple -I"${includedir}"/qe_lr_modules -I"${includedir}"/qe_phonon_ph -I"${includedir}"/qe_pp -I"${includedir}"/qe_epw -I"${includedir}"/qe_hp -I"${includedir}"/qe_plotphon_kforbands_exe -I"${includedir}"/qe_neb -I"${includedir}"/qe_qha_atominfo_exe -I"${includedir}"/qe_pwcond_exe -I"${includedir}"/qe_tddfpt -I"${includedir}"/qe_kssolver_davidson -I"${includedir}"/qe_gww -I"${includedir}"/qe_upftools_extractcore_exe -I"${includedir}"/qe_xspectra_gipaw -I"${includedir}"/qe_upflib
Libs: -lqe_clib -lFoX_fsys -lFoX_utils -lqe_utilx -lqe_utilx_tests -lqe_fftx -lFoX_common -lqe_iotk -lFoX_wxml -lqe_lax -lqe_kssolver_davidsonrci -lqe_kssolver_dense -lFoX_sax -lqe_kssolver_davidson -lqe_kssolver_cg -lqe_kssolver_paro -lqe_kssolver_ppcg -lFoX_dom -lqe_wannier90 -lqe_modules -lqe_gww_minpack -lqe_gww_simplebse -lqe_gww_simpleip -lqe_atomic -lqe_dftd3 -lqe_gww -lqe_cpv -lqe_couple -lqe_pw -lqe_xspectra_gipaw -lqe_gww_simple -lqe_neb -lqe_xspectra -lqe_lr_modules -lqe_phonon_fd -lqe_pp -lqe_phonon_phaux -lqe_phonon_gamma -lqe_hp -lqe_gww_pw4gww -lqe_tddfpt -lqe_gww_bse -lqe_phonon_ph -lqe_gww_head -lqe_epw

50
upflib/CMakeLists.txt Normal file
View File

@ -0,0 +1,50 @@
set(sources
atom.f90
atomic_number.f90
emend_upf.f90
upf_erf.f90
upf_utils.f90
gth.f90
pseudo_types.f90
radial_grids.f90
read_cpmd.f90
read_fhi.f90
read_ncpp.f90
read_upf_new.f90
read_upf_schema.f90
read_upf_v1.f90
read_upf_v2.f90
read_uspp.f90
splinelib.f90
simpsn.f90
upf.f90
upf_auxtools.f90
upf_const.f90
upf_error.f90
upf_free_unit.f90
upf_invmat.f90
upf_io.f90
upf_kinds.f90
upf_params.f90
upf_parallel_include.f90
upf_to_internal.f90
uspp.f90
write_upf.f90
write_upf_new.f90
write_upf_schema.f90
write_upf_v2.f90
xmltools.f90
)
qe_add_library(qe_upflib ${sources})
add_library(QE::upflib ALIAS qe_upflib)
target_link_libraries(qe_upflib
PRIVATE
QE::MPI_Fortran
PUBLIC
QE::FOX
)
###########################################################
qe_install_targets(qe_upflib)

View File

@ -1,243 +0,0 @@
###########################################################
# extract_core.x
###########################################################
set(sources extract_core.f90)
qe_add_executable(qe_upftools_extractcore_exe ${sources})
set_target_properties(qe_upftools_extractcore_exe PROPERTIES OUTPUT_NAME extract_core.x)
target_link_libraries(qe_upftools_extractcore_exe
PRIVATE
QE::Modules)
###########################################################
# casino2upf.x
###########################################################
set(sources
casino2upf.f90
casino_pp.f90
)
qe_add_executable(qe_upftools_casino2upf_exe ${sources})
set_target_properties(qe_upftools_casino2upf_exe PROPERTIES OUTPUT_NAME casino2upf.x)
target_link_libraries(qe_upftools_casino2upf_exe
PRIVATE
QE::Modules)
###########################################################
# upf2upf2.x
###########################################################
set(sources upf2upf2.f90)
qe_add_executable(qe_upftools_upf2upf2_exe ${sources})
set_target_properties(qe_upftools_upf2upf2_exe PROPERTIES OUTPUT_NAME upf2upf2.x)
target_link_libraries(qe_upftools_upf2upf2_exe
PRIVATE
QE::Modules)
###########################################################
# cpmd2upf.x
###########################################################
set(sources cpmd2upf.f90)
qe_add_executable(qe_upftools_cpmd2upf_exe ${sources})
set_target_properties(qe_upftools_cpmd2upf_exe PROPERTIES OUTPUT_NAME cpmd2upf.x)
target_link_libraries(qe_upftools_cpmd2upf_exe
PRIVATE
QE::Modules)
###########################################################
# fhi2upf.x
###########################################################
set(sources fhi2upf.f90)
qe_add_executable(qe_upftools_fhi2upf_exe ${sources})
set_target_properties(qe_upftools_fhi2upf_exe PROPERTIES OUTPUT_NAME fhi2upf.x)
target_link_libraries(qe_upftools_fhi2upf_exe
PRIVATE
QE::Modules)
###########################################################
# fpmd2upf.x
###########################################################
set(sources
fpmd2upf.f90
vanderbilt.f90
write_upf.f90
read_upf.f90
casino_pp.f90
)
qe_add_executable(qe_upftools_fpmd2upf_exe ${sources})
set_target_properties(qe_upftools_fpmd2upf_exe PROPERTIES OUTPUT_NAME fpmd2upf.x)
target_link_libraries(qe_upftools_fpmd2upf_exe
PRIVATE
QE::Modules)
###########################################################
# ncpp2upf.x
###########################################################
set(sources
ncpp2upf.f90
write_upf.f90
)
qe_add_executable(qe_upftools_ncpp2upf_exe ${sources})
set_target_properties(qe_upftools_ncpp2upf_exe PROPERTIES OUTPUT_NAME ncpp2upf.x)
target_link_libraries(qe_upftools_ncpp2upf_exe
PRIVATE
QE::Modules)
###########################################################
# oldcp2upf.x
###########################################################
set(sources
oldcp2upf.f90
write_upf.f90
)
qe_add_executable(qe_upftools_oldcp2upf_exe ${sources})
set_target_properties(qe_upftools_oldcp2upf_exe PROPERTIES OUTPUT_NAME oldcp2upf.x)
target_link_libraries(qe_upftools_oldcp2upf_exe
PRIVATE
QE::Modules)
###########################################################
# read_upf.x
###########################################################
set(sources
read_ps.f90
read_upf.f90
)
qe_add_executable(qe_upftools_readupf_exe ${sources})
set_target_properties(qe_upftools_readupf_exe PROPERTIES OUTPUT_NAME read_upf.x)
target_link_libraries(qe_upftools_readupf_exe
PRIVATE
QE::Modules)
###########################################################
# read_upf_tofile.x
###########################################################
set(sources read_upf_tofile.f90)
qe_add_executable(qe_upftools_readupftofile_exe ${sources})
set_target_properties(qe_upftools_readupftofile_exe PROPERTIES OUTPUT_NAME read_upf_tofile.x)
target_link_libraries(qe_upftools_readupftofile_exe
PRIVATE
QE::Modules)
###########################################################
# fix_upf.x
###########################################################
set(sources fix_upf.f90)
qe_add_executable(qe_upftools_fixupf_exe ${sources})
set_target_properties(qe_upftools_fixupf_exe PROPERTIES OUTPUT_NAME fix_upf.x)
target_link_libraries(qe_upftools_fixupf_exe
PRIVATE
QE::Modules)
###########################################################
# rrkj2upf.x
###########################################################
set(sources
rrkj2upf.f90
write_upf.f90
)
qe_add_executable(qe_upftools_rrkj2upf_exe ${sources})
set_target_properties(qe_upftools_rrkj2upf_exe PROPERTIES OUTPUT_NAME rrkj2upf.x)
target_link_libraries(qe_upftools_rrkj2upf_exe
PRIVATE
QE::Modules)
###########################################################
# upf2casino.x
###########################################################
set(sources
upf2casino.f90
vanderbilt.f90
write_upf.f90
casino_pp.f90
)
qe_add_executable(qe_upftools_upf2casino_exe ${sources})
set_target_properties(qe_upftools_upf2casino_exe PROPERTIES OUTPUT_NAME upf2casino.x)
target_link_libraries(qe_upftools_upf2casino_exe
PRIVATE
QE::Modules)
###########################################################
# uspp2upf.x
###########################################################
set(sources
uspp2upf.f90
vanderbilt.f90
write_upf.f90
)
qe_add_executable(qe_upftools_uspp2upf_exe ${sources})
set_target_properties(qe_upftools_uspp2upf_exe PROPERTIES OUTPUT_NAME uspp2upf.x)
target_link_libraries(qe_upftools_uspp2upf_exe
PRIVATE
QE::Modules)
###########################################################
# vdb2upf.x
###########################################################
set(sources
vdb2upf.f90
vanderbilt.f90
write_upf.f90
)
qe_add_executable(qe_upftools_vdb2upf_exe ${sources})
set_target_properties(qe_upftools_vdb2upf_exe PROPERTIES OUTPUT_NAME vdb2upf.x)
target_link_libraries(qe_upftools_vdb2upf_exe
PRIVATE
QE::Modules)
###########################################################
# virtual_v2.x
###########################################################
set(sources virtual_v2.f90)
qe_add_executable(qe_upftools_virtualv2_exe ${sources})
set_target_properties(qe_upftools_virtualv2_exe PROPERTIES OUTPUT_NAME virtual_v2.x)
target_link_libraries(qe_upftools_virtualv2_exe
PRIVATE
QE::Modules)
###########################################################
# interpolate.x
###########################################################
set(sources
interpolate.f90
vanderbilt.f90
write_upf.f90
)
qe_add_executable(qe_upftools_interpolate_exe ${sources})
set_target_properties(qe_upftools_interpolate_exe PROPERTIES OUTPUT_NAME interpolate.x)
target_link_libraries(qe_upftools_interpolate_exe
PRIVATE
QE::Modules)
###########################################################
# hgh2qe.x
###########################################################
set(sources
HGH2QE/hgh2qe.f90
HGH2QE/lininterpol.f90
)
qe_add_executable(qe_upftools_hgh2qelininterpol_gh2qe_exe ${sources})
set_target_properties(qe_upftools_hgh2qelininterpol_gh2qe_exe PROPERTIES OUTPUT_NAME hgh2qe_lininterpol.x)
target_link_libraries(qe_upftools_hgh2qelininterpol_gh2qe_exe
PRIVATE
QE::Modules)
###########################################################
qe_install_targets(
qe_upftools_extractcore_exe
qe_upftools_casino2upf_exe
qe_upftools_upf2upf2_exe
qe_upftools_cpmd2upf_exe
qe_upftools_fhi2upf_exe
qe_upftools_fpmd2upf_exe
qe_upftools_ncpp2upf_exe
qe_upftools_oldcp2upf_exe
qe_upftools_readupf_exe
qe_upftools_readupftofile_exe
qe_upftools_fixupf_exe
qe_upftools_rrkj2upf_exe
qe_upftools_upf2casino_exe
qe_upftools_uspp2upf_exe
qe_upftools_vdb2upf_exe
qe_upftools_virtualv2_exe
qe_upftools_interpolate_exe
qe_upftools_hgh2qelininterpol_gh2qe_exe
)