cmake and ctest corrections for mpi and srun

[unres.git] / source / xdrfpdb / src / CMakeLists.txt

diff --git a/source/xdrfpdb/src/CMakeLists.txt b/source/xdrfpdb/src/CMakeLists.txt
index b4195e5..e7b6907 100644 (file)
--- a/source/xdrfpdb/src/CMakeLists.txt
+++ b/source/xdrfpdb/src/CMakeLists.txt
@@ -93,16 +93,23 @@ target_link_libraries( xdrf2ang xdrf )
 #=========================================
 # Install Path
 #=========================================
-install(TARGETS xdrf2pdb DESTINATION ${CMAKE_INSTALL_PREFIX})
-install(TARGETS xdrf2pdb-m DESTINATION ${CMAKE_INSTALL_PREFIX})
-install(TARGETS xdrf2x DESTINATION ${CMAKE_INSTALL_PREFIX})
-install(TARGETS xdrf2ang DESTINATION ${CMAKE_INSTALL_PREFIX})
+install(TARGETS xdrf2pdb       DESTINATION ${CMAKE_INSTALL_PREFIX}/xdrfpdb)
+install(TARGETS xdrf2pdb-m     DESTINATION ${CMAKE_INSTALL_PREFIX}/xdrfpdb)
+install(TARGETS xdrf2x         DESTINATION ${CMAKE_INSTALL_PREFIX}/xdrfpdb)
+install(TARGETS xdrf2ang       DESTINATION ${CMAKE_INSTALL_PREFIX}/xdrfpdb)
 
 
 #=========================================
 # TESTS
 #=========================================
 
+  if (UNRES_SRUN)
+   set (SRUN "srun")
+  else()
+   set (SRUN "")
+  endif()
+
+
 
 # Create files needed for tests
 
@@ -126,16 +133,16 @@ file(     COPY ${CMAKE_SOURCE_DIR}/ctest/1L2Y_MREMD_MD000.cx
 
 
 # Test xdrf2pdb 
-add_test(NAME XDRF2PDB-one   COMMAND xdrf2pdb one ala10one.seq ala10MD.cx )
-add_test(NAME XDRF2PDB-three COMMAND xdrf2pdb three ala10three.seq ala10MD.cx )
+add_test(NAME XDRF2PDB-one   COMMAND ${SRUN} ${CMAKE_BINARY_DIR}/bin/xdrf2pdb one ala10one.seq ala10MD.cx )
+add_test(NAME XDRF2PDB-three COMMAND ${SRUN} ${CMAKE_BINARY_DIR}/bin/xdrf2pdb three ala10three.seq ala10MD.cx )
 
 # Test xdrf2pdb-m
-add_test(NAME XDRF2PDB-M-one   COMMAND xdrf2pdb-m one 1L2Yone.seq 1L2Y_MREMD_MD000.cx 32 30 )
-add_test(NAME XDRF2PDB-M-three COMMAND xdrf2pdb-m three 1L2Ythree.seq 1L2Y_MREMD_MD000.cx 32 30 )
+add_test(NAME XDRF2PDB-M-one   COMMAND ${SRUN} ${CMAKE_BINARY_DIR}/bin/xdrf2pdb-m one 1L2Yone.seq 1L2Y_MREMD_MD000.cx 32 30 )
+add_test(NAME XDRF2PDB-M-three COMMAND ${SRUN} ${CMAKE_BINARY_DIR}/bin/xdrf2pdb-m three 1L2Ythree.seq 1L2Y_MREMD_MD000.cx 32 30 )
 
 # Test xdrf2ang
-add_test(NAME XDRF2ANG-one   COMMAND xdrf2ang one ala10one.seq ala10MD.cx )
-add_test(NAME XDRF2ANG-three COMMAND xdrf2ang three ala10three.seq ala10MD.cx )
+add_test(NAME XDRF2ANG-one   COMMAND ${SRUN} ${CMAKE_BINARY_DIR}/bin/xdrf2ang one ala10one.seq ala10MD.cx )
+add_test(NAME XDRF2ANG-three COMMAND ${SRUN} ${CMAKE_BINARY_DIR}/bin/xdrf2ang three ala10three.seq ala10MD.cx )