From 43fc1118aaf474f5a3571d17e3c52ce26d5b04a0 Mon Sep 17 00:00:00 2001 From: Tiago Quintino Date: Wed, 6 Sep 2017 11:12:48 +0100 Subject: [PATCH] ECC-540: MEMFS by default does not trigger installation of samples and definitions --- CMakeLists.txt | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f07ccdb55..254b0b4a5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,18 +39,6 @@ ecbuild_add_option( FEATURE EXAMPLES DEFAULT ON ) -# controls installation of files in definitions/ -- note that it still creates the symlinks in the build dir -ecbuild_add_option( FEATURE INSTALL_ECCODES_DEFINITIONS - DESCRIPTION "Install the ecCodes definitions" - DEFAULT ON -) - -# controls installation of files in samples/ and ifs_samples/ -- note that it still creates the symlinks in the build dir -ecbuild_add_option( FEATURE INSTALL_ECCODES_SAMPLES - DESCRIPTION "Install the ecCodes samples, including IFS samples" - DEFAULT ON -) - ecbuild_add_option( FEATURE JPG DESCRIPTION "Support for JPG decoding/encoding" DEFAULT ON @@ -116,6 +104,21 @@ ecbuild_add_option( FEATURE MEMFS # ecbuild_warn("MEMFS not supported with Cray C compiler") #endif() + +# controls installation of files in definitions/ -- note that it still creates the symlinks in the build dir +# by default, if memfs is available, then we don't need to install definitions +ecbuild_add_option( FEATURE INSTALL_ECCODES_DEFINITIONS + DESCRIPTION "Install the ecCodes definitions" + DEFAULT ${HAVE_MEMFS} +) + +# controls installation of files in samples/ and ifs_samples/ -- note that it still creates the symlinks in the build dir +# by default, if memfs is available, then we don't need to install samples +ecbuild_add_option( FEATURE INSTALL_ECCODES_SAMPLES + DESCRIPTION "Install the ecCodes samples, including IFS samples" + DEFAULT ${HAVE_MEMFS} +) + # advanced options (not visible in cmake-gui ) ecbuild_add_option( FEATURE MEMORY_MANAGEMENT DESCRIPTION "Enable memory management" DEFAULT OFF ADVANCED )