DRR - Change from NO_DTR to ENABLE_DTR; disabled unless configure is used on non-windows platform.

drroe · drroe · commit 7db4d5f97376 · 2020-02-07T15:07:41.000-05:00
diff --git a/configure b/configure
@@ -784,7 +784,8 @@ SetupFinalFlags() {
   # Platform-specific directives
   if [ "$PLATFORM" = 'windows' ] ; then
     echo "Warning: DTR trajectory not supported on windows."
-    DIRECTIVES="$DIRECTIVES -DNO_DTR"
+  else
+    DIRECTIVES="$DIRECTIVES -DENABLE_DTR"
   fi
 }
 
diff --git a/src/Traj_DTR.cpp b/src/Traj_DTR.cpp
@@ -1,4 +1,4 @@
-#ifndef NO_DTR
+#ifdef ENABLE_DTR
 #include "Traj_DTR.h"
 #include "CpptrajStdio.h"
 #include "CpptrajFile.h"
@@ -250,4 +250,4 @@ void Traj_DTR::parallelCloseTraj() {
 
 }
 #endif
-#endif /* NO_DTR */
+#endif /* ENABLE_DTR */
diff --git a/src/Traj_DTR.h b/src/Traj_DTR.h
@@ -1,6 +1,6 @@
 #ifndef INC_TRAJ_DTR_H
 #define INC_TRAJ_DTR_H
-#ifndef NO_DTR
+#ifdef ENABLE_DTR
 #include "TrajectoryIO.h"
 namespace desres { namespace molfile { class FrameSetReader; } }
 /// Used to read Desmond DTR trajectory 
@@ -42,5 +42,5 @@ class Traj_DTR : public TrajectoryIO {
     float* fbuffer_; ///< For reading in coords and velocities
     size_t bufsize_; ///< Size of buffer_
 };
-#endif /* NO_DTR */
+#endif /* ENABLE_DTR */
 #endif
diff --git a/src/TrajectoryFile.cpp b/src/TrajectoryFile.cpp
@@ -72,10 +72,10 @@ const FileTypes::AllocToken TrajectoryFile::TF_AllocArray[] = {
   { "XYZ",                0, Traj_XYZ::WriteHelp, Traj_XYZ::Alloc            },
   { "LMOD conflib",       0, 0, Traj_Conflib::Alloc        },
   { "Gromacs dump",       0, Traj_GmxDump::WriteHelp, Traj_GmxDump::Alloc    },
-# ifdef NO_DTR
-  { "Desmond DTR",        0, 0, 0 },
-# else
+# ifdef ENABLE_DTR
   { "Desmond DTR",        0, 0, Traj_DTR::Alloc },
+# else
+  { "Desmond DTR",        0, 0, 0 },
 # endif
   { "Unknown trajectory", 0, 0, 0                          }
 };
diff --git a/src/vmdplugin/dtrplugin.cpp b/src/vmdplugin/dtrplugin.cpp
@@ -38,7 +38,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
-#ifndef NO_DTR
+#ifdef ENABLE_DTR
 #include "dtrplugin.hxx"
 
 using namespace desres::molfile;
@@ -2378,4 +2378,4 @@ int main(int argc, char *argv[]) {
   return 0;
 }
 #endif
-#endif /* NO_DTR */
+#endif /* ENABLE_DTR */
diff --git a/src/vmdplugin/dtrplugin.hxx b/src/vmdplugin/dtrplugin.hxx
@@ -38,7 +38,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
-#ifndef NO_DTR
+#ifdef ENABLE_DTR
 #ifndef MOLFILE_DTRPLUGIN_HXX
 #define MOLFILE_DTRPLUGIN_HXX
 
@@ -340,4 +340,4 @@ namespace desres { namespace molfile {
 } }
 
 #endif
-#endif /* NO_DTR */
+#endif /* ENABLE_DTR */

Original file line number	Diff line number	Diff line change
`@@ -784,7 +784,8 @@ SetupFinalFlags() {`
`784`	`784`	`# Platform-specific directives`
`785`	`785`	`if [ "$PLATFORM" = 'windows' ] ; then`
`786`	`786`	`echo "Warning: DTR trajectory not supported on windows."`
`787`		`- DIRECTIVES="$DIRECTIVES -DNO_DTR"`
	`787`	`+ else`
	`788`	`+ DIRECTIVES="$DIRECTIVES -DENABLE_DTR"`
`788`	`789`	`fi`
`789`	`790`	`}`
`790`	`791`