projects
/
unres.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
970c77d
)
added missing preprocessor flags for prng_32.F
author
Dawid Jagiela
<lightnir@chem.univ.gda.pl>
Sun, 26 Oct 2014 14:33:10 +0000
(15:33 +0100)
committer
Dawid Jagiela
<lightnir@chem.univ.gda.pl>
Sun, 26 Oct 2014 14:33:10 +0000
(15:33 +0100)
source/unres/src_CSA/CMakeLists.txt
patch
|
blob
|
history
source/unres/src_CSA_DiL/CMakeLists.txt
patch
|
blob
|
history
source/unres/src_MD-M/CMakeLists.txt
patch
|
blob
|
history
source/unres/src_MD/CMakeLists.txt
patch
|
blob
|
history
diff --git
a/source/unres/src_CSA/CMakeLists.txt
b/source/unres/src_CSA/CMakeLists.txt
index
e4b2f53
..
ba229fc
100644
(file)
--- a/
source/unres/src_CSA/CMakeLists.txt
+++ b/
source/unres/src_CSA/CMakeLists.txt
@@
-177,7
+177,9
@@
endif (Fortran_COMPILER_NAME STREQUAL "ifort")
#=========================================
set(CPPFLAGS "${CPPFLAGS} -DMP -DMPI")
#=========================================
set(CPPFLAGS "${CPPFLAGS} -DMP -DMPI")
+#=========================================
# add 64-bit specific preprocessor flags
# add 64-bit specific preprocessor flags
+#=========================================
if (architektura STREQUAL "64")
set(CPPFLAGS "${CPPFLAGS} -DAMD64")
endif (architektura STREQUAL "64")
if (architektura STREQUAL "64")
set(CPPFLAGS "${CPPFLAGS} -DAMD64")
endif (architektura STREQUAL "64")
diff --git
a/source/unres/src_CSA_DiL/CMakeLists.txt
b/source/unres/src_CSA_DiL/CMakeLists.txt
index
7d2e805
..
d69490c
100644
(file)
--- a/
source/unres/src_CSA_DiL/CMakeLists.txt
+++ b/
source/unres/src_CSA_DiL/CMakeLists.txt
@@
-177,13
+177,17
@@
endif (Fortran_COMPILER_NAME STREQUAL "ifort")
#=========================================
set(CPPFLAGS "${CPPFLAGS} -DMP -DMPI")
#=========================================
set(CPPFLAGS "${CPPFLAGS} -DMP -DMPI")
+#=========================================
# add 64-bit specific preprocessor flags
# add 64-bit specific preprocessor flags
+#=========================================
if (architektura STREQUAL "64")
set(CPPFLAGS "${CPPFLAGS} -DAMD64")
endif (architektura STREQUAL "64")
if (architektura STREQUAL "64")
set(CPPFLAGS "${CPPFLAGS} -DAMD64")
endif (architektura STREQUAL "64")
+#=========================================
# Apply preprocesor flags to *.F files
# Apply preprocesor flags to *.F files
+#=========================================
set_property(SOURCE ${UNRES_CSA_DiL_PP_SRC} PROPERTY COMPILE_DEFINITIONS ${CPPFLAGS} )
set_property(SOURCE ${UNRES_CSA_DiL_PP_SRC} PROPERTY COMPILE_DEFINITIONS ${CPPFLAGS} )
diff --git
a/source/unres/src_MD-M/CMakeLists.txt
b/source/unres/src_MD-M/CMakeLists.txt
index
b7bf588
..
84a5ab8
100644
(file)
--- a/
source/unres/src_MD-M/CMakeLists.txt
+++ b/
source/unres/src_MD-M/CMakeLists.txt
@@
-235,7
+235,9
@@
if (UNRES_WITH_MPI)
endif(UNRES_WITH_MPI)
endif(UNRES_WITH_MPI)
+#=========================================
# add 64-bit specific preprocessor flags
# add 64-bit specific preprocessor flags
+#=========================================
if (architektura STREQUAL "64")
set(CPPFLAGS "${CPPFLAGS} -DAMD64")
endif (architektura STREQUAL "64")
if (architektura STREQUAL "64")
set(CPPFLAGS "${CPPFLAGS} -DAMD64")
endif (architektura STREQUAL "64")
diff --git
a/source/unres/src_MD/CMakeLists.txt
b/source/unres/src_MD/CMakeLists.txt
index
49f3869
..
e2b4934
100644
(file)
--- a/
source/unres/src_MD/CMakeLists.txt
+++ b/
source/unres/src_MD/CMakeLists.txt
@@
-206,6
+206,13
@@
if (UNRES_WITH_MPI)
endif(UNRES_WITH_MPI)
#=========================================
endif(UNRES_WITH_MPI)
#=========================================
+# Add 64-bit specific preprocessor flags
+#=========================================
+if (architektura STREQUAL "64")
+ set(CPPFLAGS "${CPPFLAGS} -DAMD64")
+endif (architektura STREQUAL "64")
+
+#=========================================
# Apply preprocesor flags to *.F files
#=========================================
set_property(SOURCE ${UNRES_MD_PP_SRC} PROPERTY COMPILE_DEFINITIONS ${CPPFLAGS} )
# Apply preprocesor flags to *.F files
#=========================================
set_property(SOURCE ${UNRES_MD_PP_SRC} PROPERTY COMPILE_DEFINITIONS ${CPPFLAGS} )