Merge pull request #7 from hunter-packages/pr.cli.flexibility

relax GAUZE_RESOURCE_{FILE,DIR} regex replace
hunter-packages · Nov 22, 2017 · 9fc38a0 · 9fc38a0
2 parents 7791735 + e5ba762
commit 9fc38a0
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,7 +6,7 @@ HunterGate(
     SHA1 "73b5a5253b75d5ed79c89242c167ca1f94386621"
 )
 
-project(gauze VERSION 0.1)
+project(gauze VERSION 0.2.1)
 
 option(GAUZE_BUILD_TESTS "Build tests" ON)
 

diff --git a/cmake/gauze_add_test.cmake b/cmake/gauze_add_test.cmake
@@ -181,8 +181,8 @@ function(gauze_add_test)
     set(arguments)
     foreach(x ${APP_ARGUMENTS})
       # Use resources as is
-      string(REGEX REPLACE "^\\$<GAUZE_RESOURCE_FILE:\(.*\)>$" "\\1" x "${x}")
-      string(REGEX REPLACE "^\\$<GAUZE_RESOURCE_DIR:\(.*\)>$" "\\1" x "${x}")
+      string(REGEX REPLACE "\\$<GAUZE_RESOURCE_FILE:\(.*\)>$" "\\1" x "${x}")
+      string(REGEX REPLACE "\\$<GAUZE_RESOURCE_DIR:\(.*\)>$" "\\1" x "${x}")
       list(APPEND arguments "${x}")
     endforeach()
     add_test(NAME "${x_NAME}" COMMAND ${APP_TARGET} ${arguments})

diff --git a/cmake/templates/iOSTest.cmake.in b/cmake/templates/iOSTest.cmake.in
@@ -95,17 +95,17 @@ foreach(arg ${app_arguments})
   string(
       REGEX
       REPLACE
-      "^\\$<GAUZE_RESOURCE_FILE:\(.*\)>$"
-      "\\1"
+      "^\(.*\)\\$<GAUZE_RESOURCE_FILE:\(.*\)>$"
+      "\\2"
       resource_file
       "${arg}"
   )
 
   string(
       REGEX
       REPLACE
-      "^\\$<GAUZE_RESOURCE_DIR:\(.*\)>$"
-      "\\1"
+      "^\(.*\)\\$<GAUZE_RESOURCE_DIR:\(.*\)>$"
+      "\\2"
       resource_dir
       "${arg}"
   )

diff --git a/test/gauze/directory/CMakeLists.txt b/test/gauze/directory/CMakeLists.txt
@@ -15,4 +15,5 @@ gauze_add_test(
     arg3
     $<GAUZE_RESOURCE_DIR:${data_dir}>
     ${data_dir}/just_a_string.txt
+    --directory=$<GAUZE_RESOURCE_DIR:${data_dir}>
 )
diff --git a/test/gauze/directory/main.cpp b/test/gauze/directory/main.cpp
@@ -11,7 +11,7 @@ int gauze_main(int argc, char** argv) {
     std::cout << "argv[" << i << "] = " << argv[i] << std::endl;
   }
 
-  if(argc < 6) {
+  if(argc < 7) {
     std::cerr << "Unexpected number of arguments: " << argc << std::endl;
     return EXIT_FAILURE;
   }

diff --git a/test/gauze/resource/CMakeLists.txt b/test/gauze/resource/CMakeLists.txt
@@ -11,4 +11,5 @@ gauze_add_test(
     arg3
     $<GAUZE_RESOURCE_FILE:${data_dir}/input.txt>
     ${data_dir}/just_a_string.txt
+    --input=$<GAUZE_RESOURCE_FILE:${data_dir}/input.txt>
 )
diff --git a/test/gauze/resource/main.cpp b/test/gauze/resource/main.cpp
@@ -9,7 +9,7 @@ int gauze_main(int argc, char** argv) {
     std::cout << "argv[" << i << "] = " << argv[i] << std::endl;
   }
 
-  if(argc < 6) {
+  if(argc < 7) {
     std::cerr << "Unexpected number of arguments: " << argc << std::endl;
     return EXIT_FAILURE;
   }