projects
/
unres.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a388fb0
)
fixed binary names for cmake and make
author
Cezary Czaplewski
<czarek@chem.univ.gda.pl>
Thu, 7 May 2015 03:41:38 +0000
(
05:41
+0200)
committer
Cezary Czaplewski
<czarek@chem.univ.gda.pl>
Thu, 7 May 2015 03:41:38 +0000
(
05:41
+0200)
13 files changed:
source/cluster/unres/src/Makefile_ifort
patch
|
blob
|
history
source/cluster/unres/src/Makefile_pgi
patch
|
blob
|
history
source/cluster/wham/src-M/CMakeLists.txt
patch
|
blob
|
history
source/cluster/wham/src-M/Makefile-MPICH-gfortran
patch
|
blob
|
history
source/cluster/wham/src-M/Makefile-MPICH-ifort
patch
|
blob
|
history
source/cluster/wham/src/CMakeLists.txt
patch
|
blob
|
history
source/cluster/wham/src/Makefile-MPICH-gfortran
patch
|
blob
|
history
source/cluster/wham/src/Makefile-MPICH-ifort
patch
|
blob
|
history
source/unres/src_CSA/CMakeLists.txt
patch
|
blob
|
history
source/unres/src_MD-M/CMakeLists.txt
patch
|
blob
|
history
source/unres/src_MD/CMakeLists.txt
patch
|
blob
|
history
source/unres/src_MIN/CMakeLists.txt
patch
|
blob
|
history
source/xdrfpdb/src-M/CMakeLists.txt
patch
|
blob
|
history
diff --git
a/source/cluster/unres/src/Makefile_ifort
b/source/cluster/unres/src/Makefile_ifort
index
19e93e8
..
f2ef39c
100644
(file)
--- a/
source/cluster/unres/src/Makefile_ifort
+++ b/
source/cluster/unres/src/Makefile_ifort
@@
-1,5
+1,4
@@
BIN=/home/adam/UNRES/bin
BIN=/home/adam/UNRES/bin
-INSTALL_DIR = /usr/local/mpich-1.2.7p1-intel
FC= ifort
OPT = -O3 -ip -w
FFLAGS = ${OPT} -I.
FC= ifort
OPT = -O3 -ip -w
FFLAGS = ${OPT} -I.
@@
-27,7
+26,7
@@
unres_clust: $(objects)
cc -o compinfo compinfo.c
./compinfo | true
${FC} -c cinfo.f
cc -o compinfo compinfo.c
./compinfo | true
${FC} -c cinfo.f
- $(FC) ${OPT} ${objects} cinfo.o ${LIBS} -o ../../../../bin/cluster/unres_clust-ifort.exe
+ $(FC) ${OPT} ${objects} cinfo.o ${LIBS} -o ../../../../bin/cluster/cluster_unres_ifort.exe
clean:
/bin/rm *.o
clean:
/bin/rm *.o
diff --git
a/source/cluster/unres/src/Makefile_pgi
b/source/cluster/unres/src/Makefile_pgi
index
a44eb2a
..
c3d2e5f
100644
(file)
--- a/
source/cluster/unres/src/Makefile_pgi
+++ b/
source/cluster/unres/src/Makefile_pgi
@@
-21,7
+21,7
@@
unres_clust: $(objects)
cc -o compinfo compinfo.c
./compinfo | true
${FC} -c cinfo.f
cc -o compinfo compinfo.c
./compinfo | true
${FC} -c cinfo.f
- $(FC) ${OPT} ${objects} cinfo.o ${LIBS} -o ${BIN}/unres_clust-pff90.exe
+ $(FC) ${OPT} ${objects} cinfo.o ${LIBS} -o ${BIN}/cluster_unres_pgf90.exe
clean:
/bin/rm *.o
clean:
/bin/rm *.o
diff --git
a/source/cluster/wham/src-M/CMakeLists.txt
b/source/cluster/wham/src-M/CMakeLists.txt
index
c85a6b7
..
154c02e
100644
(file)
--- a/
source/cluster/wham/src-M/CMakeLists.txt
+++ b/
source/cluster/wham/src-M/CMakeLists.txt
@@
-138,7
+138,7
@@
set_property(SOURCE proc_proc.c PROPERTY COMPILE_DEFINITIONS "LINUX -DPGI" )
#========================================
# Setting binary name
#========================================
#========================================
# Setting binary name
#========================================
-set(UNRES_CLUSTER_WHAM_M_BIN "cluster_wham-M_${Fortran_COMPILER_NAME}.exe")
+set(UNRES_CLUSTER_WHAM_M_BIN "cluster_wham-mult_${Fortran_COMPILER_NAME}_MPI_${UNRES_MD_FF}.exe")
#=========================================
# Set full unres CLUSTER sources
#=========================================
# Set full unres CLUSTER sources
diff --git
a/source/cluster/wham/src-M/Makefile-MPICH-gfortran
b/source/cluster/wham/src-M/Makefile-MPICH-gfortran
index
a2fd689
..
46c8717
100644
(file)
--- a/
source/cluster/wham/src-M/Makefile-MPICH-gfortran
+++ b/
source/cluster/wham/src-M/Makefile-MPICH-gfortran
@@
-32,7
+32,7
@@
no_option:
GAB: CPPFLAGS = -DPROCOR -DLINUX -DPGI -DAMD64 -DUNRES -DISNAN -DMP -DMPI \
-DCLUST -DSPLITELE -DLANG0 -DCRYST_BOND -DCRYST_THETA -DCRYST_SC
GAB: CPPFLAGS = -DPROCOR -DLINUX -DPGI -DAMD64 -DUNRES -DISNAN -DMP -DMPI \
-DCLUST -DSPLITELE -DLANG0 -DCRYST_BOND -DCRYST_THETA -DCRYST_SC
-GAB: BIN = ../../../../bin/cluster/unres_clustMD-mult_ifort_MPICH_GAB.exe
+GAB: BIN = ../../../../bin/cluster/cluster_wham-mult_ifort_MPICH_GAB.exe
GAB: ${object} xdrf/libxdrf.a
cc -o compinfo compinfo.c
./compinfo | true
GAB: ${object} xdrf/libxdrf.a
cc -o compinfo compinfo.c
./compinfo | true
@@
-41,7
+41,7
@@
GAB: ${object} xdrf/libxdrf.a
4P: CPPFLAGS = -DLINUX -DPGI -DAMD64 -DUNRES -DISNAN -DMP -DMPI \
-DCLUST -DSPLITELE -DLANG0 -DCRYST_BOND -DCRYST_THETA -DCRYST_SC
4P: CPPFLAGS = -DLINUX -DPGI -DAMD64 -DUNRES -DISNAN -DMP -DMPI \
-DCLUST -DSPLITELE -DLANG0 -DCRYST_BOND -DCRYST_THETA -DCRYST_SC
-4P: BIN = ../../../../bin/cluster/unres_clustMD-mult_ifort_MPICH_4P.exe
+4P: BIN = ../../../../bin/cluster/cluster_wham-mult_ifort_MPICH_4P.exe
4P: ${object} xdrf/libxdrf.a
cc -o compinfo compinfo.c
./compinfo | true
4P: ${object} xdrf/libxdrf.a
cc -o compinfo compinfo.c
./compinfo | true
@@
-50,7
+50,7
@@
GAB: ${object} xdrf/libxdrf.a
E0LL2Y: CPPFLAGS = -DLINUX -DPGI -DAMD64 -DUNRES -DISNAN -DMP -DMPI \
-DCLUST -DSPLITELE -DLANG0
E0LL2Y: CPPFLAGS = -DLINUX -DPGI -DAMD64 -DUNRES -DISNAN -DMP -DMPI \
-DCLUST -DSPLITELE -DLANG0
-E0LL2Y: BIN = ../../../../bin/cluster/unres_clustMD-mult_ifort_MPICH_E0LL2Y.exe
+E0LL2Y: BIN = ../../../../bin/cluster/cluster_wham-mult_ifort_MPICH_E0LL2Y.exe
E0LL2Y: ${object} xdrf/libxdrf.a
cc -o compinfo compinfo.c
./compinfo | true
E0LL2Y: ${object} xdrf/libxdrf.a
cc -o compinfo compinfo.c
./compinfo | true
diff --git
a/source/cluster/wham/src-M/Makefile-MPICH-ifort
b/source/cluster/wham/src-M/Makefile-MPICH-ifort
index
dc58838
..
1530c5d
100644
(file)
--- a/
source/cluster/wham/src-M/Makefile-MPICH-ifort
+++ b/
source/cluster/wham/src-M/Makefile-MPICH-ifort
@@
-15,7
+15,7
@@
LIBS = -L$(INSTALL_DIR)/lib -lmpich xdrf/libxdrf.a
.F.o:
${FC} ${FFLAGS} ${CPPFLAGS} ${FFLAGS} $*.F
.F.o:
${FC} ${FFLAGS} ${CPPFLAGS} ${FFLAGS} $*.F
-objects = main_clust.o arcos.o cartprint.o chainbuild.o convert.o initialize_p.o \
+object = main_clust.o arcos.o cartprint.o chainbuild.o convert.o initialize_p.o \
matmult.o readrtns.o pinorm.o rescode.o intcor.o timing.o misc.o \
geomout.o readpdb.o read_coords.o parmread.o probabl.o fitsq.o hc.o \
track.o wrtclust.o srtclust.o noyes.o contact.o printmat.o \
matmult.o readrtns.o pinorm.o rescode.o intcor.o timing.o misc.o \
geomout.o readpdb.o read_coords.o parmread.o probabl.o fitsq.o hc.o \
track.o wrtclust.o srtclust.o noyes.o contact.o printmat.o \
@@
-29,7
+29,7
@@
no_option:
GAB: CPPFLAGS = -DPROCOR -DLINUX -DPGI -DAMD64 -DUNRES -DISNAN -DMP -DMPI \
-DCLUST -DSPLITELE -DLANG0 -DCRYST_BOND -DCRYST_THETA -DCRYST_SC
GAB: CPPFLAGS = -DPROCOR -DLINUX -DPGI -DAMD64 -DUNRES -DISNAN -DMP -DMPI \
-DCLUST -DSPLITELE -DLANG0 -DCRYST_BOND -DCRYST_THETA -DCRYST_SC
-GAB: BIN = ../../../../bin/cluster/unres_clustMD-mult_ifort_MPICH_GAB.exe
+GAB: BIN = ../../../../bin/cluster/cluster_wham-mult_ifort_MPICH_GAB.exe
GAB: ${object} xdrf/libxdrf.a
cc -o compinfo compinfo.c
./compinfo | true
GAB: ${object} xdrf/libxdrf.a
cc -o compinfo compinfo.c
./compinfo | true
@@
-38,7
+38,7
@@
GAB: ${object} xdrf/libxdrf.a
4P: CPPFLAGS = -DLINUX -DPGI -DAMD64 -DUNRES -DISNAN -DMP -DMPI \
-DCLUST -DSPLITELE -DLANG0 -DCRYST_BOND -DCRYST_THETA -DCRYST_SC
4P: CPPFLAGS = -DLINUX -DPGI -DAMD64 -DUNRES -DISNAN -DMP -DMPI \
-DCLUST -DSPLITELE -DLANG0 -DCRYST_BOND -DCRYST_THETA -DCRYST_SC
-4P: BIN = ../../../../bin/cluster/unres_clustMD-mult_ifort_MPICH_4P.exe
+4P: BIN = ../../../../bin/cluster/cluster_wham-mult_ifort_MPICH_4P.exe
4P: ${object} xdrf/libxdrf.a
cc -o compinfo compinfo.c
./compinfo | true
4P: ${object} xdrf/libxdrf.a
cc -o compinfo compinfo.c
./compinfo | true
@@
-47,7
+47,7
@@
GAB: ${object} xdrf/libxdrf.a
E0LL2Y: CPPFLAGS = -DLINUX -DPGI -DAMD64 -DUNRES -DISNAN -DMP -DMPI \
-DCLUST -DSPLITELE -DLANG0
E0LL2Y: CPPFLAGS = -DLINUX -DPGI -DAMD64 -DUNRES -DISNAN -DMP -DMPI \
-DCLUST -DSPLITELE -DLANG0
-E0LL2Y: BIN = ../../../../bin/cluster/unres_clustMD-mult_ifort_MPICH_E0LL2Y.exe
+E0LL2Y: BIN = ../../../../bin/cluster/cluster_wham-mult_ifort_MPICH_E0LL2Y.exe
E0LL2Y: ${object} xdrf/libxdrf.a
cc -o compinfo compinfo.c
./compinfo | true
E0LL2Y: ${object} xdrf/libxdrf.a
cc -o compinfo compinfo.c
./compinfo | true
diff --git
a/source/cluster/wham/src/CMakeLists.txt
b/source/cluster/wham/src/CMakeLists.txt
index
7b6695b
..
1c2614d
100644
(file)
--- a/
source/cluster/wham/src/CMakeLists.txt
+++ b/
source/cluster/wham/src/CMakeLists.txt
@@
-138,7
+138,7
@@
set_property(SOURCE ${UNRES_CLUSTER_WHAM_PP_SRC} PROPERTY COMPILE_DEFINITIONS ${
#========================================
# Setting binary name
#========================================
#========================================
# Setting binary name
#========================================
-set(UNRES_CLUSTER_WHAM_BIN "cluster_wham_${Fortran_COMPILER_NAME}.exe")
+set(UNRES_CLUSTER_WHAM_BIN "cluster_wham_${Fortran_COMPILER_NAME}_MPI_${UNRES_MD_FF}.exe")
set_property(SOURCE proc_proc.c PROPERTY COMPILE_DEFINITIONS "LINUX -DPGI" )
set_property(SOURCE proc_proc.c PROPERTY COMPILE_DEFINITIONS "LINUX -DPGI" )
diff --git
a/source/cluster/wham/src/Makefile-MPICH-gfortran
b/source/cluster/wham/src/Makefile-MPICH-gfortran
index
65249b6
..
df700a9
100644
(file)
--- a/
source/cluster/wham/src/Makefile-MPICH-gfortran
+++ b/
source/cluster/wham/src/Makefile-MPICH-gfortran
@@
-32,7
+32,7
@@
no_option:
GAB: CPPFLAGS = -DPROCOR -DLINUX -DG77 -DAMD64 -DUNRES -DISNAN -DMP -DMPI \
-DCLUST -DSPLITELE -DLANG0 -DCRYST_BOND -DCRYST_THETA -DCRYST_SC
GAB: CPPFLAGS = -DPROCOR -DLINUX -DG77 -DAMD64 -DUNRES -DISNAN -DMP -DMPI \
-DCLUST -DSPLITELE -DLANG0 -DCRYST_BOND -DCRYST_THETA -DCRYST_SC
-GAB: BIN = ../../../../bin/cluster/unres_clustMD_gfort_MPICH_GAB.exe
+GAB: BIN = ../../../../bin/cluster/cluster_wham_gfort_MPICH_GAB.exe
GAB: ${object} xdrf/libxdrf.a
cc -o compinfo compinfo.c
./compinfo | true
GAB: ${object} xdrf/libxdrf.a
cc -o compinfo compinfo.c
./compinfo | true
@@
-41,7
+41,7
@@
GAB: ${object} xdrf/libxdrf.a
4P: CPPFLAGS = -DLINUX -DG77 -DAMD64 -DUNRES -DISNAN -DMP -DMPI \
-DCLUST -DSPLITELE -DLANG0 -DCRYST_BOND -DCRYST_THETA -DCRYST_SC
4P: CPPFLAGS = -DLINUX -DG77 -DAMD64 -DUNRES -DISNAN -DMP -DMPI \
-DCLUST -DSPLITELE -DLANG0 -DCRYST_BOND -DCRYST_THETA -DCRYST_SC
-4P: BIN = ../../../../bin/cluster/unres_clustMD_gfort_MPICH_4P.exe
+4P: BIN = ../../../../bin/cluster/cluster_wham_gfort_MPICH_4P.exe
4P: ${object} xdrf/libxdrf.a
cc -o compinfo compinfo.c
./compinfo | true
4P: ${object} xdrf/libxdrf.a
cc -o compinfo compinfo.c
./compinfo | true
@@
-50,7
+50,7
@@
GAB: ${object} xdrf/libxdrf.a
E0LL2Y: CPPFLAGS = -DLINUX -DG77 -DAMD64 -DUNRES -DISNAN -DMP -DMPI \
-DCLUST -DSPLITELE -DLANG0
E0LL2Y: CPPFLAGS = -DLINUX -DG77 -DAMD64 -DUNRES -DISNAN -DMP -DMPI \
-DCLUST -DSPLITELE -DLANG0
-E0LL2Y: BIN = ../../../../bin/cluster/unres_clustMD_gfort_MPICH_E0LL2Y.exe
+E0LL2Y: BIN = ../../../../bin/cluster/cluster_wham_gfort_MPICH_E0LL2Y.exe
E0LL2Y: ${object} xdrf/libxdrf.a
cc -o compinfo compinfo.c
./compinfo | true
E0LL2Y: ${object} xdrf/libxdrf.a
cc -o compinfo compinfo.c
./compinfo | true
diff --git
a/source/cluster/wham/src/Makefile-MPICH-ifort
b/source/cluster/wham/src/Makefile-MPICH-ifort
index
c688216
..
6d84dc6
100644
(file)
--- a/
source/cluster/wham/src/Makefile-MPICH-ifort
+++ b/
source/cluster/wham/src/Makefile-MPICH-ifort
@@
-29,7
+29,7
@@
no_option:
GAB: CPPFLAGS = -DPROCOR -DLINUX -DPGI -DAMD64 -DUNRES -DISNAN -DMP -DMPI \
-DCLUST -DSPLITELE -DLANG0 -DCRYST_BOND -DCRYST_THETA -DCRYST_SC
GAB: CPPFLAGS = -DPROCOR -DLINUX -DPGI -DAMD64 -DUNRES -DISNAN -DMP -DMPI \
-DCLUST -DSPLITELE -DLANG0 -DCRYST_BOND -DCRYST_THETA -DCRYST_SC
-GAB: BIN = ../../../../bin/cluster/unres_clustMD_ifort_MPICH_GAB.exe
+GAB: BIN = ../../../../bin/cluster/cluster_wham_ifort_MPICH_GAB.exe
GAB: ${object} xdrf/libxdrf.a
cc -o compinfo compinfo.c
./compinfo | true
GAB: ${object} xdrf/libxdrf.a
cc -o compinfo compinfo.c
./compinfo | true
@@
-38,7
+38,7
@@
GAB: ${object} xdrf/libxdrf.a
4P: CPPFLAGS = -DLINUX -DPGI -DAMD64 -DUNRES -DISNAN -DMP -DMPI \
-DCLUST -DSPLITELE -DLANG0 -DCRYST_BOND -DCRYST_THETA -DCRYST_SC
4P: CPPFLAGS = -DLINUX -DPGI -DAMD64 -DUNRES -DISNAN -DMP -DMPI \
-DCLUST -DSPLITELE -DLANG0 -DCRYST_BOND -DCRYST_THETA -DCRYST_SC
-4P: BIN = ../../../../bin/cluster/unres_clustMD_ifort_MPICH_4P.exe
+4P: BIN = ../../../../bin/cluster/cluster_wham_ifort_MPICH_4P.exe
4P: ${object} xdrf/libxdrf.a
cc -o compinfo compinfo.c
./compinfo | true
4P: ${object} xdrf/libxdrf.a
cc -o compinfo compinfo.c
./compinfo | true
@@
-47,7
+47,7
@@
GAB: ${object} xdrf/libxdrf.a
E0LL2Y: CPPFLAGS = -DLINUX -DPGI -DAMD64 -DUNRES -DISNAN -DMP -DMPI \
-DCLUST -DSPLITELE -DLANG0
E0LL2Y: CPPFLAGS = -DLINUX -DPGI -DAMD64 -DUNRES -DISNAN -DMP -DMPI \
-DCLUST -DSPLITELE -DLANG0
-E0LL2Y: BIN = ../../../../bin/cluster/unres_clustMD_ifort_MPICH_E0LL2Y.exe
+E0LL2Y: BIN = ../../../../bin/cluster/cluster_wham_ifort_MPICH_E0LL2Y.exe
E0LL2Y: ${object} xdrf/libxdrf.a
cc -o compinfo compinfo.c
./compinfo | true
E0LL2Y: ${object} xdrf/libxdrf.a
cc -o compinfo compinfo.c
./compinfo | true
diff --git
a/source/unres/src_CSA/CMakeLists.txt
b/source/unres/src_CSA/CMakeLists.txt
index
1ae7730
..
340fd7c
100644
(file)
--- a/
source/unres/src_CSA/CMakeLists.txt
+++ b/
source/unres/src_CSA/CMakeLists.txt
@@
-149,6
+149,10
@@
elseif(UNRES_CSA_FF STREQUAL "3P")
set(CPPFLAGS "UNRES -DISNAN -DSPLITELE -DLANG0 -DCRYST_BOND -DCRYST_THETA -DCRYST_SC -DSCCORPDB" )
elseif(UNRES_CSA_FF STREQUAL "4P")
set(CPPFLAGS "UNRES -DISNAN -DSPLITELE -DLANG0 -DCRYST_BOND -DCRYST_THETA -DCRYST_SC -DSCCORPDB" )
set(CPPFLAGS "UNRES -DISNAN -DSPLITELE -DLANG0 -DCRYST_BOND -DCRYST_THETA -DCRYST_SC -DSCCORPDB" )
elseif(UNRES_CSA_FF STREQUAL "4P")
set(CPPFLAGS "UNRES -DISNAN -DSPLITELE -DLANG0 -DCRYST_BOND -DCRYST_THETA -DCRYST_SC -DSCCORPDB" )
+elseif(UNRES_CSA_FF STREQUAL "GAB" )
+ set(CPPFLAGS "PROCOR -DUNRES -DISNAN -DSPLITELE -DLANG0 -DCRYST_BOND -DCRYST_THETA -DCRYST_SC" )
+elseif(UNRES_CSA_FF STREQUAL "E0LL2Y" )
+ set(CPPFLAGS "PROCOR -DUNRES -DISNAN -DSPLITELE -DLANG0" )
endif(UNRES_CSA_FF STREQUAL "CASP3")
#=========================================
endif(UNRES_CSA_FF STREQUAL "CASP3")
#=========================================
@@
-192,7
+196,7
@@
set_property(SOURCE ${UNRES_CSA_PP_SRC} PROPERTY COMPILE_DEFINITIONS ${CPPFLAGS}
#========================================
# Setting binary name
#========================================
#========================================
# Setting binary name
#========================================
-set(UNRES_BIN "unresCSA_${Fortran_COMPILER_NAME}_${UNRES_CSA_FF}.exe")
+set(UNRES_BIN "unresCSA_${Fortran_COMPILER_NAME}_MPI_${UNRES_CSA_FF}.exe")
#=========================================
# cinfo.f workaround for CMake
#=========================================
# cinfo.f workaround for CMake
diff --git
a/source/unres/src_MD-M/CMakeLists.txt
b/source/unres/src_MD-M/CMakeLists.txt
index
171fa3f
..
e4c3c08
100644
(file)
--- a/
source/unres/src_MD-M/CMakeLists.txt
+++ b/
source/unres/src_MD-M/CMakeLists.txt
@@
-256,10
+256,10
@@
set_property(SOURCE proc_proc.c PROPERTY COMPILE_DEFINITIONS "SGI" )
#========================================
if(UNRES_WITH_MPI)
# binary with mpi
#========================================
if(UNRES_WITH_MPI)
# binary with mpi
- set(UNRES_BIN "unresMD-M_${Fortran_COMPILER_NAME}_MPICH_${UNRES_MD_FF}.exe")
+ set(UNRES_BIN "unresMD-mult_${Fortran_COMPILER_NAME}_MPI_${UNRES_MD_FF}.exe")
else(UNRES_WITH_MPI)
# binary without mpi
else(UNRES_WITH_MPI)
# binary without mpi
- set(UNRES_BIN "unresMD-M_${Fortran_COMPILER_NAME}_single_${UNRES_MD_FF}.exe")
+ set(UNRES_BIN "unresMD-mult_${Fortran_COMPILER_NAME}_single_${UNRES_MD_FF}.exe")
endif(UNRES_WITH_MPI)
#=========================================
endif(UNRES_WITH_MPI)
#=========================================
diff --git
a/source/unres/src_MD/CMakeLists.txt
b/source/unres/src_MD/CMakeLists.txt
index
3d97d54
..
a19dbd0
100644
(file)
--- a/
source/unres/src_MD/CMakeLists.txt
+++ b/
source/unres/src_MD/CMakeLists.txt
@@
-223,7
+223,7
@@
set_property(SOURCE ${UNRES_MD_PP_SRC} PROPERTY COMPILE_DEFINITIONS ${CPPFLAGS}
#========================================
if(UNRES_WITH_MPI)
# binary with mpi
#========================================
if(UNRES_WITH_MPI)
# binary with mpi
- set(UNRES_BIN "unresMD_${Fortran_COMPILER_NAME}_MPICH_${UNRES_MD_FF}.exe")
+ set(UNRES_BIN "unresMD_${Fortran_COMPILER_NAME}_MPI_${UNRES_MD_FF}.exe")
else(UNRES_WITH_MPI)
# binary without mpi
set(UNRES_BIN "unresMD_${Fortran_COMPILER_NAME}_single_${UNRES_MD_FF}.exe")
else(UNRES_WITH_MPI)
# binary without mpi
set(UNRES_BIN "unresMD_${Fortran_COMPILER_NAME}_single_${UNRES_MD_FF}.exe")
diff --git
a/source/unres/src_MIN/CMakeLists.txt
b/source/unres/src_MIN/CMakeLists.txt
index
485a7e7
..
6138673
100644
(file)
--- a/
source/unres/src_MIN/CMakeLists.txt
+++ b/
source/unres/src_MIN/CMakeLists.txt
@@
-166,7
+166,7
@@
set_property(SOURCE ${UNRES_MIN_PP_SRC} PROPERTY COMPILE_DEFINITIONS ${CPPFLAGS}
#========================================
# Setting binary name
#========================================
#========================================
# Setting binary name
#========================================
-set(UNRES_BIN "unres_min_${Fortran_COMPILER_NAME}.exe")
+set(UNRES_BIN "unres_${Fortran_COMPILER_NAME}_MIN_single_${UNRES_MD_FF}.exe")
#========================================
# cinfo.f workaround for Cmake
#========================================
# cinfo.f workaround for Cmake
diff --git
a/source/xdrfpdb/src-M/CMakeLists.txt
b/source/xdrfpdb/src-M/CMakeLists.txt
index
49748e2
..
03809e6
100644
(file)
--- a/
source/xdrfpdb/src-M/CMakeLists.txt
+++ b/
source/xdrfpdb/src-M/CMakeLists.txt
@@
-61,12
+61,12
@@
set_property(SOURCE ${UNRES_XDRF_PP_SRC-M} PROPERTY COMPILE_DEFINITIONS ${CPPFLA
#=========================================
add_executable(UNRES_XDRF2PDB_BIN-M ${UNRES_XDRF_XDRF2PDB_SRC-M} )
target_link_libraries(UNRES_XDRF2PDB_BIN-M xdrf )
#=========================================
add_executable(UNRES_XDRF2PDB_BIN-M ${UNRES_XDRF_XDRF2PDB_SRC-M} )
target_link_libraries(UNRES_XDRF2PDB_BIN-M xdrf )
-set_target_properties(UNRES_XDRF2PDB_BIN-M PROPERTIES OUTPUT_NAME xdrf-M2pdb )
+set_target_properties(UNRES_XDRF2PDB_BIN-M PROPERTIES OUTPUT_NAME xdrf2pdb-mult )
set_property(TARGET UNRES_XDRF2PDB_BIN-M PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )
add_executable(UNRES_XDRF2PDBM_BIN-M ${UNRES_XDRF_XDRF2PDB-M_SRC-M} )
target_link_libraries( UNRES_XDRF2PDBM_BIN-M xdrf )
set_property(TARGET UNRES_XDRF2PDB_BIN-M PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )
add_executable(UNRES_XDRF2PDBM_BIN-M ${UNRES_XDRF_XDRF2PDB-M_SRC-M} )
target_link_libraries( UNRES_XDRF2PDBM_BIN-M xdrf )
-set_target_properties(UNRES_XDRF2PDBM_BIN-M PROPERTIES OUTPUT_NAME xdrf-M2pdb-m )
+set_target_properties(UNRES_XDRF2PDBM_BIN-M PROPERTIES OUTPUT_NAME xdrf2pdb-m-mult )
set_property(TARGET UNRES_XDRF2PDBM_BIN-M PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )
set_property(TARGET UNRES_XDRF2PDBM_BIN-M PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )