projects
/
unres.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'feature-cmake' into devel
[unres.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
b8b63fe
..
aac881c
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-159,6
+159,8
@@
if(UNRES_NA_MMCE)
add_subdirectory(source/unres/src_CSA)
add_subdirectory(source/xdrfpdb/src)
add_subdirectory(source/xdrfpdb/src-M)
add_subdirectory(source/unres/src_CSA)
add_subdirectory(source/xdrfpdb/src)
add_subdirectory(source/xdrfpdb/src-M)
+ add_subdirectory(source/cluster/wham/src)
+ add_subdirectory(source/cluster/wham/src-M)
endif (Fortran_COMPILER_NAME STREQUAL "ifort")
else()
add_subdirectory(source/unres/src_MD)
endif (Fortran_COMPILER_NAME STREQUAL "ifort")
else()
add_subdirectory(source/unres/src_MD)
@@
-166,6
+168,7
@@
if(UNRES_NA_MMCE)
# add_subdirectory(source/unres/src_MD-M)
endif()
add_subdirectory(source/unres/src_MIN)
# add_subdirectory(source/unres/src_MD-M)
endif()
add_subdirectory(source/unres/src_MIN)
+ add_subdirectory(source/cluster/unres/src)
else()
else()
@@
-175,9
+178,13
@@
else()
add_subdirectory(source/unres/src_CSA)
add_subdirectory(source/xdrfpdb/src)
add_subdirectory(source/xdrfpdb/src-M)
add_subdirectory(source/unres/src_CSA)
add_subdirectory(source/xdrfpdb/src)
add_subdirectory(source/xdrfpdb/src-M)
-
+ add_subdirectory(source/wham/src)
+ add_subdirectory(source/wham/src-M)
+ add_subdirectory(source/cluster/wham/src)
+ add_subdirectory(source/cluster/wham/src-M)
endif(UNRES_WITH_MPI)
add_subdirectory(source/unres/src_MIN)
endif(UNRES_WITH_MPI)
add_subdirectory(source/unres/src_MIN)
+ add_subdirectory(source/cluster/unres/src)
endif(UNRES_NA_MMCE)
endif(UNRES_NA_MMCE)