From c011b812e17ce89feb02d53e38107537531005a4 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Thu, 28 Jan 2016 16:43:46 +0100
Subject: [PATCH] Setting Data_SOURCE_DIR requires that OGS_BUILD_TESTS is set
already.
---
CMakeLists.txt | 5 +++++
scripts/cmake/SubmoduleSetup.cmake | 2 --
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e599f0426b7..2a110f6e269 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -136,6 +136,11 @@ if(OGS_USE_EIGEN)
endif()
endif()
+if(OGS_BUILD_TESTS)
+ set(Data_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Tests/Data CACHE INTERNAL "")
+ set(Data_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/Tests/Data CACHE INTERNAL "")
+endif()
+
######################
### Subdirectories ###
######################
diff --git a/scripts/cmake/SubmoduleSetup.cmake b/scripts/cmake/SubmoduleSetup.cmake
index 51845c42955..5ffb0a1e014 100644
--- a/scripts/cmake/SubmoduleSetup.cmake
+++ b/scripts/cmake/SubmoduleSetup.cmake
@@ -14,8 +14,6 @@ set(REQUIRED_SUBMODULES
)
if(OGS_BUILD_TESTS)
list(APPEND REQUIRED_SUBMODULES Tests/Data)
- set(Data_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Tests/Data CACHE INTERNAL "")
- set(Data_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/Tests/Data CACHE INTERNAL "")
endif()
foreach(SUBMODULE ${REQUIRED_SUBMODULES})
--
GitLab