resolving merge conflicts

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

diff --git a/source/xdrfpdb/src/CMakeLists.txt b/source/xdrfpdb/src/CMakeLists.txt
index 2bed028..962d7fa 100644 (file)
--- a/source/xdrfpdb/src/CMakeLists.txt
+++ b/source/xdrfpdb/src/CMakeLists.txt
@@ -57,7 +57,7 @@ set(UNRES_XDRF_PP_SRC
        xdrf2x.F        
 )
 
-set(CPPFLAGS "PROCOR -DUNRES -DMP -DMPI -DSPLITELE -DNEWUNRES" )
+set(CPPFLAGS "PROCOR -DUNRES -DSPLITELE -DNEWUNRES" )
 
 #=========================================
 # System specific flags
@@ -109,3 +109,9 @@ file(       COPY ${CMAKE_SOURCE_DIR}/ctest/ala10MD.cx
 add_test(NAME XDRF2PDB-one   COMMAND xdrf2pdb one ala10one.seq ala10MD.cx )
 add_test(NAME XDRF2PDB-three COMMAND xdrf2pdb three ala10three.seq ala10MD.cx )
 
+# 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 )
+
+
+