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

Revert eccodes module stuff. Needs to be redone

This commit is contained in:
Shahram Najm 2015-01-08 15:34:11 +00:00
parent 98d595aed1
commit 1d58a25021
1 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
fortran/CMakeLists.txt
View File

@ -39,22 +39,19 @@ if( EC_HAVE_FORTRAN )
LIBS grib_api ) LIBS grib_api )
# Add the eccodes module file as well # Add the eccodes module file as well
set(_eccodes_mod "${CMAKE_Fortran_MODULE_DIRECTORY}/eccodes.mod" ) #set(_eccodes_mod "${CMAKE_Fortran_MODULE_DIRECTORY}/eccodes.mod" )
add_custom_command( #add_custom_command(
OUTPUT ${_eccodes_mod} # OUTPUT ${_eccodes_mod}
WORKING_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY} # WORKING_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}
# #COMMAND ${CMAKE_COMMAND} -E create_symlink "${CMAKE_Fortran_MODULE_DIRECTORY}/grib_api.mod" ${_eccodes_mod}
#COMMAND ${CMAKE_COMMAND} -E create_symlink "${CMAKE_Fortran_MODULE_DIRECTORY}/grib_api.mod" ${_eccodes_mod} # #COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_Fortran_MODULE_DIRECTORY}/grib_api.mod" ${_eccodes_mod}
#COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_Fortran_MODULE_DIRECTORY}/grib_api.mod" ${_eccodes_mod} # COMMAND "/usr/bin/sh" "-c" "if test -f GRIB_API.mod; then ln -s GRIB_API.mod ECCODES.mod; fi"
# COMMAND "/usr/bin/sh" "-c" "if test -f grib_api.mod; then ln -s grib_api.mod eccodes.mod; fi"
COMMAND "/usr/bin/sh" "-c" "if test -f GRIB_API.mod; then ln -s GRIB_API.mod ECCODES.mod; fi" # DEPENDS grib_api_f90
COMMAND "/usr/bin/sh" "-c" "if test -f grib_api.mod; then ln -s grib_api.mod eccodes.mod; fi" # VERBATIM
#)
DEPENDS grib_api_f90 #add_custom_target(add_eccodes_mod ALL DEPENDS ${_eccodes_mod})
VERBATIM
)
add_custom_target(add_eccodes_mod ALL DEPENDS ${_eccodes_mod})
ecbuild_add_resources( TARGET fortran_resources ecbuild_add_resources( TARGET fortran_resources
PACK PACK
@ -66,7 +63,6 @@ if( EC_HAVE_FORTRAN )
### installation ### installation
install( FILES grib_api_f77.h DESTINATION ${INSTALL_INCLUDE_DIR} ) install( FILES grib_api_f77.h DESTINATION ${INSTALL_INCLUDE_DIR} )
@ -80,15 +76,15 @@ if( EC_HAVE_FORTRAN )
# Install the eccodes module file as a copy of the grib api mod file. # Install the eccodes module file as a copy of the grib api mod file.
# Note: the mod filename can be lowercase or uppercase! # Note: the mod filename can be lowercase or uppercase!
# First try the lowercase one. Specify OPTIONAL so if it fails it carries on # First try the lowercase one. Specify OPTIONAL so if it fails it carries on
install( FILES ${CMAKE_Fortran_MODULE_DIRECTORY}/${CMAKE_CFG_INTDIR}/grib_api.mod #install( FILES ${CMAKE_Fortran_MODULE_DIRECTORY}/${CMAKE_CFG_INTDIR}/grib_api.mod
RENAME eccodes.mod # RENAME eccodes.mod
OPTIONAL # OPTIONAL
DESTINATION ${INSTALL_INCLUDE_DIR} ) # DESTINATION ${INSTALL_INCLUDE_DIR} )
# Now try the uppercase mod file # Now try the uppercase mod file
install( FILES ${CMAKE_Fortran_MODULE_DIRECTORY}/${CMAKE_CFG_INTDIR}/GRIB_API.mod #install( FILES ${CMAKE_Fortran_MODULE_DIRECTORY}/${CMAKE_CFG_INTDIR}/GRIB_API.mod
RENAME ECCODES.mod # RENAME ECCODES.mod
OPTIONAL # OPTIONAL
DESTINATION ${INSTALL_INCLUDE_DIR} ) # DESTINATION ${INSTALL_INCLUDE_DIR} )
endif() endif()