diff options
| author | Chen Yufei <[email protected]> | 2022-03-26 09:50:29 +0800 |
|---|---|---|
| committer | Chen Yufei <[email protected]> | 2022-03-26 09:50:29 +0800 |
| commit | a2f9818efd7b0bb7df0df867e3027c04f54cb87e (patch) | |
| tree | 26bfec884e403efd4d34477c74663d6f35cdf7a8 | |
| parent | f36796763f3b2c898759fdfbf9b9b76cd000d116 (diff) | |
Revert cmake path fix file name pattern: exclude include dir.
| -rw-r--r-- | xmake/modules/private/action/require/impl/actions/install.lua | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/xmake/modules/private/action/require/impl/actions/install.lua b/xmake/modules/private/action/require/impl/actions/install.lua index 28fbb7994..24f355ae0 100644 --- a/xmake/modules/private/action/require/impl/actions/install.lua +++ b/xmake/modules/private/action/require/impl/actions/install.lua @@ -148,8 +148,12 @@ end function _fix_paths_for_precompiled_package(package) local patterns = { { - -- Search for double quoted string for substitution. - file_pattern = {"**.cmake", "include/**"}, + -- Fix path for cmake files. + -- "|include/**" means exclude all files under include directory. + -- Their are quite a few search paths used by cmake, so just look + -- for all ".cmake" files for most reliable result. + -- https://cmake.org/cmake/help/latest/command/find_package.html#config-mode-search-procedure + file_pattern = {"**.cmake|include/**"}, search_pattern = {'("(.-)")'}, }, { |