From 0a81110b842fd7b00cdacc55c270458ddaa2eb73 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 14 Sep 2023 14:08:31 -0400 Subject: find_(library|file|path): Drop PATH-derived search prefixes Since commit ffc06c1239 (Teach find_(library|file|path) to get prefixes from PATH, 2015-02-18, v3.3.0-rc1~430^2) we search in `/include` and `/lib` directories for prefixes with `bin` directories in the `PATH` environment variable. The motivation was to search the installation prefixes of MSYS and MinGW development environments automatically. This behavior can search undesired prefixes that happen to be in the `PATH` for unrelated reasons. It was reverted for non-Windows hosts within a year by commit b30b32a493 (Drop find_(library|file|path) prefixes from PATH on non-Windows, 2016-05-09, v3.6.0-rc1~82^2) but was kept on Windows hosts to support its motivating use case. However, similar problems have since been observed on Windows. For example, commit 955d6245c1 (MSVC: Revert "Teach find_library to consider the 'libfoo.a' naming convention", 2022-11-28, v3.25.1~6^2) was primarily due to undesired discovery of libraries in `PATH`-derived prefixes. Since commit 5e5132e1b1 (MinGW: Search for packages in standard MSYSTEM environment prefixes, 2023-09-11) we search MSYS and MinGW environments' prefixes explicitly, so `PATH`-derived prefixes are no longer needed for the original motivating use case. Fixes: #24216 --- Help/command/FIND_XXX.txt | 3 ++- Help/command/find_file.rst | 8 +++++--- Help/command/find_library.rst | 8 +++++--- Help/command/find_path.rst | 8 +++++--- Help/command/find_program.rst | 2 +- Help/release/dev/find-windows-no-PATH-prefixes.rst | 17 +++++++++++++++++ Source/cmFindBase.cxx | 3 --- Tests/RunCMake/find_file/FromPATHEnv-stdout-cygwin.txt | 9 --------- Tests/RunCMake/find_file/FromPATHEnv-stdout-msys.txt | 9 --------- Tests/RunCMake/find_file/FromPATHEnv-stdout-windows.txt | 9 --------- .../find_file/FromPATHEnvDebugVar-stdout-cygwin.txt | 9 --------- .../find_file/FromPATHEnvDebugVar-stdout-msys.txt | 9 --------- .../find_file/FromPATHEnvDebugVar-stdout-windows.txt | 9 --------- Tests/RunCMake/find_file/PrefixInPATH-stdout-cygwin.txt | 4 ---- Tests/RunCMake/find_file/PrefixInPATH-stdout-msys.txt | 4 ---- .../RunCMake/find_file/PrefixInPATH-stdout-windows.txt | 4 ---- .../RunCMake/find_library/FromPATHEnv-stdout-cygwin.txt | 6 ------ Tests/RunCMake/find_library/FromPATHEnv-stdout-msys.txt | 6 ------ .../find_library/FromPATHEnv-stdout-windows.txt | 6 ------ .../find_library/FromPATHEnvDebugVar-stdout-cygwin.txt | 6 ------ .../find_library/FromPATHEnvDebugVar-stdout-msys.txt | 6 ------ .../find_library/FromPATHEnvDebugVar-stdout-windows.txt | 6 ------ .../find_library/PrefixInPATH-stdout-cygwin.txt | 4 ---- .../RunCMake/find_library/PrefixInPATH-stdout-msys.txt | 4 ---- .../find_library/PrefixInPATH-stdout-windows.txt | 4 ---- Tests/RunCMake/find_path/FromPATHEnv-stdout-cygwin.txt | 9 --------- Tests/RunCMake/find_path/FromPATHEnv-stdout-msys.txt | 9 --------- Tests/RunCMake/find_path/FromPATHEnv-stdout-windows.txt | 9 --------- .../find_path/FromPATHEnvDebugVar-stdout-cygwin.txt | 9 --------- .../find_path/FromPATHEnvDebugVar-stdout-msys.txt | 9 --------- .../find_path/FromPATHEnvDebugVar-stdout-windows.txt | 9 --------- Tests/RunCMake/find_path/PrefixInPATH-stdout-cygwin.txt | 4 ---- Tests/RunCMake/find_path/PrefixInPATH-stdout-msys.txt | 4 ---- .../RunCMake/find_path/PrefixInPATH-stdout-windows.txt | 4 ---- 34 files changed, 35 insertions(+), 194 deletions(-) create mode 100644 Help/release/dev/find-windows-no-PATH-prefixes.rst delete mode 100644 Tests/RunCMake/find_file/FromPATHEnv-stdout-cygwin.txt delete mode 100644 Tests/RunCMake/find_file/FromPATHEnv-stdout-msys.txt delete mode 100644 Tests/RunCMake/find_file/FromPATHEnv-stdout-windows.txt delete mode 100644 Tests/RunCMake/find_file/FromPATHEnvDebugVar-stdout-cygwin.txt delete mode 100644 Tests/RunCMake/find_file/FromPATHEnvDebugVar-stdout-msys.txt delete mode 100644 Tests/RunCMake/find_file/FromPATHEnvDebugVar-stdout-windows.txt delete mode 100644 Tests/RunCMake/find_file/PrefixInPATH-stdout-cygwin.txt delete mode 100644 Tests/RunCMake/find_file/PrefixInPATH-stdout-msys.txt delete mode 100644 Tests/RunCMake/find_file/PrefixInPATH-stdout-windows.txt delete mode 100644 Tests/RunCMake/find_library/FromPATHEnv-stdout-cygwin.txt delete mode 100644 Tests/RunCMake/find_library/FromPATHEnv-stdout-msys.txt delete mode 100644 Tests/RunCMake/find_library/FromPATHEnv-stdout-windows.txt delete mode 100644 Tests/RunCMake/find_library/FromPATHEnvDebugVar-stdout-cygwin.txt delete mode 100644 Tests/RunCMake/find_library/FromPATHEnvDebugVar-stdout-msys.txt delete mode 100644 Tests/RunCMake/find_library/FromPATHEnvDebugVar-stdout-windows.txt delete mode 100644 Tests/RunCMake/find_library/PrefixInPATH-stdout-cygwin.txt delete mode 100644 Tests/RunCMake/find_library/PrefixInPATH-stdout-msys.txt delete mode 100644 Tests/RunCMake/find_library/PrefixInPATH-stdout-windows.txt delete mode 100644 Tests/RunCMake/find_path/FromPATHEnv-stdout-cygwin.txt delete mode 100644 Tests/RunCMake/find_path/FromPATHEnv-stdout-msys.txt delete mode 100644 Tests/RunCMake/find_path/FromPATHEnv-stdout-windows.txt delete mode 100644 Tests/RunCMake/find_path/FromPATHEnvDebugVar-stdout-cygwin.txt delete mode 100644 Tests/RunCMake/find_path/FromPATHEnvDebugVar-stdout-msys.txt delete mode 100644 Tests/RunCMake/find_path/FromPATHEnvDebugVar-stdout-windows.txt delete mode 100644 Tests/RunCMake/find_path/PrefixInPATH-stdout-cygwin.txt delete mode 100644 Tests/RunCMake/find_path/PrefixInPATH-stdout-msys.txt delete mode 100644 Tests/RunCMake/find_path/PrefixInPATH-stdout-windows.txt diff --git a/Help/command/FIND_XXX.txt b/Help/command/FIND_XXX.txt index fe26d2b..56c77c1 100644 --- a/Help/command/FIND_XXX.txt +++ b/Help/command/FIND_XXX.txt @@ -211,7 +211,8 @@ If ``NO_DEFAULT_PATH`` is not specified, the search process is as follows: setting the :variable:`CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH` to ``FALSE``. * |SYSTEM_ENVIRONMENT_PATH_XXX| - * |SYSTEM_ENVIRONMENT_PATH_WINDOWS_XXX| + + |SYSTEM_ENVIRONMENT_PATH_WINDOWS_XXX| 6. Search cmake variables defined in the Platform files for the current system. The searching of ``CMAKE_INSTALL_PREFIX`` and diff --git a/Help/command/find_file.rst b/Help/command/find_file.rst index 9f89f52..9ef8a6d 100644 --- a/Help/command/find_file.rst +++ b/Help/command/find_file.rst @@ -28,9 +28,11 @@ find_file .. |SYSTEM_ENVIRONMENT_PATH_XXX| replace:: The directories in ``INCLUDE`` and ``PATH``. -.. |SYSTEM_ENVIRONMENT_PATH_WINDOWS_XXX| replace:: On Windows hosts: - ``/include/`` if :variable:`CMAKE_LIBRARY_ARCHITECTURE` - is set, and |SYSTEM_ENVIRONMENT_PREFIX_PATH_XXX_SUBDIR|. +.. |SYSTEM_ENVIRONMENT_PATH_WINDOWS_XXX| replace:: + On Windows hosts, CMake 3.3 through 3.27 searched additional paths: + ``/include/`` if :variable:`CMAKE_LIBRARY_ARCHITECTURE` + is set, and |SYSTEM_ENVIRONMENT_PREFIX_PATH_XXX_SUBDIR|. + This behavior was removed by CMake 3.28. .. |CMAKE_SYSTEM_PREFIX_PATH_XXX| replace:: ``/include/`` if :variable:`CMAKE_LIBRARY_ARCHITECTURE` diff --git a/Help/command/find_library.rst b/Help/command/find_library.rst index fb2c2f1..ba046fa 100644 --- a/Help/command/find_library.rst +++ b/Help/command/find_library.rst @@ -27,9 +27,11 @@ find_library .. |SYSTEM_ENVIRONMENT_PATH_XXX| replace:: The directories in ``LIB`` and ``PATH``. -.. |SYSTEM_ENVIRONMENT_PATH_WINDOWS_XXX| replace:: On Windows hosts: - ``/lib/`` if :variable:`CMAKE_LIBRARY_ARCHITECTURE` - is set, and |SYSTEM_ENVIRONMENT_PREFIX_PATH_XXX_SUBDIR|. +.. |SYSTEM_ENVIRONMENT_PATH_WINDOWS_XXX| replace:: + On Windows hosts, CMake 3.3 through 3.27 searched additional paths: + ``/lib/`` if :variable:`CMAKE_LIBRARY_ARCHITECTURE` + is set, and |SYSTEM_ENVIRONMENT_PREFIX_PATH_XXX_SUBDIR|. + This behavior was removed by CMake 3.28. .. |CMAKE_SYSTEM_PREFIX_PATH_XXX| replace:: ``/lib/`` if :variable:`CMAKE_LIBRARY_ARCHITECTURE` is set, diff --git a/Help/command/find_path.rst b/Help/command/find_path.rst index f0522f6..080c231 100644 --- a/Help/command/find_path.rst +++ b/Help/command/find_path.rst @@ -27,9 +27,11 @@ find_path .. |SYSTEM_ENVIRONMENT_PATH_XXX| replace:: The directories in ``INCLUDE`` and ``PATH``. -.. |SYSTEM_ENVIRONMENT_PATH_WINDOWS_XXX| replace:: On Windows hosts: - ``/include/`` if :variable:`CMAKE_LIBRARY_ARCHITECTURE` - is set, and |SYSTEM_ENVIRONMENT_PREFIX_PATH_XXX_SUBDIR|. +.. |SYSTEM_ENVIRONMENT_PATH_WINDOWS_XXX| replace:: + On Windows hosts, CMake 3.3 through 3.27 searched additional paths: + ``/include/`` if :variable:`CMAKE_LIBRARY_ARCHITECTURE` + is set, and |SYSTEM_ENVIRONMENT_PREFIX_PATH_XXX_SUBDIR|. + This behavior was removed by CMake 3.28. .. |CMAKE_SYSTEM_PREFIX_PATH_XXX| replace:: ``/include/`` if :variable:`CMAKE_LIBRARY_ARCHITECTURE` diff --git a/Help/command/find_program.rst b/Help/command/find_program.rst index fe95a9a..b6b2508 100644 --- a/Help/command/find_program.rst +++ b/Help/command/find_program.rst @@ -23,7 +23,7 @@ find_program .. |ENV_CMAKE_XXX_MAC_PATH| replace:: :envvar:`CMAKE_APPBUNDLE_PATH` .. |SYSTEM_ENVIRONMENT_PATH_XXX| replace:: The directories in ``PATH`` itself. -.. |SYSTEM_ENVIRONMENT_PATH_WINDOWS_XXX| replace:: On Windows hosts no extra search paths are included +.. |SYSTEM_ENVIRONMENT_PATH_WINDOWS_XXX| replace:: \ .. |CMAKE_SYSTEM_PREFIX_PATH_XXX| replace:: |CMAKE_SYSTEM_PREFIX_PATH_XXX_SUBDIR| diff --git a/Help/release/dev/find-windows-no-PATH-prefixes.rst b/Help/release/dev/find-windows-no-PATH-prefixes.rst new file mode 100644 index 0000000..b65c00b --- /dev/null +++ b/Help/release/dev/find-windows-no-PATH-prefixes.rst @@ -0,0 +1,17 @@ +find-windows-no-PATH-prefixes +----------------------------- + +* The :command:`find_library`, :command:`find_path`, and :command:`find_file` + commands no longer search in installation prefixes derived from the ``PATH`` + environment variable. This behavior was added in CMake 3.3 to support + MSYS and MinGW (``MSYSTEM``) development environments on Windows, but + it can search undesired prefixes that happen to be in the ``PATH`` for + unrelated reasons. Users that keep some ``/bin`` directories in + the ``PATH`` just for their tools do not necessarily want any corresponding + ``/lib`` or ``/include`` directories searched. + The behavior was reverted for non-Windows platforms by CMake 3.6. + Now it has been reverted on Windows platforms too. + + One may set the ``CMAKE_PREFIX_PATH`` environment variable with a + :ref:`semicolon-separated list ` of prefixes + that are to be searched. diff --git a/Source/cmFindBase.cxx b/Source/cmFindBase.cxx index 9f78418..8840cdc 100644 --- a/Source/cmFindBase.cxx +++ b/Source/cmFindBase.cxx @@ -329,9 +329,6 @@ void cmFindBase::FillSystemEnvironmentPath() // Add LIB or INCLUDE if (!this->EnvironmentPath.empty()) { paths.AddEnvPath(this->EnvironmentPath); -#if defined(_WIN32) || defined(__CYGWIN__) - paths.AddEnvPrefixPath("PATH", true); -#endif } // Add PATH paths.AddEnvPath("PATH"); diff --git a/Tests/RunCMake/find_file/FromPATHEnv-stdout-cygwin.txt b/Tests/RunCMake/find_file/FromPATHEnv-stdout-cygwin.txt deleted file mode 100644 index 6912bdf..0000000 --- a/Tests/RunCMake/find_file/FromPATHEnv-stdout-cygwin.txt +++ /dev/null @@ -1,9 +0,0 @@ --- PrefixInPATH_File='PrefixInPATH_File-NOTFOUND' --- PrefixInPATH_File='.*/Tests/RunCMake/find_file/include/PrefixInPATH.h' --- PrefixInPATH_File='.*/Tests/RunCMake/find_file/include/PrefixInPATH.h' --- PrefixInPATH_File='PrefixInPATH_File-NOTFOUND' --- PrefixInPATH_File='PrefixInPATH_File-NOTFOUND' --- PrefixInPATH_File='PrefixInPATH_File-NOTFOUND' --- PrefixInPATH_File='PrefixInPATH_File-NOTFOUND' --- PrefixInPATH_File='PrefixInPATH_File-NOTFOUND' --- PrefixInPATH_File='PrefixInPATH_File-NOTFOUND' diff --git a/Tests/RunCMake/find_file/FromPATHEnv-stdout-msys.txt b/Tests/RunCMake/find_file/FromPATHEnv-stdout-msys.txt deleted file mode 100644 index 6912bdf..0000000 --- a/Tests/RunCMake/find_file/FromPATHEnv-stdout-msys.txt +++ /dev/null @@ -1,9 +0,0 @@ --- PrefixInPATH_File='PrefixInPATH_File-NOTFOUND' --- PrefixInPATH_File='.*/Tests/RunCMake/find_file/include/PrefixInPATH.h' --- PrefixInPATH_File='.*/Tests/RunCMake/find_file/include/PrefixInPATH.h' --- PrefixInPATH_File='PrefixInPATH_File-NOTFOUND' --- PrefixInPATH_File='PrefixInPATH_File-NOTFOUND' --- PrefixInPATH_File='PrefixInPATH_File-NOTFOUND' --- PrefixInPATH_File='PrefixInPATH_File-NOTFOUND' --- PrefixInPATH_File='PrefixInPATH_File-NOTFOUND' --- PrefixInPATH_File='PrefixInPATH_File-NOTFOUND' diff --git a/Tests/RunCMake/find_file/FromPATHEnv-stdout-windows.txt b/Tests/RunCMake/find_file/FromPATHEnv-stdout-windows.txt deleted file mode 100644 index 6912bdf..0000000 --- a/Tests/RunCMake/find_file/FromPATHEnv-stdout-windows.txt +++ /dev/null @@ -1,9 +0,0 @@ --- PrefixInPATH_File='PrefixInPATH_File-NOTFOUND' --- PrefixInPATH_File='.*/Tests/RunCMake/find_file/include/PrefixInPATH.h' --- PrefixInPATH_File='.*/Tests/RunCMake/find_file/include/PrefixInPATH.h' --- PrefixInPATH_File='PrefixInPATH_File-NOTFOUND' --- PrefixInPATH_File='PrefixInPATH_File-NOTFOUND' --- PrefixInPATH_File='PrefixInPATH_File-NOTFOUND' --- PrefixInPATH_File='PrefixInPATH_File-NOTFOUND' --- PrefixInPATH_File='PrefixInPATH_File-NOTFOUND' --- PrefixInPATH_File='PrefixInPATH_File-NOTFOUND' diff --git a/Tests/RunCMake/find_file/FromPATHEnvDebugVar-stdout-cygwin.txt b/Tests/RunCMake/find_file/FromPATHEnvDebugVar-stdout-cygwin.txt deleted file mode 100644 index 6912bdf..0000000 --- a/Tests/RunCMake/find_file/FromPATHEnvDebugVar-stdout-cygwin.txt +++ /dev/null @@ -1,9 +0,0 @@ --- PrefixInPATH_File='PrefixInPATH_File-NOTFOUND' --- PrefixInPATH_File='.*/Tests/RunCMake/find_file/include/PrefixInPATH.h' --- PrefixInPATH_File='.*/Tests/RunCMake/find_file/include/PrefixInPATH.h' --- PrefixInPATH_File='PrefixInPATH_File-NOTFOUND' --- PrefixInPATH_File='PrefixInPATH_File-NOTFOUND' --- PrefixInPATH_File='PrefixInPATH_File-NOTFOUND' --- PrefixInPATH_File='PrefixInPATH_File-NOTFOUND' --- PrefixInPATH_File='PrefixInPATH_File-NOTFOUND' --- PrefixInPATH_File='PrefixInPATH_File-NOTFOUND' diff --git a/Tests/RunCMake/find_file/FromPATHEnvDebugVar-stdout-msys.txt b/Tests/RunCMake/find_file/FromPATHEnvDebugVar-stdout-msys.txt deleted file mode 100644 index 6912bdf..0000000 --- a/Tests/RunCMake/find_file/FromPATHEnvDebugVar-stdout-msys.txt +++ /dev/null @@ -1,9 +0,0 @@ --- PrefixInPATH_File='PrefixInPATH_File-NOTFOUND' --- PrefixInPATH_File='.*/Tests/RunCMake/find_file/include/PrefixInPATH.h' --- PrefixInPATH_File='.*/Tests/RunCMake/find_file/include/PrefixInPATH.h' --- PrefixInPATH_File='PrefixInPATH_File-NOTFOUND' --- PrefixInPATH_File='PrefixInPATH_File-NOTFOUND' --- PrefixInPATH_File='PrefixInPATH_File-NOTFOUND' --- PrefixInPATH_File='PrefixInPATH_File-NOTFOUND' --- PrefixInPATH_File='PrefixInPATH_File-NOTFOUND' --- PrefixInPATH_File='PrefixInPATH_File-NOTFOUND' diff --git a/Tests/RunCMake/find_file/FromPATHEnvDebugVar-stdout-windows.txt b/Tests/RunCMake/find_file/FromPATHEnvDebugVar-stdout-windows.txt deleted file mode 100644 index 6912bdf..0000000 --- a/Tests/RunCMake/find_file/FromPATHEnvDebugVar-stdout-windows.txt +++ /dev/null @@ -1,9 +0,0 @@ --- PrefixInPATH_File='PrefixInPATH_File-NOTFOUND' --- PrefixInPATH_File='.*/Tests/RunCMake/find_file/include/PrefixInPATH.h' --- PrefixInPATH_File='.*/Tests/RunCMake/find_file/include/PrefixInPATH.h' --- PrefixInPATH_File='PrefixInPATH_File-NOTFOUND' --- PrefixInPATH_File='PrefixInPATH_File-NOTFOUND' --- PrefixInPATH_File='PrefixInPATH_File-NOTFOUND' --- PrefixInPATH_File='PrefixInPATH_File-NOTFOUND' --- PrefixInPATH_File='PrefixInPATH_File-NOTFOUND' --- PrefixInPATH_File='PrefixInPATH_File-NOTFOUND' diff --git a/Tests/RunCMake/find_file/PrefixInPATH-stdout-cygwin.txt b/Tests/RunCMake/find_file/PrefixInPATH-stdout-cygwin.txt deleted file mode 100644 index d73bc1d..0000000 --- a/Tests/RunCMake/find_file/PrefixInPATH-stdout-cygwin.txt +++ /dev/null @@ -1,4 +0,0 @@ --- PrefixInPATH_INCLUDE_DIR='PrefixInPATH_INCLUDE_DIR-NOTFOUND' --- PrefixInPATH_INCLUDE_DIR='.*/Tests/RunCMake/find_file/include/PrefixInPATH.h' --- PrefixInPATH_INCLUDE_DIR='.*/Tests/RunCMake/find_file/include/PrefixInPATH.h' --- PrefixInPATH_INCLUDE_DIR='.*/Tests/RunCMake/find_file/include/PrefixInPATH.h' diff --git a/Tests/RunCMake/find_file/PrefixInPATH-stdout-msys.txt b/Tests/RunCMake/find_file/PrefixInPATH-stdout-msys.txt deleted file mode 100644 index d73bc1d..0000000 --- a/Tests/RunCMake/find_file/PrefixInPATH-stdout-msys.txt +++ /dev/null @@ -1,4 +0,0 @@ --- PrefixInPATH_INCLUDE_DIR='PrefixInPATH_INCLUDE_DIR-NOTFOUND' --- PrefixInPATH_INCLUDE_DIR='.*/Tests/RunCMake/find_file/include/PrefixInPATH.h' --- PrefixInPATH_INCLUDE_DIR='.*/Tests/RunCMake/find_file/include/PrefixInPATH.h' --- PrefixInPATH_INCLUDE_DIR='.*/Tests/RunCMake/find_file/include/PrefixInPATH.h' diff --git a/Tests/RunCMake/find_file/PrefixInPATH-stdout-windows.txt b/Tests/RunCMake/find_file/PrefixInPATH-stdout-windows.txt deleted file mode 100644 index d73bc1d..0000000 --- a/Tests/RunCMake/find_file/PrefixInPATH-stdout-windows.txt +++ /dev/null @@ -1,4 +0,0 @@ --- PrefixInPATH_INCLUDE_DIR='PrefixInPATH_INCLUDE_DIR-NOTFOUND' --- PrefixInPATH_INCLUDE_DIR='.*/Tests/RunCMake/find_file/include/PrefixInPATH.h' --- PrefixInPATH_INCLUDE_DIR='.*/Tests/RunCMake/find_file/include/PrefixInPATH.h' --- PrefixInPATH_INCLUDE_DIR='.*/Tests/RunCMake/find_file/include/PrefixInPATH.h' diff --git a/Tests/RunCMake/find_library/FromPATHEnv-stdout-cygwin.txt b/Tests/RunCMake/find_library/FromPATHEnv-stdout-cygwin.txt deleted file mode 100644 index 01e2720..0000000 --- a/Tests/RunCMake/find_library/FromPATHEnv-stdout-cygwin.txt +++ /dev/null @@ -1,6 +0,0 @@ --- CREATED_LIBRARY='CREATED_LIBRARY-NOTFOUND' --- CREATED_LIBRARY='[^']*/Tests/RunCMake/find_library/FromPATHEnv-build/lib/libcreated.a' --- CREATED_LIBRARY='[^']*/Tests/RunCMake/find_library/FromPATHEnv-build/lib/libcreated.a' --- CREATED_LIBRARY='CREATED_LIBRARY-NOTFOUND' --- CREATED_LIBRARY='CREATED_LIBRARY-NOTFOUND' --- CREATED_LIBRARY='CREATED_LIBRARY-NOTFOUND' diff --git a/Tests/RunCMake/find_library/FromPATHEnv-stdout-msys.txt b/Tests/RunCMake/find_library/FromPATHEnv-stdout-msys.txt deleted file mode 100644 index 01e2720..0000000 --- a/Tests/RunCMake/find_library/FromPATHEnv-stdout-msys.txt +++ /dev/null @@ -1,6 +0,0 @@ --- CREATED_LIBRARY='CREATED_LIBRARY-NOTFOUND' --- CREATED_LIBRARY='[^']*/Tests/RunCMake/find_library/FromPATHEnv-build/lib/libcreated.a' --- CREATED_LIBRARY='[^']*/Tests/RunCMake/find_library/FromPATHEnv-build/lib/libcreated.a' --- CREATED_LIBRARY='CREATED_LIBRARY-NOTFOUND' --- CREATED_LIBRARY='CREATED_LIBRARY-NOTFOUND' --- CREATED_LIBRARY='CREATED_LIBRARY-NOTFOUND' diff --git a/Tests/RunCMake/find_library/FromPATHEnv-stdout-windows.txt b/Tests/RunCMake/find_library/FromPATHEnv-stdout-windows.txt deleted file mode 100644 index 01e2720..0000000 --- a/Tests/RunCMake/find_library/FromPATHEnv-stdout-windows.txt +++ /dev/null @@ -1,6 +0,0 @@ --- CREATED_LIBRARY='CREATED_LIBRARY-NOTFOUND' --- CREATED_LIBRARY='[^']*/Tests/RunCMake/find_library/FromPATHEnv-build/lib/libcreated.a' --- CREATED_LIBRARY='[^']*/Tests/RunCMake/find_library/FromPATHEnv-build/lib/libcreated.a' --- CREATED_LIBRARY='CREATED_LIBRARY-NOTFOUND' --- CREATED_LIBRARY='CREATED_LIBRARY-NOTFOUND' --- CREATED_LIBRARY='CREATED_LIBRARY-NOTFOUND' diff --git a/Tests/RunCMake/find_library/FromPATHEnvDebugVar-stdout-cygwin.txt b/Tests/RunCMake/find_library/FromPATHEnvDebugVar-stdout-cygwin.txt deleted file mode 100644 index 48f36cc..0000000 --- a/Tests/RunCMake/find_library/FromPATHEnvDebugVar-stdout-cygwin.txt +++ /dev/null @@ -1,6 +0,0 @@ --- CREATED_LIBRARY='CREATED_LIBRARY-NOTFOUND' --- CREATED_LIBRARY='[^']*/Tests/RunCMake/find_library/FromPATHEnvDebugVar-build/lib/libcreated.a' --- CREATED_LIBRARY='[^']*/Tests/RunCMake/find_library/FromPATHEnvDebugVar-build/lib/libcreated.a' --- CREATED_LIBRARY='CREATED_LIBRARY-NOTFOUND' --- CREATED_LIBRARY='CREATED_LIBRARY-NOTFOUND' --- CREATED_LIBRARY='CREATED_LIBRARY-NOTFOUND' diff --git a/Tests/RunCMake/find_library/FromPATHEnvDebugVar-stdout-msys.txt b/Tests/RunCMake/find_library/FromPATHEnvDebugVar-stdout-msys.txt deleted file mode 100644 index 48f36cc..0000000 --- a/Tests/RunCMake/find_library/FromPATHEnvDebugVar-stdout-msys.txt +++ /dev/null @@ -1,6 +0,0 @@ --- CREATED_LIBRARY='CREATED_LIBRARY-NOTFOUND' --- CREATED_LIBRARY='[^']*/Tests/RunCMake/find_library/FromPATHEnvDebugVar-build/lib/libcreated.a' --- CREATED_LIBRARY='[^']*/Tests/RunCMake/find_library/FromPATHEnvDebugVar-build/lib/libcreated.a' --- CREATED_LIBRARY='CREATED_LIBRARY-NOTFOUND' --- CREATED_LIBRARY='CREATED_LIBRARY-NOTFOUND' --- CREATED_LIBRARY='CREATED_LIBRARY-NOTFOUND' diff --git a/Tests/RunCMake/find_library/FromPATHEnvDebugVar-stdout-windows.txt b/Tests/RunCMake/find_library/FromPATHEnvDebugVar-stdout-windows.txt deleted file mode 100644 index 48f36cc..0000000 --- a/Tests/RunCMake/find_library/FromPATHEnvDebugVar-stdout-windows.txt +++ /dev/null @@ -1,6 +0,0 @@ --- CREATED_LIBRARY='CREATED_LIBRARY-NOTFOUND' --- CREATED_LIBRARY='[^']*/Tests/RunCMake/find_library/FromPATHEnvDebugVar-build/lib/libcreated.a' --- CREATED_LIBRARY='[^']*/Tests/RunCMake/find_library/FromPATHEnvDebugVar-build/lib/libcreated.a' --- CREATED_LIBRARY='CREATED_LIBRARY-NOTFOUND' --- CREATED_LIBRARY='CREATED_LIBRARY-NOTFOUND' --- CREATED_LIBRARY='CREATED_LIBRARY-NOTFOUND' diff --git a/Tests/RunCMake/find_library/PrefixInPATH-stdout-cygwin.txt b/Tests/RunCMake/find_library/PrefixInPATH-stdout-cygwin.txt deleted file mode 100644 index 1ab884c..0000000 --- a/Tests/RunCMake/find_library/PrefixInPATH-stdout-cygwin.txt +++ /dev/null @@ -1,4 +0,0 @@ --- PrefixInPATH_LIBRARY='PrefixInPATH_LIBRARY-NOTFOUND' --- PrefixInPATH_LIBRARY='.*/Tests/RunCMake/find_library/lib/libPrefixInPATH.a' --- PrefixInPATH_LIBRARY='.*/Tests/RunCMake/find_library/lib/libPrefixInPATH.a' --- PrefixInPATH_LIBRARY='.*/Tests/RunCMake/find_library/lib/libPrefixInPATH.a' diff --git a/Tests/RunCMake/find_library/PrefixInPATH-stdout-msys.txt b/Tests/RunCMake/find_library/PrefixInPATH-stdout-msys.txt deleted file mode 100644 index 1ab884c..0000000 --- a/Tests/RunCMake/find_library/PrefixInPATH-stdout-msys.txt +++ /dev/null @@ -1,4 +0,0 @@ --- PrefixInPATH_LIBRARY='PrefixInPATH_LIBRARY-NOTFOUND' --- PrefixInPATH_LIBRARY='.*/Tests/RunCMake/find_library/lib/libPrefixInPATH.a' --- PrefixInPATH_LIBRARY='.*/Tests/RunCMake/find_library/lib/libPrefixInPATH.a' --- PrefixInPATH_LIBRARY='.*/Tests/RunCMake/find_library/lib/libPrefixInPATH.a' diff --git a/Tests/RunCMake/find_library/PrefixInPATH-stdout-windows.txt b/Tests/RunCMake/find_library/PrefixInPATH-stdout-windows.txt deleted file mode 100644 index 1ab884c..0000000 --- a/Tests/RunCMake/find_library/PrefixInPATH-stdout-windows.txt +++ /dev/null @@ -1,4 +0,0 @@ --- PrefixInPATH_LIBRARY='PrefixInPATH_LIBRARY-NOTFOUND' --- PrefixInPATH_LIBRARY='.*/Tests/RunCMake/find_library/lib/libPrefixInPATH.a' --- PrefixInPATH_LIBRARY='.*/Tests/RunCMake/find_library/lib/libPrefixInPATH.a' --- PrefixInPATH_LIBRARY='.*/Tests/RunCMake/find_library/lib/libPrefixInPATH.a' diff --git a/Tests/RunCMake/find_path/FromPATHEnv-stdout-cygwin.txt b/Tests/RunCMake/find_path/FromPATHEnv-stdout-cygwin.txt deleted file mode 100644 index 8f3e7ca..0000000 --- a/Tests/RunCMake/find_path/FromPATHEnv-stdout-cygwin.txt +++ /dev/null @@ -1,9 +0,0 @@ --- PATH_IN_ENV_PATH='PATH_IN_ENV_PATH-NOTFOUND' --- PATH_IN_ENV_PATH='.*/Tests/RunCMake/find_path/include' --- PATH_IN_ENV_PATH='.*/Tests/RunCMake/find_path/include' --- PATH_IN_ENV_PATH='PATH_IN_ENV_PATH-NOTFOUND' --- PATH_IN_ENV_PATH='PATH_IN_ENV_PATH-NOTFOUND' --- PATH_IN_ENV_PATH='PATH_IN_ENV_PATH-NOTFOUND' --- PATH_IN_ENV_PATH='PATH_IN_ENV_PATH-NOTFOUND' --- PATH_IN_ENV_PATH='PATH_IN_ENV_PATH-NOTFOUND' --- PATH_IN_ENV_PATH='PATH_IN_ENV_PATH-NOTFOUND' diff --git a/Tests/RunCMake/find_path/FromPATHEnv-stdout-msys.txt b/Tests/RunCMake/find_path/FromPATHEnv-stdout-msys.txt deleted file mode 100644 index 8f3e7ca..0000000 --- a/Tests/RunCMake/find_path/FromPATHEnv-stdout-msys.txt +++ /dev/null @@ -1,9 +0,0 @@ --- PATH_IN_ENV_PATH='PATH_IN_ENV_PATH-NOTFOUND' --- PATH_IN_ENV_PATH='.*/Tests/RunCMake/find_path/include' --- PATH_IN_ENV_PATH='.*/Tests/RunCMake/find_path/include' --- PATH_IN_ENV_PATH='PATH_IN_ENV_PATH-NOTFOUND' --- PATH_IN_ENV_PATH='PATH_IN_ENV_PATH-NOTFOUND' --- PATH_IN_ENV_PATH='PATH_IN_ENV_PATH-NOTFOUND' --- PATH_IN_ENV_PATH='PATH_IN_ENV_PATH-NOTFOUND' --- PATH_IN_ENV_PATH='PATH_IN_ENV_PATH-NOTFOUND' --- PATH_IN_ENV_PATH='PATH_IN_ENV_PATH-NOTFOUND' diff --git a/Tests/RunCMake/find_path/FromPATHEnv-stdout-windows.txt b/Tests/RunCMake/find_path/FromPATHEnv-stdout-windows.txt deleted file mode 100644 index 8f3e7ca..0000000 --- a/Tests/RunCMake/find_path/FromPATHEnv-stdout-windows.txt +++ /dev/null @@ -1,9 +0,0 @@ --- PATH_IN_ENV_PATH='PATH_IN_ENV_PATH-NOTFOUND' --- PATH_IN_ENV_PATH='.*/Tests/RunCMake/find_path/include' --- PATH_IN_ENV_PATH='.*/Tests/RunCMake/find_path/include' --- PATH_IN_ENV_PATH='PATH_IN_ENV_PATH-NOTFOUND' --- PATH_IN_ENV_PATH='PATH_IN_ENV_PATH-NOTFOUND' --- PATH_IN_ENV_PATH='PATH_IN_ENV_PATH-NOTFOUND' --- PATH_IN_ENV_PATH='PATH_IN_ENV_PATH-NOTFOUND' --- PATH_IN_ENV_PATH='PATH_IN_ENV_PATH-NOTFOUND' --- PATH_IN_ENV_PATH='PATH_IN_ENV_PATH-NOTFOUND' diff --git a/Tests/RunCMake/find_path/FromPATHEnvDebugVar-stdout-cygwin.txt b/Tests/RunCMake/find_path/FromPATHEnvDebugVar-stdout-cygwin.txt deleted file mode 100644 index a502d78..0000000 --- a/Tests/RunCMake/find_path/FromPATHEnvDebugVar-stdout-cygwin.txt +++ /dev/null @@ -1,9 +0,0 @@ --- PATH_IN_ENV_PATH='PATH_IN_ENV_PATH_A-NOTFOUND' --- PATH_IN_ENV_PATH='.*/Tests/RunCMake/find_path/include' --- PATH_IN_ENV_PATH='.*/Tests/RunCMake/find_path/include' --- PATH_IN_ENV_PATH='PATH_IN_ENV_PATH_A-NOTFOUND' --- PATH_IN_ENV_PATH='PATH_IN_ENV_PATH_A-NOTFOUND' --- PATH_IN_ENV_PATH='PATH_IN_ENV_PATH_A-NOTFOUND' --- PATH_IN_ENV_PATH='' --- PATH_IN_ENV_PATH='' --- PATH_IN_ENV_PATH='' diff --git a/Tests/RunCMake/find_path/FromPATHEnvDebugVar-stdout-msys.txt b/Tests/RunCMake/find_path/FromPATHEnvDebugVar-stdout-msys.txt deleted file mode 100644 index a502d78..0000000 --- a/Tests/RunCMake/find_path/FromPATHEnvDebugVar-stdout-msys.txt +++ /dev/null @@ -1,9 +0,0 @@ --- PATH_IN_ENV_PATH='PATH_IN_ENV_PATH_A-NOTFOUND' --- PATH_IN_ENV_PATH='.*/Tests/RunCMake/find_path/include' --- PATH_IN_ENV_PATH='.*/Tests/RunCMake/find_path/include' --- PATH_IN_ENV_PATH='PATH_IN_ENV_PATH_A-NOTFOUND' --- PATH_IN_ENV_PATH='PATH_IN_ENV_PATH_A-NOTFOUND' --- PATH_IN_ENV_PATH='PATH_IN_ENV_PATH_A-NOTFOUND' --- PATH_IN_ENV_PATH='' --- PATH_IN_ENV_PATH='' --- PATH_IN_ENV_PATH='' diff --git a/Tests/RunCMake/find_path/FromPATHEnvDebugVar-stdout-windows.txt b/Tests/RunCMake/find_path/FromPATHEnvDebugVar-stdout-windows.txt deleted file mode 100644 index a502d78..0000000 --- a/Tests/RunCMake/find_path/FromPATHEnvDebugVar-stdout-windows.txt +++ /dev/null @@ -1,9 +0,0 @@ --- PATH_IN_ENV_PATH='PATH_IN_ENV_PATH_A-NOTFOUND' --- PATH_IN_ENV_PATH='.*/Tests/RunCMake/find_path/include' --- PATH_IN_ENV_PATH='.*/Tests/RunCMake/find_path/include' --- PATH_IN_ENV_PATH='PATH_IN_ENV_PATH_A-NOTFOUND' --- PATH_IN_ENV_PATH='PATH_IN_ENV_PATH_A-NOTFOUND' --- PATH_IN_ENV_PATH='PATH_IN_ENV_PATH_A-NOTFOUND' --- PATH_IN_ENV_PATH='' --- PATH_IN_ENV_PATH='' --- PATH_IN_ENV_PATH='' diff --git a/Tests/RunCMake/find_path/PrefixInPATH-stdout-cygwin.txt b/Tests/RunCMake/find_path/PrefixInPATH-stdout-cygwin.txt deleted file mode 100644 index bb2ceb7..0000000 --- a/Tests/RunCMake/find_path/PrefixInPATH-stdout-cygwin.txt +++ /dev/null @@ -1,4 +0,0 @@ --- PrefixInPATH_INCLUDE_DIR='PrefixInPATH_INCLUDE_DIR-NOTFOUND' --- PrefixInPATH_INCLUDE_DIR='.*/Tests/RunCMake/find_path/include' --- PrefixInPATH_INCLUDE_DIR='.*/Tests/RunCMake/find_path/include' --- PrefixInPATH_INCLUDE_DIR='.*/Tests/RunCMake/find_path/include' diff --git a/Tests/RunCMake/find_path/PrefixInPATH-stdout-msys.txt b/Tests/RunCMake/find_path/PrefixInPATH-stdout-msys.txt deleted file mode 100644 index bb2ceb7..0000000 --- a/Tests/RunCMake/find_path/PrefixInPATH-stdout-msys.txt +++ /dev/null @@ -1,4 +0,0 @@ --- PrefixInPATH_INCLUDE_DIR='PrefixInPATH_INCLUDE_DIR-NOTFOUND' --- PrefixInPATH_INCLUDE_DIR='.*/Tests/RunCMake/find_path/include' --- PrefixInPATH_INCLUDE_DIR='.*/Tests/RunCMake/find_path/include' --- PrefixInPATH_INCLUDE_DIR='.*/Tests/RunCMake/find_path/include' diff --git a/Tests/RunCMake/find_path/PrefixInPATH-stdout-windows.txt b/Tests/RunCMake/find_path/PrefixInPATH-stdout-windows.txt deleted file mode 100644 index bb2ceb7..0000000 --- a/Tests/RunCMake/find_path/PrefixInPATH-stdout-windows.txt +++ /dev/null @@ -1,4 +0,0 @@ --- PrefixInPATH_INCLUDE_DIR='PrefixInPATH_INCLUDE_DIR-NOTFOUND' --- PrefixInPATH_INCLUDE_DIR='.*/Tests/RunCMake/find_path/include' --- PrefixInPATH_INCLUDE_DIR='.*/Tests/RunCMake/find_path/include' --- PrefixInPATH_INCLUDE_DIR='.*/Tests/RunCMake/find_path/include' -- cgit v0.12