cmake: remove double-negative quotes logic

Change-Id: I75b3a45a4f0fbbff6300a6317126c5b0cc302b86

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0251e1048849676bc575a1965d3eee71910c0dee..052b0619d0568004f20aab47a5c2241bde68028a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -149,7 +149,8 @@ mark_as_advanced(GMX_OPENMM)
 option(GMX_FORCE_CXX "Enable C++ compilation even if not necessary" OFF)
 mark_as_advanced(GMX_FORCE_CXX)
 
-option(GMX_NO_QUOTES "Disable Gromacs cool quotes" OFF)
+option(GMX_COOL_QUOTES "Enable Gromacs cool quotes" ON)
+mark_as_advanced(GMX_COOL_QUOTES)
 
 if(GMX_GPU OR GMX_OPENMM OR GMX_FORCE_CXX)
     enable_language(CXX)
@@ -1043,6 +1044,7 @@ if(GMX_FAHCORE)
   set(COREWRAP_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/../corewrap" CACHE STRING 
       "Path to swindirect.h")
   include_directories(${COREWRAP_INCLUDE_DIR})
+  set_property(CACHE GMX_COOL_QUOTES VALUE OFF)
 endif(GMX_FAHCORE)
 
 # # # # # # # # # # NO MORE TESTS AFTER THIS LINE! # # # # # # # # # # #

diff --git a/src/config.h.cmakein b/src/config.h.cmakein
index 528b0bea7997deb8875b02547b5264f8920cd543..aec0becbbc682d73352f494220dce40110b698af 100644 (file)
--- a/src/config.h.cmakein
+++ b/src/config.h.cmakein
@@ -450,8 +450,8 @@
 /* Build special-purpose mdrun library */
 #cmakedefine GMX_FAHCORE   
 
-/* Disable gromacs quotes */
-#cmakedefine GMX_NO_QUOTES
+/* Enable gromacs quotes */
+#cmakedefine GMX_COOL_QUOTES
 
 #ifdef GMX_FAHCORE
 #define FULLINDIRECT 1

diff --git a/src/gmxlib/copyrite.c b/src/gmxlib/copyrite.c
index 5354ae8ca1b287b3427d450f1be582896ff094ed..cad3aca3bfe8db9a99c4afde84514ffc0fdb1eee 100644 (file)
--- a/src/gmxlib/copyrite.c
+++ b/src/gmxlib/copyrite.c
@@ -126,11 +126,11 @@ gmx_bool be_cool(void)
    * but we dont call this routine often, and it avoids using 
    * a mutex for locking the variable...
    */
-#if defined(GMX_FAHCORE) || defined(GMX_NO_QUOTES)
+#ifdef GMX_COOL_QUOTES
+  return (getenv("GMX_NO_QUOTES") == NULL);
+#else
   /*be uncool*/
   return FALSE;
-#else
-  return (getenv("GMX_NO_QUOTES") == NULL);
 #endif
 }