projects
/
unres.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Naprawa konfliktów
[unres.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
5f701f7
..
dc5c917
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-202,7
+202,7
@@
find_package (Threads)
add_subdirectory(source/lib/xdrf)
add_subdirectory(source/lib/xdrf)
-if(UNRES_NA_MMCE)
+if(UNRES_NA_MMCE) #kompiluj na mmce
if(UNRES_WITH_MPI)
# Brak MPI dla gfortrana, wiec tylko na ifort sie skompiluje
if(UNRES_WITH_MPI)
# Brak MPI dla gfortrana, wiec tylko na ifort sie skompiluje
@@
-224,7
+224,7
@@
if(UNRES_NA_MMCE)
add_subdirectory(source/xdrfpdb/src)
add_subdirectory(source/xdrfpdb/src-M)
add_subdirectory(source/maxlik/src_CSA)
add_subdirectory(source/xdrfpdb/src)
add_subdirectory(source/xdrfpdb/src-M)
add_subdirectory(source/maxlik/src_CSA)
-else()
+else() #kompiluj gdzie indziej
add_subdirectory(source/unres/src_MD)
if(UNRES_WITH_MPI)
add_subdirectory(source/unres/src_MD)
if(UNRES_WITH_MPI)