pytest-cmake 0.11.3__tar.gz → 0.12.0__tar.gz

{pytest_cmake-0.11.3 → pytest_cmake-0.12.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytest-cmake
-Version: 0.11.3
+Version: 0.12.0
 Summary: Provide CMake module for Pytest
 Project-URL: Documentation, https://python-cmake.github.io/pytest-cmake
 Project-URL: Repository, https://github.com/python-cmake/pytest-cmake

{pytest_cmake-0.11.3 → pytest_cmake-0.12.0}/cmake/FindPytest.cmake

@@ -58,7 +58,7 @@ if (Pytest_FOUND AND NOT TARGET Pytest::Pytest)
         cmake_parse_arguments(
             PARSE_ARGV 1 "" "STRIP_PARAM_BRACKETS;INCLUDE_FILE_PATH;BUNDLE_TESTS"
             "WORKING_DIRECTORY;TRIM_FROM_NAME;TRIM_FROM_FULL_NAME"
-            "LIBRARY_PATH_PREPEND;PYTHON_PATH_PREPEND;ENVIRONMENT;PROPERTIES;DEPENDS"
+            "LIBRARY_PATH_PREPEND;PYTHON_PATH_PREPEND;ENVIRONMENT;PROPERTIES;DEPENDS;EXTRA_ARGS"
         )
 
         # Set platform-specific library path environment variable.
@@ -71,8 +71,16 @@ if (Pytest_FOUND AND NOT TARGET Pytest::Pytest)
         endif()
 
         # Convert paths to CMake-friendly format.
-        cmake_path(CONVERT "$ENV{${LIBRARY_ENV_NAME}}" TO_CMAKE_PATH_LIST LIBRARY_PATH)
-        cmake_path(CONVERT "$ENV{PYTHONPATH}" TO_CMAKE_PATH_LIST PYTHON_PATH)
+        if(DEFINED ENV{${LIBRARY_ENV_NAME}})
+            cmake_path(CONVERT "$ENV{${LIBRARY_ENV_NAME}}" TO_CMAKE_PATH_LIST LIBRARY_PATH)
+        else()
+            set(LIBRARY_PATH "")
+        endif()
+        if(DEFINED ENV{PYTHONPATH})
+            cmake_path(CONVERT "$ENV{PYTHONPATH}" TO_CMAKE_PATH_LIST PYTHON_PATH)
+        else()
+            set(PYTHON_PATH "")
+        endif()
 
         # Prepend specified paths to the library and Python paths.
         if (_LIBRARY_PATH_PREPEND)
@@ -124,6 +132,7 @@ if (Pytest_FOUND AND NOT TARGET Pytest::Pytest)
             -D "ENVIRONMENT=${_ENVIRONMENT}"
             -D "TEST_PROPERTIES=${_PROPERTIES}"
             -D "CTEST_FILE=${_tests_file}"
+            -D "EXTRA_ARGS=${_EXTRA_ARGS}"
             -P "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/PytestAddTests.cmake")
 
         # Create a custom target to run the tests.

{pytest_cmake-0.11.3 → pytest_cmake-0.12.0}/cmake/PytestAddTests.cmake

@@ -26,10 +26,17 @@ if(CMAKE_SCRIPT_MODE_FILE)
         list(APPEND ENCODED_ENVIRONMENT "${env}")
     endforeach()
 
+    # Handle EXTRA_ARGS for individual tests
+    set(EXTRA_ARGS_WRAPPED)
+    foreach(arg IN LISTS EXTRA_ARGS)
+        list(APPEND EXTRA_ARGS_WRAPPED "[==[${arg}]==]")
+    endforeach()
+    list(JOIN EXTRA_ARGS_WRAPPED " " EXTRA_ARGS_STR)
+
     # Macro to create individual tests with optional test properties.
     macro(create_test NAME IDENTIFIER)
         string(APPEND _content
-            "add_test([==[${NAME}]==] \"${PYTEST_EXECUTABLE}\" [==[${IDENTIFIER}]==])\n"
+            "add_test([==[${NAME}]==] \"${PYTEST_EXECUTABLE}\" [==[${IDENTIFIER}]==] ${EXTRA_ARGS_STR} )\n"
         )
 
         # Prepare the properties for the test, including the environment settings.

{pytest_cmake-0.11.3 → pytest_cmake-0.12.0}/pyproject.toml

@@ -9,7 +9,7 @@ backend-path = ["."]
 
 [project]
 name = "pytest-cmake"
-version = "0.11.3"
+version = "0.12.0"
 description = "Provide CMake module for Pytest"
 readme = "README.md"
 requires-python = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*, <4"

{pytest_cmake-0.11.3 → pytest_cmake-0.12.0}/setup.py

@@ -60,7 +60,7 @@ class CreateCmakeConfig(install):
 
 setup(
     name="pytest-cmake",
-    version="0.11.3",
+    version="0.12.0",
     data_files=[
         (
             "share/Pytest/cmake",