projects
/
unres.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8652a4c
)
added default preprocessor flags for unknown compilers
author
Dawid Jagiela
<lightnir@chem.univ.gda.pl>
Fri, 12 Apr 2013 10:47:11 +0000
(12:47 +0200)
committer
Dawid Jagiela
<lightnir@chem.univ.gda.pl>
Fri, 12 Apr 2013 10:47:11 +0000
(12:47 +0200)
source/unres/src_MD-M/CMakeLists.txt
patch
|
blob
|
history
source/unres/src_MD/CMakeLists.txt
patch
|
blob
|
history
source/wham/src-M/CMakeLists.txt
patch
|
blob
|
history
source/wham/src/CMakeLists.txt
patch
|
blob
|
history
source/wham/src/a.sh
[deleted file]
patch
|
blob
|
history
diff --git
a/source/unres/src_MD-M/CMakeLists.txt
b/source/unres/src_MD-M/CMakeLists.txt
index
63137a5
..
66264be
100644
(file)
--- a/
source/unres/src_MD-M/CMakeLists.txt
+++ b/
source/unres/src_MD-M/CMakeLists.txt
@@
-235,6
+235,9
@@
elseif (Fortran_COMPILER_NAME STREQUAL "f95")
elseif (Fortran_COMPILER_NAME STREQUAL "gfortran")
# Add old gfortran flags
set(CPPFLAGS "${CPPFLAGS} -DG77")
elseif (Fortran_COMPILER_NAME STREQUAL "gfortran")
# Add old gfortran flags
set(CPPFLAGS "${CPPFLAGS} -DG77")
+else (Fortran_COMPILER_NAME STREQUAL "ifort")
+ # Default preprocessor flags
+ set(CPPFLAGS "${CPPFLAGS} -DPGI")
endif (Fortran_COMPILER_NAME STREQUAL "ifort")
endif (Fortran_COMPILER_NAME STREQUAL "ifort")
diff --git
a/source/unres/src_MD/CMakeLists.txt
b/source/unres/src_MD/CMakeLists.txt
index
a0353f4
..
7dc7135
100644
(file)
--- a/
source/unres/src_MD/CMakeLists.txt
+++ b/
source/unres/src_MD/CMakeLists.txt
@@
-212,6
+212,9
@@
elseif (Fortran_COMPILER_NAME STREQUAL "f95")
elseif (Fortran_COMPILER_NAME STREQUAL "gfortran")
# Add old gfortran flags
set(CPPFLAGS "${CPPFLAGS} -DG77")
elseif (Fortran_COMPILER_NAME STREQUAL "gfortran")
# Add old gfortran flags
set(CPPFLAGS "${CPPFLAGS} -DG77")
+else(Fortran_COMPILER_NAME STREQUAL "ifort")
+ # Default preprocessor flag
+ set(CPPFLAGS "${CPPFLAGS} -DPGI")
endif (Fortran_COMPILER_NAME STREQUAL "ifort")
#=========================================
endif (Fortran_COMPILER_NAME STREQUAL "ifort")
#=========================================
diff --git
a/source/wham/src-M/CMakeLists.txt
b/source/wham/src-M/CMakeLists.txt
index
d534ddb
..
2177570
100644
(file)
--- a/
source/wham/src-M/CMakeLists.txt
+++ b/
source/wham/src-M/CMakeLists.txt
@@
-151,6
+151,9
@@
elseif (Fortran_COMPILER_NAME STREQUAL "f95")
elseif (Fortran_COMPILER_NAME STREQUAL "gfortran")
# Add old gfortran flags
set(CPPFLAGS "${CPPFLAGS} -DG77")
elseif (Fortran_COMPILER_NAME STREQUAL "gfortran")
# Add old gfortran flags
set(CPPFLAGS "${CPPFLAGS} -DG77")
+else (Fortran_COMPILER_NAME STREQUAL "ifort")
+ # Default preprocessor flags
+ set(CPPFLAGS "${CPPFLAGS} -DPGI")
endif (Fortran_COMPILER_NAME STREQUAL "ifort")
#=========================================
endif (Fortran_COMPILER_NAME STREQUAL "ifort")
#=========================================
diff --git
a/source/wham/src/CMakeLists.txt
b/source/wham/src/CMakeLists.txt
index
c164506
..
7113b9c
100644
(file)
--- a/
source/wham/src/CMakeLists.txt
+++ b/
source/wham/src/CMakeLists.txt
@@
-150,6
+150,9
@@
elseif (Fortran_COMPILER_NAME STREQUAL "f95")
elseif (Fortran_COMPILER_NAME STREQUAL "gfortran")
# Add old gfortran flags
set(CPPFLAGS "${CPPFLAGS} -DG77")
elseif (Fortran_COMPILER_NAME STREQUAL "gfortran")
# Add old gfortran flags
set(CPPFLAGS "${CPPFLAGS} -DG77")
+else (Fortran_COMPILER_NAME STREQUAL "ifort")
+ # Default preprocessor flags
+ set(CPPFLAGS "${CPPFLAGS} -DPGI")
endif (Fortran_COMPILER_NAME STREQUAL "ifort")
#=========================================
endif (Fortran_COMPILER_NAME STREQUAL "ifort")
#=========================================
diff --git
a/source/wham/src/a.sh
b/source/wham/src/a.sh
deleted file mode 100755
(executable)
index
00b1548
..0000000
--- a/
source/wham/src/a.sh
+++ /dev/null
@@
-1,9
+0,0 @@
-a=1
-echo $a
-while [ $a -lt 10 ]
-do
- a=`expr $a + 1`
-done
-echo $a
-b=`expr $a / 5`
-echo a=$a b=$b