From 7522f2590a695982c89549185a49bd32e596a974 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20Sch=C3=BCtt?= Date: Mon, 25 Oct 2021 12:08:34 +0200 Subject: [PATCH] Docker: Switch Gromacs to use pkgconfig --- tools/docker/scripts/test_gromacs.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/tools/docker/scripts/test_gromacs.sh b/tools/docker/scripts/test_gromacs.sh index 509fecfe06..614c781a69 100755 --- a/tools/docker/scripts/test_gromacs.sh +++ b/tools/docker/scripts/test_gromacs.sh @@ -24,10 +24,6 @@ GROMACS_REVISION=$(git rev-parse --short HEAD) mkdir build cd build -export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:/workspace/cp2k/lib/local/pdbg/pkgconfig" -CP2K_LIBDIR=$(pkg-config libcp2k --variable=libdir) -CP2K_LINKER_FLAGS=$(pkg-config libcp2k --libs) - echo -n "Configuring Gromacs... " if cmake .. \ -DGMX_BUILD_OWN_FFTW=ON \ @@ -35,8 +31,7 @@ if cmake .. \ -DGMX_INSTALL_NBLIB_API=OFF \ -DGMXAPI=OFF \ -DGMX_CP2K=ON \ - -DCP2K_DIR="${CP2K_LIBDIR}" \ - -DCP2K_LINKER_FLAGS="${CP2K_LINKER_FLAGS}" \ + -DCP2K_DIR="/workspace/cp2k/lib/local/pdbg/" \ &> cmake.out; then echo "done." else