cmake: added option to disable quotes

Change-Id: Ia1793f3d3dddb3a08012723c2279cab51fa1eafa

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 61e5fefaf37be55d572d3677d3c83a80becac415..78c25c6036f8d3d0f2fad8e928373fbf69722398 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -153,6 +153,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)
+
 if(GMX_GPU OR GMX_OPENMM OR GMX_FORCE_CXX)
     enable_language(CXX)
 endif()

diff --git a/src/config.h.cmakein b/src/config.h.cmakein
index 87b143f924d8b1913d8cf96b46086b8463aa6f19..74e28486f9364727b3cb628f1811a8580ac6052c 100644 (file)
--- a/src/config.h.cmakein
+++ b/src/config.h.cmakein
@@ -453,6 +453,9 @@
 /* Build special-purpose mdrun library */
 #cmakedefine GMX_FAHCORE   
 
+/* Disable gromacs quotes */
+#cmakedefine GMX_NO_QUOTES
+
 #ifdef GMX_FAHCORE
 #define FULLINDIRECT 1
 #define USE_FAH_XDR  1

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

diff --git a/src/kernel/CMakeLists.txt b/src/kernel/CMakeLists.txt
index d3a9bec8d4746454a7f7af659f1e8938df3bdbfb..459770df281e97c2fdd6f5012b66a616c79e7a28 100644 (file)
--- a/src/kernel/CMakeLists.txt
+++ b/src/kernel/CMakeLists.txt
@@ -111,7 +111,11 @@ else(GMX_FAHCORE)
 list(APPEND GMX_EXTRA_LIBRARIES gmxpreprocess md ${OpenMP_LINKER_FLAGS})
 
 set(GMX_KERNEL_PROGRAMS
-    grompp tpbconv pdb2gmx g_protonate g_luck gmxdump g_x2top gmxcheck)
+    grompp tpbconv pdb2gmx g_protonate gmxdump g_x2top gmxcheck)
+if (NOT GMX_NO_QUOTES)
+  set(GMX_KERNEL_PROGRAMS ${GMX_KERNEL_PROGRAMS} g_luck)
+endif (NOT GMX_NO_QUOTES)
+
 
 foreach(PROGRAM ${GMX_KERNEL_PROGRAMS})
     add_executable(${PROGRAM} ${PROGRAM}.c main.c)