X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=bb961d45e987f6a2613a2d8b17abe9c19f773afb;hb=refs%2Fheads%2Ffeature-ga;hp=e9cf2424330849fd2f7df98b8d2b8943cd0f324a;hpb=956b6f4cdb70d03f3a732f774a9242872745f4b9;p=unres.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e9cf242..bb961d4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -79,8 +79,9 @@ if(MPIF_LOCAL_DIR)
   find_library(MPIF_LIBRARY NAMES libmpich.a  NO_DEFAULT_PATH  PATHS  ${MPIF_LOCAL_DIR}/lib)
   find_path( MPIF_INCLUDE_DIRECTORIES  NAMES mpif.h  NO_DEFAULT_PATH  PATHS  ${MPIF_LOCAL_DIR}/include  )
 else(MPIF_LOCAL_DIR)
-  find_library(MPIF_LIBRARY NAMES mpich mpi PATHS 
+  find_library(MPIF_LIBRARY NAMES mpi mpich PATHS 
 	${MPI_LIBRARY}
+	${MPI_EXTRA_LIBRARY}
 	/users/local/mpi64/mpich-1.2.7p1/lib 
 	/usr/lib
         /usr/local/lib
@@ -116,7 +117,7 @@ endif(MPIF_FOUND)
 
 #======================================
 # Detect system architecture
-#
+#=======================================
 
 if( CMAKE_SIZEOF_VOID_P EQUAL 4 )
   set(architektura "32")
@@ -126,6 +127,14 @@ endif( CMAKE_SIZEOF_VOID_P EQUAL 4 )
 
 message("Detected ${architektura}-bit architecture")	
 
+#=======================================
+# Find other libraries
+#=======================================
+
+# used by unres/src_MIN
+find_package (Threads)
+
+
 
 #=======================================
 #  Create diractories for build targets
@@ -137,14 +146,19 @@ message("Detected ${architektura}-bit architecture")
 #=======================================     
 
 
-if(UNRES_NA_MMCE EQUAL "ON")
+add_subdirectory(source/lib/xdrf)
+
 
-  if(UNRES_WITH_MPI EQUAL "ON")
+if(UNRES_NA_MMCE)
+
+  if(UNRES_WITH_MPI)
     # Brak MPI dla gfortrana, wiec tylko na ifort sie skompiluje
     if (Fortran_COMPILER_NAME STREQUAL "ifort")
       add_subdirectory(source/unres/src_MD)
       add_subdirectory(source/unres/src_MD-M)
       add_subdirectory(source/unres/src_CSA)
+      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)
@@ -152,13 +166,26 @@ if(UNRES_NA_MMCE EQUAL "ON")
     # add_subdirectory(source/unres/src_MD-M)
   endif()
   add_subdirectory(source/unres/src_MIN)
-
+  add_subdirectory(source/cluster/unres/src)
+  add_subdirectory(source/xdrfpdb/src)
+  add_subdirectory(source/xdrfpdb/src-M)
+  add_subdirectory(source/ga)
 else()
 
   add_subdirectory(source/unres/src_MD)
-  add_subdirectory(source/unres/src_MD-M)
+  if(UNRES_WITH_MPI)
+    add_subdirectory(source/unres/src_MD-M)
+    add_subdirectory(source/unres/src_CSA)
+    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)
-  add_subdirectory(source/unres/src_CSA)
+  add_subdirectory(source/cluster/unres/src)
+  add_subdirectory(source/xdrfpdb/src)
+  add_subdirectory(source/xdrfpdb/src-M)
+  add_subdirectory(source/ga)
 
-endif(UNRES_NA_MMCE EQUAL "ON")
+endif(UNRES_NA_MMCE)