Skip to content

Commit 75539df

Browse files
MircoValentiniECMWFdsarmany
authored andcommitted
Rename "OUTPUT_MANAGER" to "MULTIO_OUTPUT_MANAGER"
Also, disabled gfortran build of MultIOM until build times improve
1 parent 35dbf13 commit 75539df

File tree

4 files changed

+11
-8
lines changed

4 files changed

+11
-8
lines changed

Diff for: CMakeLists.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -98,17 +98,17 @@ ecbuild_add_option( FEATURE HEALPIX_EXAMPLES
9898

9999

100100
### Definitions used by the output manager
101-
ecbuild_add_option( FEATURE OUTPUT_MANAGER
101+
ecbuild_add_option( FEATURE MULTIO_OUTPUT_MANAGER
102102
DEFAULT ON
103103
DESCRIPTION "Build the output manager" )
104104

105105
ecbuild_add_option( FEATURE OUTPUT_MANAGER_ENCODER_REPORT
106-
CONDITION HAVE_OUTPUT_MANAGER
107-
DEFAULT OFF
106+
CONDITION HAVE_MULTIO_OUTPUT_MANAGER
107+
DEFAULT OFF
108108
DESCRIPTION "Enable generation of the encoding report" )
109109

110110
ecbuild_add_option( FEATURE OUTPUT_MANAGER_TOOL
111-
CONDITION HAVE_OUTPUT_MANAGER
111+
CONDITION HAVE_MULTIO_OUTPUT_MANAGER
112112
DEFAULT OFF
113113
DESCRIPTION "Enable generation of standalone tool" )
114114

Diff for: src/CMakeLists.txt

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
add_subdirectory( multio )
22

3-
# if(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
3+
if (NOT CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
4+
message(STATUS "Building multiom")
45
add_subdirectory( multiom )
5-
# endif()
6+
else ()
7+
message(WARNING "Skipping multiom because the GNU Fortran compiler is too slow.")
8+
endif()

Diff for: src/multiom/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
if ( HAVE_OUTPUT_MANAGER )
1+
if ( HAVE_MULTIO_OUTPUT_MANAGER )
22

33
# Update on new big features
44
set(OUTPUT_MANAGER_MAJOR 0)

Diff for: src/multiom/include/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
if ( HAVE_OUTPUT_MANAGER )
1+
if ( HAVE_MULTIO_OUTPUT_MANAGER )
22

33
# Update on new big features
44
set(OUTPUT_MANAGER_MAJOR 0)

0 commit comments

Comments
 (0)