X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;ds=sidebyside;f=CMakeLists.txt;h=b6c3526852117b75e93145ce2095832a7003d2c5;hb=83c89a4b9b96438e18c6373adff2f2507e8a1837;hp=4ecd514e67547664908401494ea8f5b2a8d88965;hpb=17d9527d00b0278a3c6b8d03a65f9524ec9754f1;p=unres.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4ecd514..b6c3526 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -120,8 +120,8 @@ option(UNRES_NA_MMCE "Kompilujemy na mmmce?" OFF )
 # MPI stuff
 #=================================
 
-# Note for the future - use finde package to get MPI 
-find_package(MPI)
+# Note for the future - use find package to get MPI 
+find_package(MPI QUIET)
 
 #if(MPI_LIBRARY)
 
@@ -134,15 +134,14 @@ if(MPIF_LOCAL_DIR)
 else(MPIF_LOCAL_DIR)
   find_library(MPIF_LIBRARY NAMES mpi mpich PATHS 
 	${MPI_LIBRARY}
+	${MPI_LIBRARY}/../
 	${MPI_EXTRA_LIBRARY}
-	/users/local/mpi64/mpich-1.2.7p1/lib 
 	/usr/lib
         /usr/local/lib
         /usr/local/mpi/lib
   )
   find_path( MPIF_INCLUDE_DIRECTORIES NAMES  mpif.h PATHS
 	${MPI_INCLUDE_PATH}
-	/users/local/mpi64/mpich-1.2.7p1/include
 	/usr/include
 	/usr/local/include   
 	/usr/include/mpi
@@ -210,6 +209,7 @@ if(UNRES_NA_MMCE)
       add_subdirectory(source/unres/src_MD)
       add_subdirectory(source/unres/src_MD-M)
       add_subdirectory(source/unres/src_CSA)
+      add_subdirectory(source/unres/src_CSA_DiL)
       add_subdirectory(source/cluster/wham/src)
       add_subdirectory(source/cluster/wham/src-M)
     endif (Fortran_COMPILER_NAME STREQUAL "ifort")
@@ -222,13 +222,14 @@ if(UNRES_NA_MMCE)
   add_subdirectory(source/cluster/unres/src)
   add_subdirectory(source/xdrfpdb/src)
   add_subdirectory(source/xdrfpdb/src-M)
-
+  add_subdirectory(source/maxlik/src_CSA)
 else()
 
   add_subdirectory(source/unres/src_MD)
   if(UNRES_WITH_MPI)
     add_subdirectory(source/unres/src_MD-M)
     add_subdirectory(source/unres/src_CSA)
+    add_subdirectory(source/unres/src_CSA_DiL)
     add_subdirectory(source/wham/src)
     add_subdirectory(source/wham/src-M)
     add_subdirectory(source/cluster/wham/src)
@@ -238,6 +239,6 @@ else()
   add_subdirectory(source/cluster/unres/src)
   add_subdirectory(source/xdrfpdb/src)
   add_subdirectory(source/xdrfpdb/src-M)
-
+  add_subdirectory(source/maxlik/src_CSA)
 endif(UNRES_NA_MMCE)