dodanie dwoch folderow do cmake'a

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9b6b6b8..71f7c77 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -236,6 +236,8 @@ else()
     add_subdirectory(source/wham/src-M)
     add_subdirectory(source/cluster/wham/src)
     add_subdirectory(source/cluster/wham/src-M)
+    add_subdirectory(source/unres/src_MD-M-newcorr)
+    add_subdirectory(source/wham/src-NEWSC-NEWCORR)
   endif(UNRES_WITH_MPI)
   add_subdirectory(source/unres/src_MIN)
   add_subdirectory(source/cluster/unres/src)

diff --git a/source/unres/src_MD-M-newcorr/CMakeLists.txt b/source/unres/src_MD-M-newcorr/CMakeLists.txt
index b65d077..a0fc176 100644 (file)
--- a/source/unres/src_MD-M-newcorr/CMakeLists.txt
+++ b/source/unres/src_MD-M-newcorr/CMakeLists.txt
@@ -12,7 +12,7 @@ enable_language (Fortran)
 #================================
 # Set source file lists
 #================================
-set(UNRES_MDM_SRC0 
+set(UNRES_MDMN_SRC0 
        add.f 
        arcos.f
        banach.f
@@ -95,17 +95,17 @@ set(UNRES_MDM_SRC0
 )
 
 if (Fortran_COMPILER_NAME STREQUAL "ifort")
-  set(UNRES_MDM_SRC0 ${UNRES_MDM_SRC0} prng.f ) 
+  set(UNRES_MDMN_SRC0 ${UNRES_MDMN_SRC0} prng.f ) 
 elseif(Fortran_COMPILER_NAME STREQUAL "mpif90")
-  set(UNRES_MDM_SRC0 ${UNRES_MDM_SRC0} prng.f )
+  set(UNRES_MDMN_SRC0 ${UNRES_MDMN_SRC0} prng.f )
 else()
-  set(UNRES_MDM_SRC0 ${UNRES_MDM_SRC0} prng_32.F )
+  set(UNRES_MDMN_SRC0 ${UNRES_MDMN_SRC0} prng_32.F )
 endif (Fortran_COMPILER_NAME STREQUAL "ifort")
 
-set(UNRES_MDM_SRC2 eigen.f)
-set(UNRES_MDM_SRC3 energy_p_new_barrier.F energy_p_new-sep_barrier.F gradient_p.F )
+set(UNRES_MDMN_SRC2 eigen.f)
+set(UNRES_MDMN_SRC3 energy_p_new_barrier.F energy_p_new-sep_barrier.F gradient_p.F )
 
-set(UNRES_MDM_PP_SRC
+set(UNRES_MDMN_PP_SRC
        bank.F 
        cartder.F 
        chainbuild.F 
@@ -164,7 +164,7 @@ set(UNRES_MDM_PP_SRC
 
 
 if(NOT Fortran_COMPILER_NAME STREQUAL "ifort")
-  set(UNRES_MDM_PP_SRC "${UNRES_MDM_PP_SRC} prng_32.F") 
+  set(UNRES_MDMN_PP_SRC "${UNRES_MDMN_PP_SRC} prng_32.F") 
 endif(NOT Fortran_COMPILER_NAME STREQUAL "ifort")
 
 
@@ -192,10 +192,10 @@ if(UNRES_WITH_MPI)
   set(FFLAGS3 "${FFLAGS3} -I${MPIF_INCLUDE_DIRECTORIES}")
 endif(UNRES_WITH_MPI)
 
-set_property(SOURCE ${UNRES_MDM_SRC0} APPEND PROPERTY COMPILE_FLAGS ${FFLAGS0} )
+set_property(SOURCE ${UNRES_MDMN_SRC0} APPEND PROPERTY COMPILE_FLAGS ${FFLAGS0} )
 set_property(SOURCE ${UNRES_MD_SRC1} PROPERTY COMPILE_FLAGS ${FFLAGS1} )
 set_property(SOURCE ${UNRES_MD_SRC2} PROPERTY COMPILE_FLAGS ${FFLAGS2} )
-set_property(SOURCE ${UNRES_MDM_SRC3} PROPERTY COMPILE_FLAGS ${FFLAGS3} )
+set_property(SOURCE ${UNRES_MDMN_SRC3} PROPERTY COMPILE_FLAGS ${FFLAGS3} )
 
 #=========================================
 # Settings for GAB force field 
@@ -256,7 +256,7 @@ endif (architektura STREQUAL "64")
 
 
 # Apply preprocesor flags to *.F files
-set_property(SOURCE ${UNRES_MDM_PP_SRC} PROPERTY COMPILE_DEFINITIONS ${CPPFLAGS} )  
+set_property(SOURCE ${UNRES_MDMN_PP_SRC} PROPERTY COMPILE_DEFINITIONS ${CPPFLAGS} )  
 
 # Apply preprocesor flags to proc_proc.c
 set_property(SOURCE proc_proc.c PROPERTY COMPILE_DEFINITIONS "SGI" )  
@@ -306,15 +306,15 @@ FILE(APPEND ${CINFO}
 set_property(SOURCE ${CMAKE_CURRENT_BINARY_DIR}/cinfo.f PROPERTY COMPILE_FLAGS "${FFLAGS0} -I${CMAKE_CURRENT_SOURCE_DIR}")
 
 #=========================================
-# Set full unres MD-M sources
+# Set full unres MD-MN sources
 #=========================================
-set(UNRES_MDM_SRCS ${UNRES_MDM_SRC0} ${UNRES_MDM_SRC2} ${UNRES_MDM_SRC3} ${CMAKE_CURRENT_BINARY_DIR}/cinfo.f proc_proc.c )
+set(UNRES_MDMN_SRCS ${UNRES_MDMN_SRC0} ${UNRES_MDMN_SRC2} ${UNRES_MDMN_SRC3} ${CMAKE_CURRENT_BINARY_DIR}/cinfo.f proc_proc.c )
 
 #=========================================
 # Build the binary
 #=========================================
-add_executable(UNRES_BIN-MD-M ${UNRES_MDM_SRCS} )
-set_target_properties(UNRES_BIN-MD-M PROPERTIES OUTPUT_NAME ${UNRES_BIN})
+add_executable(UNRES_BIN-MD-MN ${UNRES_MDMN_SRCS} )
+set_target_properties(UNRES_BIN-MD-MN PROPERTIES OUTPUT_NAME ${UNRES_BIN})
 
 #set_property(TARGET ${UNRES_BIN} PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/unres/MD )
 #add_dependencies (${UNRES_BIN} ${UNRES_XDRFLIB})
@@ -324,11 +324,11 @@ set_target_properties(UNRES_BIN-MD-M PROPERTIES OUTPUT_NAME ${UNRES_BIN})
 #=========================================
 # link MPI library (libmpich.a)  
 if(UNRES_WITH_MPI)
-  target_link_libraries( UNRES_BIN-MD-M ${MPIF_LIBRARIES} )
+  target_link_libraries( UNRES_BIN-MD-MN ${MPIF_LIBRARIES} )
 endif(UNRES_WITH_MPI)
 # link libxdrf.a 
 #message("UNRES_XDRFLIB=${UNRES_XDRFLIB}")
-target_link_libraries( UNRES_BIN-MD-M xdrf )
+target_link_libraries( UNRES_BIN-MD-MN xdrf )
 
 #=========================================
 # TESTS 

diff --git a/source/wham/src-NEWSC-NEWCORR/CMakeLists.txt b/source/wham/src-NEWSC-NEWCORR/CMakeLists.txt
index aca8eb4..c06fe1e 100644 (file)
--- a/source/wham/src-NEWSC-NEWCORR/CMakeLists.txt
+++ b/source/wham/src-NEWSC-NEWCORR/CMakeLists.txt
@@ -7,7 +7,7 @@ enable_language (Fortran)
 #================================
 # Set source file lists
 #================================
-set(UNRES_WHAM_SRC0 
+set(UNRES_WHAM_SRCMN0 
        wham_multparm.F
        bxread.F
        xread.F
@@ -61,7 +61,7 @@ set(UNRES_WHAM_SRC0
        mysort.f
 )
 
-set(UNRES_WHAM_PP_SRC
+set(UNRES_WHAM_PP_SRCMN
        bxread.F
        chainbuild.F
        conf_compar.F
@@ -105,7 +105,7 @@ if(UNRES_WITH_MPI)
   set(FFLAGS0 "${FFLAGS0} -I${MPIF_INCLUDE_DIRECTORIES}")
 endif(UNRES_WITH_MPI)
 
-set_property(SOURCE ${UNRES_WHAM_SRC0} PROPERTY COMPILE_FLAGS ${FFLAGS0} )
+set_property(SOURCE ${UNRES_WHAM_SRCMN0} PROPERTY COMPILE_FLAGS ${FFLAGS0} )
 
 #=========================================
 # WHAM preprocesor flags
@@ -150,13 +150,13 @@ endif (architektura STREQUAL "64")
 #=========================================
 # Apply preprocesor flags to *.F files
 #=========================================
-set_property(SOURCE ${UNRES_WHAM_PP_SRC} PROPERTY COMPILE_DEFINITIONS ${CPPFLAGS} )  
+set_property(SOURCE ${UNRES_WHAM_PP_SRCMN} PROPERTY COMPILE_DEFINITIONS ${CPPFLAGS} )  
 
 
 #========================================
 #  Setting binary name
 #========================================
-set(UNRES_WHAM_BIN "wham_${Fortran_COMPILER_NAME}.exe")
+set(UNRES_WHAM_BINMN "wham_${Fortran_COMPILER_NAME}.exe")
 
 #=========================================
 # cinfo.f workaround for CMake
@@ -193,13 +193,13 @@ set_property(SOURCE ${CMAKE_CURRENT_BINARY_DIR}/cinfo.f PROPERTY COMPILE_FLAGS "
 #=========================================
 # Set full unres CSA sources
 #=========================================
-set(UNRES_WHAM_SRCS ${UNRES_WHAM_SRC0} ${CMAKE_CURRENT_BINARY_DIR}/cinfo.f proc_proc.c)
+set(UNRES_WHAM_SRCMNS ${UNRES_WHAM_SRCMN0} ${CMAKE_CURRENT_BINARY_DIR}/cinfo.f proc_proc.c)
 
 #=========================================
 # Build the binary
 #=========================================
-add_executable(UNRES_WHAM_BIN ${UNRES_WHAM_SRCS} )
-set_target_properties(UNRES_WHAM_BIN PROPERTIES OUTPUT_NAME ${UNRES_WHAM_BIN})
+add_executable(UNRES_WHAM_BINMN ${UNRES_WHAM_SRCMNS} )
+set_target_properties(UNRES_WHAM_BINMN PROPERTIES OUTPUT_NAME ${UNRES_WHAM_BINMN})
 
 #set_property(TARGET ${UNRES_BIN} PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/unres/MD )
 #add_dependencies (${UNRES_BIN} ${UNRES_XDRFLIB})
@@ -208,9 +208,9 @@ set_target_properties(UNRES_WHAM_BIN PROPERTIES OUTPUT_NAME ${UNRES_WHAM_BIN})
 # Link libraries
 #=========================================
 # link MPI library (libmpich.a)  
-target_link_libraries( UNRES_WHAM_BIN ${MPIF_LIBRARIES} )
+target_link_libraries( UNRES_WHAM_BINMN ${MPIF_LIBRARIES} )
 # link libxdrf.a 
-target_link_libraries( UNRES_WHAM_BIN xdrf )
+target_link_libraries( UNRES_WHAM_BINMN xdrf )
 
 #=========================================
 # TESTS