diff options
| author | Stephane Lajoie <dada@typicus.org> | 2017-07-07 22:30:36 -0400 |
|---|---|---|
| committer | Stephane Lajoie <dada@typicus.org> | 2017-07-07 22:30:36 -0400 |
| commit | c2f1a2af59d911b79dbe63a23815c4bfa472e2a6 (patch) | |
| tree | 90cc452ce24b3981e0653ae956f77fbfd4b05b1a /scripts | |
| parent | b5cd10bc66b785fdc385c16cfddc503324ba8e53 (diff) | |
| parent | 426df16b57c325928e6d587dc385dc836712a6b1 (diff) | |
| download | vcpkg-c2f1a2af59d911b79dbe63a23815c4bfa472e2a6.tar.gz vcpkg-c2f1a2af59d911b79dbe63a23815c4bfa472e2a6.zip | |
Merge branch 'master' into add-llvm
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/cmake/vcpkg_fixup_cmake_targets.cmake | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/cmake/vcpkg_fixup_cmake_targets.cmake b/scripts/cmake/vcpkg_fixup_cmake_targets.cmake index 6fa096cbd..eaf3bb966 100644 --- a/scripts/cmake/vcpkg_fixup_cmake_targets.cmake +++ b/scripts/cmake/vcpkg_fixup_cmake_targets.cmake @@ -117,6 +117,10 @@ function(vcpkg_fixup_cmake_targets) foreach(MAIN_CONFIG ${MAIN_CONFIGS}) file(READ ${MAIN_CONFIG} _contents) string(REGEX REPLACE + "get_filename_component\\(_IMPORT_PREFIX \"\\\${CMAKE_CURRENT_LIST_FILE}\" PATH\\)(\nget_filename_component\\(_IMPORT_PREFIX \"\\\${_IMPORT_PREFIX}\" PATH\\))*" + "get_filename_component(_IMPORT_PREFIX \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)\nget_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)\nget_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)" + _contents "${_contents}") + string(REGEX REPLACE "get_filename_component\\(PACKAGE_PREFIX_DIR \"\\\${CMAKE_CURRENT_LIST_DIR}/\\.\\./(\\.\\./)*\" ABSOLUTE\\)" "get_filename_component(PACKAGE_PREFIX_DIR \"\${CMAKE_CURRENT_LIST_DIR}/../../\" ABSOLUTE)" _contents "${_contents}") |