aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt2
-rw-r--r--tests/CMakeLists.txt20
2 files changed, 11 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 554eeac..7e65495 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.6)
+cmake_minimum_required(VERSION 2.8.12)
project(subhook C)
if(POLICY CMP0042)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 2a2ab84..5650ee1 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -78,16 +78,16 @@ foreach(target subhook_test_exe subhook_cxx_test_exe)
add_test(NAME ${target}_test COMMAND $<TARGET_FILE:${target}>)
- set(expected_output "\
-Testing initial install[\r\n]+\
-foo_hooked\\(\\) called[\r\n]+\
-foo\\(\\) called[\r\n]+\
-Testing re-install[\r\n]+\
-foo_hooked\\(\\) called[\r\n]+\
-foo\\(\\) called[\r\n]+\
-Testing trampoline[\r\n]+\
-foo_hooked_tr\\(\\) called[\r\n]+\
-foo\\(\\) called[\r\n]+\
+ set(expected_output
+"Testing initial install
+foo_hooked\\(\\) called
+foo\\(\\) called
+Testing re-install
+foo_hooked\\(\\) called
+foo\\(\\) called
+Testing trampoline
+foo_hooked_tr\\(\\) called
+foo\\(\\) called
")
set_tests_properties(${target}_test PROPERTIES
PASS_REGULAR_EXPRESSION "${expected_output}")