From: Roland Schulz <roland@utk.edu>
Date: Sun, 21 Sep 2014 17:38:26 +0000 (-0400)
Subject: Merge release-5-0 into master
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?p=alexxy%2Fgromacs.git;a=commitdiff_plain;h=982993423b348095df0e550ec9d7e6163a270b4f

Merge release-5-0 into master

Conflicts:
	src/gromacs/CMakeLists.txt (adjacent changes)

Change-Id: I6e5b35508b3f6f6d805a2a539e49decdef28012b
---

982993423b348095df0e550ec9d7e6163a270b4f
diff --cc src/gromacs/CMakeLists.txt
index 0f8cc721cd,6db37e2402..912789403d
--- a/src/gromacs/CMakeLists.txt
+++ b/src/gromacs/CMakeLists.txt
@@@ -195,9 -200,10 +195,11 @@@ set_target_properties(libgromacs PROPER
  # for the binary
  if (NOT GMX_BUILD_MDRUN_ONLY OR BUILD_SHARED_LIBS)
      install(TARGETS libgromacs
 -        LIBRARY DESTINATION ${LIB_INSTALL_DIR}
 -        RUNTIME DESTINATION ${BIN_INSTALL_DIR}
 -        ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
 -        COMPONENT libraries)
 +            EXPORT libgromacs
-             DESTINATION ${LIB_INSTALL_DIR}
++            LIBRARY DESTINATION ${LIB_INSTALL_DIR}
++            RUNTIME DESTINATION ${BIN_INSTALL_DIR}
++            ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
 +            COMPONENT libraries)
  endif()
  
  if (NOT GMX_BUILD_MDRUN_ONLY)