diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2017-06-29 09:44:17 +0200 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2017-06-29 09:44:17 +0200 |
| commit | ebcf7d0ad5777a5f1c33438e3133750de5a283f3 (patch) | |
| tree | 65fd7ce1d5d65b58730d22981f646222e74fd5f6 /cmake/cmake.d | |
| parent | 3a3925bfec46d38e33014e007538de4d2465ebb5 (diff) | |
Fix: Debian things triggered even when use the SDK
USe variable reference not its value to test if defined
Change-Id: If59be00e2666d9e66f386fe0ca2cf39b386d0197
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'cmake/cmake.d')
| -rw-r--r-- | cmake/cmake.d/01-variables.cmake | 4 | ||||
| -rw-r--r-- | cmake/cmake.d/03-extra_targets.cmake | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cmake/cmake.d/01-variables.cmake b/cmake/cmake.d/01-variables.cmake index 8ee4dff..764fc93 100644 --- a/cmake/cmake.d/01-variables.cmake +++ b/cmake/cmake.d/01-variables.cmake @@ -123,7 +123,7 @@ set(ARCHIVE_OUTPUT ${ARCHIVE_OUTPUT_ARCHIVE}.gz) set(TMP_ARCHIVE_SUBMODULE ${PROJECT_PKG_ENTRY_POINT}/${NPKG_PROJECT_NAME}-sub) set(CMD_ARCHIVE_SUBMODULE \'git archive --verbose --prefix=${NPKG_PROJECT_NAME}-${PROJECT_VERSION}/$$path/ --format tar HEAD --output ${TMP_ARCHIVE_SUBMODULE}-$$sha1.tar\' ) -if(OSRELEASE MATCHES "debian" AND NOT DEFINED $ENV{SDKTARGETSYSROOT}) +if(OSRELEASE MATCHES "debian" AND NOT DEFINED ENV{SDKTARGETSYSROOT}) # build deb spec file from template set(PACKAGING_DEB_OUTPUT_DSC ${PROJECT_PKG_ENTRY_POINT}/${NPKG_PROJECT_NAME}.dsc) set(PACKAGING_DEB_OUTPUT_INSTALL ${PROJECT_PKG_ENTRY_POINT}/debian.${NPKG_PROJECT_NAME}.install) @@ -131,4 +131,4 @@ if(OSRELEASE MATCHES "debian" AND NOT DEFINED $ENV{SDKTARGETSYSROOT}) set(PACKAGING_DEB_OUTPUT_COMPAT ${PROJECT_PKG_ENTRY_POINT}/debian.compat) set(PACKAGING_DEB_OUTPUT_CONTROL ${PROJECT_PKG_ENTRY_POINT}/debian.control) set(PACKAGING_DEB_OUTPUT_RULES ${PROJECT_PKG_ENTRY_POINT}/debian.rules) -endif(OSRELEASE MATCHES "debian" AND NOT DEFINED $ENV{SDKTARGETSYSROOT})
\ No newline at end of file +endif(OSRELEASE MATCHES "debian" AND NOT DEFINED ENV{SDKTARGETSYSROOT})
\ No newline at end of file diff --git a/cmake/cmake.d/03-extra_targets.cmake b/cmake/cmake.d/03-extra_targets.cmake index 56f9b78..35fb2e3 100644 --- a/cmake/cmake.d/03-extra_targets.cmake +++ b/cmake/cmake.d/03-extra_targets.cmake @@ -85,7 +85,7 @@ foreach (PKG_CONFIG ${PKG_REQUIRED_LIST}) # package providing the pkg-cong file ${XPREFIX}.pc, we need # to test the OS release package type # Only doable within a native environment not under SDK - if( OSRELEASE MATCHES "debian" AND NOT DEFINED $ENV{SDKTARGETSYSROOT}) + if( OSRELEASE MATCHES "debian" AND NOT DEFINED ENV{SDKTARGETSYSROOT}) execute_process( COMMAND dpkg -S *${XPREFIX}.pc OUTPUT_VARIABLE TMP_PKG_BIN |