X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=c56a413f6d6393bc842b64d5fb6e5ac2446dbb83;hb=8dbc01d6a707cb7d9a6117601bc32e4adadc02ea;hp=5f701f7de6fb50b4a8a0681bb460c6dcc0a27d5b;hpb=abb8046503fd7ebf6a2df6d399fa4dbb1f5ad056;p=unres.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 5f701f7..c56a413 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 @@ -198,16 +197,15 @@ find_package (Threads) # Add source files #======================================= - add_subdirectory(source/lib/xdrf) - 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_DFA) add_subdirectory(source/unres/src_MD-M) add_subdirectory(source/unres/src_CSA) add_subdirectory(source/unres/src_CSA_DiL) @@ -229,6 +227,7 @@ else() add_subdirectory(source/unres/src_MD) if(UNRES_WITH_MPI) add_subdirectory(source/unres/src_MD-M) + add_subdirectory(source/unres/src_MD_DFA) add_subdirectory(source/unres/src_CSA) add_subdirectory(source/unres/src_CSA_DiL) add_subdirectory(source/wham/src)