Merge release-4-6 into master

[alexxy/gromacs.git] / src / ngmx / CMakeLists.txt

diff --git a/src/ngmx/CMakeLists.txt b/src/ngmx/CMakeLists.txt
index cfb344f9b6e628be2579c2f490591893ddddfd55..791061d39084f6c74e3687992cd8fd19a6173db6 100644 (file)
--- a/src/ngmx/CMakeLists.txt
+++ b/src/ngmx/CMakeLists.txt
@@ -1,37 +1,3 @@
-#
-# This file is part of the GROMACS molecular simulation package.
-#
-# Copyright (c) 2012,2013, by the GROMACS development team, led by
-# David van der Spoel, Berk Hess, Erik Lindahl, and including many
-# others, as listed in the AUTHORS file in the top-level source
-# directory and at http://www.gromacs.org.
-#
-# GROMACS is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public License
-# as published by the Free Software Foundation; either version 2.1
-# of the License, or (at your option) any later version.
-#
-# GROMACS is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with GROMACS; if not, see
-# http://www.gnu.org/licenses, or write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
-#
-# If you want to redistribute modifications to GROMACS, please
-# consider that scientific software is very special. Version
-# control is crucial - bugs must be traceable. We will be happy to
-# consider code for inclusion in the official distribution, but
-# derived work must not be called official GROMACS. Details are found
-# in the README & COPYING files - if they are missing, get the
-# official version at http://www.gromacs.org.
-#
-# To help us fund GROMACS development, we humbly ask that you cite
-# the research papers on the package. Check out http://www.gromacs.org.
-#
 if(X11_FOUND)
 
 set(NGMX_COMMON_SOURCE
@@ -53,8 +19,8 @@ set(NGMX_PROGRAMS
 
 foreach(PROG ${NGMX_PROGRAMS})
         add_executable(${PROG} ${PROG}.c ${NGMX_COMMON_SOURCE})
+        target_link_libraries(${PROG} libgromacs ${GMX_EXTRA_LIBRARIES})
         gmx_add_man_page(${PROG})
-        target_link_libraries(${PROG} gmx ${X11_LIBRARIES})
         set_target_properties(${PROG} PROPERTIES OUTPUT_NAME "${PROG}${GMX_BINARY_SUFFIX}")
 endforeach(PROG)