core
/
eccodes
mirror of https://github.com/ecmwf/eccodes.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename the cmake macro

This commit is contained in:
Shahram Najm 2015-10-21 17:31:19 +01:00
parent a37d886e3e
commit adc18b69b6
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -289,7 +289,7 @@ if( NOT PROJECT_NAME STREQUAL CMAKE_PROJECT_NAME )
set( ECCODES_SAMPLES_PATH ${ECCODES_SAMPLES_PATH} PARENT_SCOPE ) set( ECCODES_SAMPLES_PATH ${ECCODES_SAMPLES_PATH} PARENT_SCOPE )
set( ECCODES_IFS_SAMPLES_PATH ${ECCODES_IFS_SAMPLES_PATH} PARENT_SCOPE ) set( ECCODES_IFS_SAMPLES_PATH ${ECCODES_IFS_SAMPLES_PATH} PARENT_SCOPE )
set( ECCODES_DEFINITION_PATH ${ECCODES_DEFINITION_PATH} PARENT_SCOPE ) set( ECCODES_DEFINITION_PATH ${ECCODES_DEFINITION_PATH} PARENT_SCOPE )
set( ECCODES_INSTALL_ECMWF_TOOLS ${ECCODES_INSTALL_ECMWF_TOOLS} PARENT_SCOPE ) set( ECCODES_INSTALL_EXTRA_TOOLS ${ECCODES_INSTALL_EXTRA_TOOLS} PARENT_SCOPE )
endif() endif()
# pkg-config # pkg-config
@ -320,7 +320,6 @@ ecbuild_install_project( NAME ${CMAKE_PROJECT_NAME} )
ecbuild_print_summary() ecbuild_print_summary()
message("")
message("") message("")
message(" +---------------------------+") message(" +---------------------------+")
message(" | Configuration completed |") message(" | Configuration completed |")

2
tests/CMakeLists.txt
View File

@ -98,7 +98,7 @@ foreach( test ${tests1} )
endforeach() endforeach()
ecbuild_add_test( TARGET eccodes_t_check_gaussian_grids ecbuild_add_test( TARGET eccodes_t_check_gaussian_grids
TYPE SCRIPT TYPE SCRIPT
CONDITION ECCODES_INSTALL_ECMWF_TOOLS CONDITION ECCODES_INSTALL_EXTRA_TOOLS
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/check_gaussian_grids.sh COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/check_gaussian_grids.sh
) )

8
tools/CMakeLists.txt
View File

@ -34,11 +34,11 @@ foreach( tool ${grib_tools_bins} )
endforeach() endforeach()
# Install tools specific to ECMWF # Install tools specific to ECMWF
# User must run cmake with -DECCODES_INSTALL_ECMWF_TOOLS # User must run cmake with -DECCODES_INSTALL_EXTRA_TOOLS
foreach( tool ${grib_tools_bins_ECMWF_ONLY} ) foreach( tool ${grib_tools_bins_ECMWF_ONLY} )
ecbuild_add_executable( TARGET ${tool} ecbuild_add_executable( TARGET ${tool}
SOURCES ${tool}.c SOURCES ${tool}.c
CONDITION ECCODES_INSTALL_ECMWF_TOOLS CONDITION ECCODES_INSTALL_EXTRA_TOOLS
LIBS grib_tools ) LIBS grib_tools )
endforeach() endforeach()
@ -59,11 +59,11 @@ ecbuild_add_executable( TARGET grib_to_netcdf
# grib_list_keys # grib_list_keys
ecbuild_add_executable( TARGET grib_list_keys ecbuild_add_executable( TARGET grib_list_keys
SOURCES list_keys.c SOURCES list_keys.c
CONDITION ECCODES_INSTALL_ECMWF_TOOLS CONDITION ECCODES_INSTALL_EXTRA_TOOLS
LIBS grib_tools ) LIBS grib_tools )
# grib1to2 script needs to be generated before installation # grib1to2 script needs to be generated before installation
if (ECCODES_INSTALL_ECMWF_TOOLS) if (ECCODES_INSTALL_EXTRA_TOOLS)
configure_file( grib1to2.in grib1to2 ) configure_file( grib1to2.in grib1to2 )
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/grib1to2 install( FILES ${CMAKE_CURRENT_BINARY_DIR}/grib1to2
DESTINATION ${INSTALL_BIN_DIR} DESTINATION ${INSTALL_BIN_DIR}