From 506afad1a8ca44b60142d6d106876ae3f8a95cc7 Mon Sep 17 00:00:00 2001
From: Tobias Leibner <tobias.leibner@googlemail.com>
Date: Tue, 6 Nov 2018 20:58:46 +0100
Subject: [PATCH] [cmake] format
---
CMakeLists.txt | 5 ++++-
cmake/modules/DuneXTTesting.cmake | 24 +++++++++++++-----------
2 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f949f7c40..fdfdfad21 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,7 +35,10 @@ endif()
# find dune-common and set the module path
find_package(dune-common REQUIRED)
find_package(dune-pybindxi REQUIRED)
-list(APPEND CMAKE_MODULE_PATH ${dune-common_MODULE_PATH} ${dune-pybindxi_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake/modules)
+list(APPEND CMAKE_MODULE_PATH
+ ${dune-common_MODULE_PATH}
+ ${dune-pybindxi_MODULE_PATH}
+ ${PROJECT_SOURCE_DIR}/cmake/modules)
# include the dune macros
include(DuneMacros)
diff --git a/cmake/modules/DuneXTTesting.cmake b/cmake/modules/DuneXTTesting.cmake
index 75ed283a8..90cb69eee 100644
--- a/cmake/modules/DuneXTTesting.cmake
+++ b/cmake/modules/DuneXTTesting.cmake
@@ -100,7 +100,7 @@ macro(BEGIN_TESTCASES) # https://cmake.org/cmake/help/v3.0/module/FindGTest.html
gtest_dune_xt_common
COMMAND
${CMAKE_BINARY_DIR}/run-in-dune-env
- CMD_ARGS
+ CMD_ARGS
${CMAKE_CURRENT_BINARY_DIR}/${target}
--gtest_output=xml:${CMAKE_CURRENT_BINARY_DIR}/${target}.xml
TIMEOUT
@@ -140,6 +140,7 @@ macro(BEGIN_TESTCASES) # https://cmake.org/cmake/help/v3.0/module/FindGTest.html
dune_execute_process(COMMAND
${CMAKE_BINARY_DIR}/run-in-dune-env
+ CMD_ARGS
dxt_code_generation.py
"${config_fn}"
"${template}"
@@ -187,6 +188,7 @@ macro(BEGIN_TESTCASES) # https://cmake.org/cmake/help/v3.0/module/FindGTest.html
gtest_dune_xt_common
COMMAND
${CMAKE_BINARY_DIR}/run-in-dune-env
+ CMD_ARGS
${CMAKE_CURRENT_BINARY_DIR}/${target}
--gtest_output=xml:${CMAKE_CURRENT_BINARY_DIR}/${target}.xml
TIMEOUT
@@ -276,15 +278,15 @@ macro(dxt_exclude_from_headercheck)
endmacro(dxt_exclude_from_headercheck)
macro(dxt_add_python_tests)
- if (TARGET test_python)
- add_dependencies(test_python bindings)
- else (TARGET test_python)
- add_custom_target(test_python
- "${CMAKE_BINARY_DIR}/run-in-dune-env"
- "py.test"
- "."
- WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/python"
- DEPENDS bindings
- VERBATIM USES_TERMINAL)
+ if(TARGET test_python)
+ add_dependencies(test_python bindings)
+ else(TARGET test_python)
+ add_custom_target(test_python
+ "${CMAKE_BINARY_DIR}/run-in-dune-env"
+ "py.test"
+ "."
+ WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/python"
+ DEPENDS bindings
+ VERBATIM USES_TERMINAL)
endif(TARGET test_python)
endmacro(dxt_add_python_tests)
--
GitLab