Merge branch 'prerelease-3.2.1' into devel

[unres.git] / source / unres / src_MD-M / CMakeLists.txt

diff --git a/source/unres/src_MD-M/CMakeLists.txt b/source/unres/src_MD-M/CMakeLists.txt
index 9c75e2e..0a82f1e 100644 (file)
--- a/source/unres/src_MD-M/CMakeLists.txt
+++ b/source/unres/src_MD-M/CMakeLists.txt
@@ -5,11 +5,6 @@
 enable_language (Fortran)
 
 #================================
-# build the xdrf library 
-#================================ 
-#add_subdirectory(xdrf)
-
-#================================
 # Set source file lists
 #================================
 set(UNRES_MDM_SRC0 
@@ -71,6 +66,7 @@ set(UNRES_MDM_SRC0
        permut.F
        pinorm.f 
        printmat.f 
+       prng_32.F
        q_measure.F 
        ran.f
        randgens.f 
@@ -96,15 +92,6 @@ set(UNRES_MDM_SRC0
        ssMD.F
 )
 
-if (Fortran_COMPILER_NAME STREQUAL "ifort")
-  set(UNRES_MDM_SRC0 ${UNRES_MDM_SRC0} prng.f ) 
-elseif(Fortran_COMPILER_NAME STREQUAL "mpif90")
-  set(UNRES_MDM_SRC0 ${UNRES_MDM_SRC0} prng.f )
-else()
-  set(UNRES_MDM_SRC0 ${UNRES_MDM_SRC0} prng_32.F )
-endif (Fortran_COMPILER_NAME STREQUAL "ifort")
-
-
 set(UNRES_MDM_SRC3 energy_p_new_barrier.F energy_p_new-sep_barrier.F gradient_p.F )
 
 set(UNRES_MDM_PP_SRC
@@ -142,6 +129,7 @@ set(UNRES_MDM_PP_SRC
        newconf.f 
        parmread.F 
        permut.F
+       prng_32.F
        q_measure1.F 
        q_measure3.F 
        q_measure.F
@@ -250,7 +238,9 @@ if (UNRES_WITH_MPI)
 endif(UNRES_WITH_MPI)
 
 
+#=========================================
 # add 64-bit specific preprocessor flags
+#=========================================
 if (architektura STREQUAL "64")
   set(CPPFLAGS "${CPPFLAGS} -DAMD64")
 endif (architektura STREQUAL "64")
@@ -269,10 +259,10 @@ set_property(SOURCE proc_proc.c PROPERTY COMPILE_DEFINITIONS "SGI" )
 #========================================
 if(UNRES_WITH_MPI) 
   # binary with mpi
-  set(UNRES_BIN "unres_${Fortran_COMPILER_NAME}_MPICH_${UNRES_MD_FF}.exe")
+  set(UNRES_BIN "unresMD-M_${Fortran_COMPILER_NAME}_MPICH_${UNRES_MD_FF}.exe")
 else(UNRES_WITH_MPI)
   # binary without mpi
-  set(UNRES_BIN "unres_${Fortran_COMPILER_NAME}_single_${UNRES_MD_FF}.exe")
+  set(UNRES_BIN "unresMD-M_${Fortran_COMPILER_NAME}_single_${UNRES_MD_FF}.exe")
 endif(UNRES_WITH_MPI)  
 
 #=========================================
@@ -317,8 +307,7 @@ set(UNRES_MDM_SRCS ${UNRES_MDM_SRC0} ${UNRES_MDM_SRC3} ${CMAKE_CURRENT_BINARY_DI
 #=========================================
 add_executable(UNRES_BIN-MD-M ${UNRES_MDM_SRCS} )
 set_target_properties(UNRES_BIN-MD-M PROPERTIES OUTPUT_NAME ${UNRES_BIN})
-
-#set_property(TARGET ${UNRES_BIN} PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/unres/MD )
+set_property(TARGET UNRES_BIN-MD-M PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )
 #add_dependencies (${UNRES_BIN} ${UNRES_XDRFLIB})
 
 #=========================================
@@ -333,10 +322,9 @@ endif(UNRES_WITH_MPI)
 target_link_libraries( UNRES_BIN-MD-M xdrf )
 
 #=========================================
-# INSTALL
+# Install Path
 #=========================================
-
-install(TARGETS UNRES_BIN-MD-M RUNTIME DESTINATION unrespack/bin)
+install(TARGETS UNRES_BIN-MD-M DESTINATION ${CMAKE_INSTALL_PREFIX})
 
 #=========================================
 # TESTS