projects
/
unres.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel' of mmka:unres into czarek
[unres.git]
/
source
/
unres
/
src_MD
/
CMakeLists.txt
diff --git
a/source/unres/src_MD/CMakeLists.txt
b/source/unres/src_MD/CMakeLists.txt
index
ceac982
..
94d735a
100644
(file)
--- a/
source/unres/src_MD/CMakeLists.txt
+++ b/
source/unres/src_MD/CMakeLists.txt
@@
-83,6
+83,8
@@
set(UNRES_MD_SRC0
if(Fortran_COMPILER_NAME STREQUAL "ifort")
set(UNRES_MD_SRC0 ${UNRES_MD_SRC0} prng.f )
if(Fortran_COMPILER_NAME STREQUAL "ifort")
set(UNRES_MD_SRC0 ${UNRES_MD_SRC0} prng.f )
+elseif(Fortran_COMPILER_NAME STREQUAL "mpif90")
+ set(UNRES_MD_SRC0 ${UNRES_MD_SRC0} prng.f )
else()
set(UNRES_MD_SRC0 ${UNRES_MD_SRC0} prng_32.F )
endif (Fortran_COMPILER_NAME STREQUAL "ifort")
else()
set(UNRES_MD_SRC0 ${UNRES_MD_SRC0} prng_32.F )
endif (Fortran_COMPILER_NAME STREQUAL "ifort")
@@
-150,11
+152,11
@@
if (Fortran_COMPILER_NAME STREQUAL "ifort")
#set(FFLAGS3 "-c -w -O3 -ipo -ipo_obj -opt_report" )
set(FFLAGS3 "-w -ipo " )
elseif (Fortran_COMPILER_NAME STREQUAL "gfortran")
#set(FFLAGS3 "-c -w -O3 -ipo -ipo_obj -opt_report" )
set(FFLAGS3 "-w -ipo " )
elseif (Fortran_COMPILER_NAME STREQUAL "gfortran")
- set(FFLAGS0 "-I. " )
- set(FFLAGS1 "-g -I. " )
- set(FFLAGS2 "-I. ")
+ set(FFLAGS0 "-std=legacy -I. " )
+ set(FFLAGS1 "-std=legacy -g -I. " )
+ set(FFLAGS2 "-std=legacy -I. ")
#set(FFLAGS3 "-c -w -O3 -ipo -ipo_obj -opt_report" )
#set(FFLAGS3 "-c -w -O3 -ipo -ipo_obj -opt_report" )
- set(FFLAGS3 "-I. " )
+ set(FFLAGS3 "-std=legacy -I. " )
endif (Fortran_COMPILER_NAME STREQUAL "ifort")
endif (Fortran_COMPILER_NAME STREQUAL "ifort")
@@
-261,9
+263,6
@@
FILE(APPEND ${CINFO}
return
end ")
return
end ")
-#FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/cinfo.f
-# CINFO_FORMAT(CPPFLAGS)
-#)
# add include path
set_property(SOURCE ${CMAKE_CURRENT_BINARY_DIR}/cinfo.f PROPERTY COMPILE_FLAGS "${FFLAGS0} -I${CMAKE_CURRENT_SOURCE_DIR}")
# add include path
set_property(SOURCE ${CMAKE_CURRENT_BINARY_DIR}/cinfo.f PROPERTY COMPILE_FLAGS "${FFLAGS0} -I${CMAKE_CURRENT_SOURCE_DIR}")