many general improvements

ecmwf · Aug 11, 2024 · b3c08eb · b3c08eb
1 parent 2b21f4b
commit b3c08eb
Show file tree

Hide file tree

Showing 61 changed files with 958 additions and 659 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -107,7 +107,7 @@ ecbuild_add_option( FEATURE OUTPUT_MANAGER
 
 ecbuild_add_option( FEATURE OUTPUT_MANAGER_ENCODER_REPORT
                     CONDITION HAVE_OUTPUT_MANAGER
-		    DEFAULT ON
+		    DEFAULT OFF
                     DESCRIPTION "Enable generation of the encoding report" )
 
 ecbuild_add_option( FEATURE OUTPUT_MANAGER_TOOL
@@ -116,7 +116,6 @@ ecbuild_add_option( FEATURE OUTPUT_MANAGER_TOOL
                     DESCRIPTION "Enable generation of standalone tool" )
 
 ### export package info
-
 set( MULTIO_CONFIG_DIR     share/multio/config )
 set( MULTIO_INCLUDE_DIRS   ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src )
 set( MULTIO_LIBRARIES      multio )

diff --git a/src/ecom/CMakeLists.txt b/src/ecom/CMakeLists.txt
@@ -1,5 +1,8 @@
 if ( HAVE_OUTPUT_MANAGER )
 
+# Install samples in the proper directory
+set( MULTIO_SAMPLE_DIR  share/ecom/samples )
+
 # Update on new big features
 set(OUTPUT_MANAGER_MAJOR 0)
 
@@ -412,6 +415,9 @@ ecbuild_add_executable(
 endif()
 
 
+# Add the samples subdirectory
+add_subdirectory( samples )
+
 #set_target_properties( ecom PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/module/ecom )
 #target_include_directories( ecom PUBLIC $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/module/ecom> )