From 68c5a7d832a59f6292558d9b8fa6ff411da6fe0b Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Mon, 22 Feb 2016 09:59:18 -0500 Subject: [PATCH 1/3] allow in-source builds In source builds would generate cmake errors when running cmake more than once, because we generate .x.prm files, which will then be picked up by the GLOB. --- tests/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 0bcfd207728..aa14ab5b2a6 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -122,6 +122,11 @@ FOREACH(_test ${_tests}) MESSAGE("Ignoring invalid .prm '${_test_full}'...") CONTINUE() ENDIF() + IF (${_test_full} MATCHES "[.]x[.]prm$") + # Skip files generated by in source builds: + CONTINUE() + ENDIF() + SET(_use_test ON) SHOULD_ENABLE_TEST(${CMAKE_CURRENT_SOURCE_DIR}/${_test}.prm) From 1284de6ae8986f6089befafeb88f9c595de8d1b9 Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Mon, 22 Feb 2016 10:03:01 -0500 Subject: [PATCH 2/3] update ignores --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitignore b/.gitignore index 1321397fc48..e857e89bb3b 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ /AspectConfig.cmake /CMakeLists.txt.user* /CTestTestfile.cmake +/Makefile /aspect /benchmark/**/CMakeCache.txt /benchmark/**/CMakeFiles/ @@ -44,3 +45,7 @@ /tests/CTestTestfile.cmake /tests/Makefile /tests/cmake_install.cmake +/tests/output-*/ +/tests/*.x.prm +/tests/lib*.so +/Testing From 7eff64846956b9ac1deb01d255be57ae0f08a5b0 Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Mon, 22 Feb 2016 16:35:33 -0500 Subject: [PATCH 3/3] update regex --- tests/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index aa14ab5b2a6..95203ed0673 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -122,7 +122,7 @@ FOREACH(_test ${_tests}) MESSAGE("Ignoring invalid .prm '${_test_full}'...") CONTINUE() ENDIF() - IF (${_test_full} MATCHES "[.]x[.]prm$") + IF (${_test_full} MATCHES "\\.x\\.prm$") # Skip files generated by in source builds: CONTINUE() ENDIF()