|
 |
aeb0ebf |
From 02922173c8d5f35f1d3730254eccf0621e55cbe7 Mon Sep 17 00:00:00 2001
|
|
|
aeb0ebf |
From: Christoph Junghans <junghans@votca.org>
|
|
|
aeb0ebf |
Date: Thu, 3 Nov 2016 12:12:17 -0600
|
|
|
aeb0ebf |
Subject: [PATCH] cmake: fix build with GMX_EXTERNAL_TNG=ON
|
|
|
aeb0ebf |
|
|
|
aeb0ebf |
tng_set_source_properties is not defined in case of GMX_EXTERNAL_TNG=ON
|
|
|
aeb0ebf |
due to the fact that BuildTNG.cmake never gets included. Also this
|
|
|
aeb0ebf |
call isn't really needed tng doesn't get compile when external anyway.
|
|
|
aeb0ebf |
|
|
|
aeb0ebf |
Change-Id: Id3c7e0da55ce9ef8cf43d2aecaa187e965bf6ad2
|
|
|
aeb0ebf |
---
|
|
|
aeb0ebf |
src/gromacs/CMakeLists.txt | 4 +++-
|
|
|
aeb0ebf |
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
aeb0ebf |
|
|
|
aeb0ebf |
diff --git a/src/gromacs/CMakeLists.txt b/src/gromacs/CMakeLists.txt
|
|
|
aeb0ebf |
index b7d9bf4..8b7fe3f 100644
|
|
|
aeb0ebf |
--- a/src/gromacs/CMakeLists.txt
|
|
|
aeb0ebf |
+++ b/src/gromacs/CMakeLists.txt
|
|
|
aeb0ebf |
@@ -123,7 +123,9 @@ list(APPEND LIBGROMACS_SOURCES ${THREAD_MPI_SOURCES})
|
|
Dominik 'Rathann' Mierzejewski |
ec7612c |
|
|
|
aeb0ebf |
if(GMX_USE_TNG)
|
|
|
aeb0ebf |
list(APPEND LIBGROMACS_SOURCES ${TNG_SOURCES})
|
|
|
aeb0ebf |
- tng_set_source_properties(WITH_ZLIB ${HAVE_ZLIB})
|
|
|
aeb0ebf |
+ if (NOT GMX_EXTERNAL_TNG)
|
|
|
aeb0ebf |
+ tng_set_source_properties(WITH_ZLIB ${HAVE_ZLIB})
|
|
|
aeb0ebf |
+ endif()
|
|
|
aeb0ebf |
endif()
|
|
Dominik 'Rathann' Mierzejewski |
ec7612c |
|
|
|
aeb0ebf |
get_lmfit_properties(LMFIT_SOURCES LMFIT_LIBRARIES_TO_LINK LMFIT_INCLUDE_DIRECTORY LMFIT_INCLUDE_DIR_ORDER)
|
|
|
aeb0ebf |
--
|
|
|
aeb0ebf |
2.7.3
|
|
|
aeb0ebf |
|