From 33a2e0a3d408b1573f82c6dcf71af36246d9c25f Mon Sep 17 00:00:00 2001 From: David van der Spoel Date: Mon, 10 Feb 2014 13:08:24 +0100 Subject: [PATCH] Moved conditional cmake code for vmdio. When moving the vmdio.c file to the fileio directory the corresponding conditional was left in the gmxlib/CMakeLists.txt file. This is corrected here. Change-Id: I91a7123aebe639b89a19733ef972699a2c8c9630 --- src/gromacs/fileio/CMakeLists.txt | 7 +++++++ src/gromacs/gmxlib/CMakeLists.txt | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/gromacs/fileio/CMakeLists.txt b/src/gromacs/fileio/CMakeLists.txt index 7975f19b77..56cbbef52c 100644 --- a/src/gromacs/fileio/CMakeLists.txt +++ b/src/gromacs/fileio/CMakeLists.txt @@ -33,6 +33,13 @@ # the research papers on the package. Check out http://www.gromacs.org. file(GLOB FILEIO_SOURCES *.cpp *.c) + +if(GMX_USE_PLUGINS) + set(FILEIO_SOURCES ${FILEIO_SOURCES} ${CMAKE_SOURCE_DIR}/src/external/vmd_molfile/vmddlopen.c) +else() + list(REMOVE_ITEM FILEIO_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/vmdio.c) +endif() + set(LIBGROMACS_SOURCES ${LIBGROMACS_SOURCES} ${FILEIO_SOURCES} PARENT_SCOPE) set(FILEIO_PUBLIC_HEADERS diff --git a/src/gromacs/gmxlib/CMakeLists.txt b/src/gromacs/gmxlib/CMakeLists.txt index b07fa65a9a..ff5a9f4760 100644 --- a/src/gromacs/gmxlib/CMakeLists.txt +++ b/src/gromacs/gmxlib/CMakeLists.txt @@ -60,12 +60,6 @@ if(GMX_GPU) set(GMX_GPU_LIBRARIES ${GMX_GPU_LIBRARIES} gpu_utils cuda_tools PARENT_SCOPE) endif() -if(GMX_USE_PLUGINS) - set(GMXLIB_SOURCES ${GMXLIB_SOURCES} ${CMAKE_SOURCE_DIR}/src/external/vmd_molfile/vmddlopen.c) -else() - list(REMOVE_ITEM GMXLIB_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/vmdio.c) -endif() - # An ugly hack to get absolute paths... file(GLOB THREAD_MPI_SOURCES ${THREAD_MPI_SRC}) -- 2.22.0