From ee46ac1ab8dd154b0edeb1c424bb439fb9828d43 Mon Sep 17 00:00:00 2001 From: Artur Harasimiuk Date: Fri, 28 Jun 2019 14:04:41 +0200 Subject: [PATCH] cmake: allow to disable package target set cmake option: -DNEO_BUILD_PACKAGE=FALSE to disable CPack usage which will remove target package. Option is set to TRUE if not specified externally. Change-Id: I6bcc81c8a0f85dbbd82ddaf66f4d4bc628ca04da Signed-off-by: Artur Harasimiuk --- CMakeLists.txt | 7 ++++++- manifests/manifest.yml | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d41e01ac38..ec3bb70ec2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,6 +36,9 @@ include(GNUInstallDirs) # define global property where we will collect component list to package define_property(GLOBAL PROPERTY NEO_COMPONENTS_LIST BRIEF_DOCS "List of components" FULL_DOCS "List of components to create packages") set(GLOBAL PROPERTY NEO_COMPONENTS_LIST "") +if(NOT DEFINED NEO_BUILD_PACKAGE) + set(NEO_BUILD_PACKAGE TRUE) +endif() set(BRANCH_TYPE "") set(BRANCH_DIR_SUFFIX "/${BRANCH_TYPE}") @@ -822,4 +825,6 @@ configure_file(lib_names.h.in ${IGDRCL_BUILD_DIR}/lib_names.h) hide_subdir(runtime) add_subdirectories() -include(package.cmake) +if(NEO_BUILD_PACKAGE) + include(package.cmake) +endif() diff --git a/manifests/manifest.yml b/manifests/manifest.yml index e03f1d3b50..22f4932a92 100644 --- a/manifests/manifest.yml +++ b/manifests/manifest.yml @@ -17,7 +17,7 @@ components: branch: infra clean_on_sync: true dest_dir: infra - revision: 54d2503b502069fff76697aaf210a88670d3b53b + revision: 4a59c587b7d293cb991981cf9aed654f9b0b15dd type: git internal: branch: master