64-bit fix for unres/CSA and unres/CSA_DiL code

[unres.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 68e0eae..b6c3526 100644 (file)
--- 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")
@@ -229,6 +229,7 @@ else()
   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)