diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2017-06-29 15:13:21 +0200 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2018-10-15 18:22:47 +0200 |
| commit | 797a196cdcfaac621e9b1bb75e39b8788acb356a (patch) | |
| tree | e5e3d3d8b2500f48a2b16d132515babcac258ccb /cmake/cmake.d/01-variables.cmake | |
| parent | cede676724399dc755e9b8b984166cc48f0b35ca (diff) | |
Adding detection of a Yocto build environment
Change-Id: Id6a94153ada5b98a4a6d564859da8617ac636704
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
# Conflicts:
# cmake/cmake.d/01-variables.cmake
Diffstat (limited to 'cmake/cmake.d/01-variables.cmake')
| -rw-r--r-- | cmake/cmake.d/01-variables.cmake | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/cmake/cmake.d/01-variables.cmake b/cmake/cmake.d/01-variables.cmake index 356ffb8..1bba5ce 100644 --- a/cmake/cmake.d/01-variables.cmake +++ b/cmake/cmake.d/01-variables.cmake @@ -50,8 +50,6 @@ set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH ON CACHE BOOLEAN "Flag for using prefix pat # Native packaging name set(NPKG_PROJECT_NAME agl-${PROJECT_NAME}) -#No upercase in deb packaging name -string(TOLOWER ${NPKG_PROJECT_NAME} NPKG_PROJECT_NAME) set(CMAKE_BUILD_TYPE Debug CACHE STRING "the type of build") set(CMAKE_POSITION_INDEPENDENT_CODE ON) @@ -125,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} AND NOT DEFINED CMAKE_TOOLCHAIN_FILE) # 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) @@ -133,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}) +endif() |