diff options
| author | Alwin Esch <alwin.esch@web.de> | 2020-08-03 22:09:57 +0200 |
|---|---|---|
| committer | Alwin Esch <alwin.esch@web.de> | 2020-08-03 22:09:57 +0200 |
| commit | 2c1ef3dce244e4918b07f452d1c28a3b3b6d71a3 (patch) | |
| tree | 3cc80960866eba1110d6baf2930aa330099d4317 /cmake/scripts/common | |
| parent | 485bc87fb72c8dd48e342fb8561914e80dd44552 (diff) | |
[cmake] fix build by remove quotation marks on ExternalProject values
Before was about externalproject_add and related values quotation marks used.
This breaks since cmake 3.18.0 his use (3.17.4 ok about).
There it reports this by project related "PATCH_COMMAND ${PATCH_COMMAND}"
as there a "" behind and seems to take this instead of patch path.
Produced error message:
```
patching file ''
Hunk #1 FAILED at 16.
1 out of 1 hunk FAILED -- saving rejects to file .rej
/usr/bin/patch: **** Can't reopen file '' : No such file or directory
```
This 2 values has used the quotation marks:
INSTALL_COMMAND
EXTERNALPROJECT_SETUP
This remove them to have working again and fix e.g. Azure build system where
takes this new version.
Diffstat (limited to 'cmake/scripts/common')
| -rw-r--r-- | cmake/scripts/common/HandleDepends.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmake/scripts/common/HandleDepends.cmake b/cmake/scripts/common/HandleDepends.cmake index 7cacd25c08..c737c6aef7 100644 --- a/cmake/scripts/common/HandleDepends.cmake +++ b/cmake/scripts/common/HandleDepends.cmake @@ -185,7 +185,7 @@ function(add_addon_depends addon searchpath) set(EXTERNALPROJECT_SETUP PREFIX ${BUILD_DIR}/${id} CMAKE_ARGS ${extraflags} ${BUILD_ARGS} PATCH_COMMAND ${PATCH_COMMAND} - "${INSTALL_COMMAND}") + ${INSTALL_COMMAND}) if(CMAKE_VERSION VERSION_GREATER 3.5.9) list(APPEND EXTERNALPROJECT_SETUP GIT_SHALLOW 1) @@ -201,7 +201,7 @@ function(add_addon_depends addon searchpath) externalproject_add(${id} GIT_REPOSITORY ${url} GIT_TAG ${revision} - "${EXTERNALPROJECT_SETUP}") + ${EXTERNALPROJECT_SETUP}) # For patchfiles to work, disable (users globally set) autocrlf=true if(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_GREATER 3.7) @@ -249,12 +249,12 @@ function(add_addon_depends addon searchpath) "${URL_HASH_COMMAND}" DOWNLOAD_DIR ${DOWNLOAD_DIR} CONFIGURE_COMMAND ${CONFIGURE_COMMAND} - "${EXTERNALPROJECT_SETUP}") + ${EXTERNALPROJECT_SETUP}) endif() else() externalproject_add(${id} SOURCE_DIR ${dir} - "${EXTERNALPROJECT_SETUP}") + ${EXTERNALPROJECT_SETUP}) endif() if(deps) |