From: Dawid Jagiela <lightnir@chem.univ.gda.pl>
Date: Thu, 25 Jul 2013 08:35:26 +0000 (+0200)
Subject: Merge branch 'prerelease-3.2.1' into devel
X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=commitdiff_plain;h=1f3374cb0eee02172a7f62466aafc1175a1663e0;hp=-c;p=unres.git

Merge branch 'prerelease-3.2.1' into devel
---

1f3374cb0eee02172a7f62466aafc1175a1663e0
diff --combined source/wham/src/CMakeLists.txt
index 7113b9c,4035b15..6f762b1
--- a/source/wham/src/CMakeLists.txt
+++ b/source/wham/src/CMakeLists.txt
@@@ -37,6 -37,7 +37,7 @@@ set(UNRES_WHAM_SRC
  	rescode.f
  	setup_var.f
  	slices.F
+ 	ssMD.F
  	store_parm.F
  	timing.F
  	wham_calc1.F
@@@ -79,6 -80,7 +80,7 @@@ set(UNRES_WHAM_PP_SR
  	readrtns_compar.F
  	readrtns.F
  	slices.F
+ 	ssMD.F
  	store_parm.F
  	timing.F
  	wham_calc1.F
@@@ -127,7 -129,7 +129,7 @@@ endif(UNRES_MD_FF STREQUAL "GAB"
  #=========================================
  # Additional flags
  #=========================================
- set(CPPFLAGS "${CPPFLAGS} -DUNRES -DISNAN") 
+ set(CPPFLAGS "${CPPFLAGS} -DUNRES -DISNAN -DWHAM ") 
  
  
  #=========================================
@@@ -150,9 -152,6 +152,9 @@@ elseif (Fortran_COMPILER_NAME STREQUAL 
  elseif (Fortran_COMPILER_NAME STREQUAL "gfortran")
    # Add old gfortran flags
    set(CPPFLAGS "${CPPFLAGS} -DG77") 
 +else (Fortran_COMPILER_NAME STREQUAL "ifort")
 +  # Default preprocessor flags 
 +  set(CPPFLAGS "${CPPFLAGS} -DPGI")
  endif (Fortran_COMPILER_NAME STREQUAL "ifort")
  
  #=========================================