From 79687753e1567652fb34738610953f839ce328f0 Mon Sep 17 00:00:00 2001 From: Rashad Kanavath <rashad.kanavath@c-s.fr> Date: Thu, 28 Apr 2016 13:11:38 +0200 Subject: [PATCH] PKG: include Packaging subdir if any of GENERATE_ is set --- SuperBuild/CMakeLists.txt | 4 +++- SuperBuild/Packaging/CMakeLists.txt | 3 --- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/SuperBuild/CMakeLists.txt b/SuperBuild/CMakeLists.txt index 26da4cbda8..b7c1930342 100644 --- a/SuperBuild/CMakeLists.txt +++ b/SuperBuild/CMakeLists.txt @@ -249,7 +249,9 @@ else() include(External_otb) endif() -if(GENERATE_PACKAGE) +option(GENERATE_PACKAGE "Generate OTB package" ON) +option(GENERATE_XDK "Generate XDK for OTB development" OFF) +if(GENERATE_PACKAGE OR GENERATE_XDK) if(UNIX) add_subdirectory(Packaging) endif() diff --git a/SuperBuild/Packaging/CMakeLists.txt b/SuperBuild/Packaging/CMakeLists.txt index a3da1bab88..3e5863808c 100644 --- a/SuperBuild/Packaging/CMakeLists.txt +++ b/SuperBuild/Packaging/CMakeLists.txt @@ -15,9 +15,6 @@ if(PROJECT_NAME STREQUAL "OTBPackaging") set(OUT_OF_SOURCE_BUILD TRUE) endif() -option(GENERATE_PACKAGE "Generate OTB package" ON) -option(GENERATE_XDK "Generate XDK for OTB development" OFF) - if(NOT GENERATE_PACKAGE AND NOT GENERATE_XDK) #well. we don't have any businees here. Let's move on.. return() -- GitLab