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

CMake style

This commit is contained in:
Shahram Najm 2020-03-26 14:21:56 +00:00
parent 56ad3dbe72
commit a8e29e46d2
4 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/CMakeLists.txt
View File

@ -21,7 +21,7 @@ if( ENABLE_EXTRA_TESTS )
endif() endif()
# Copy other files - e.g. reference data, text files etc from the source data dir # Copy other files - e.g. reference data, text files etc from the source data dir
LIST(APPEND other_files list(APPEND other_files
60_model_levels 60_model_levels
bitmap.diff bitmap.diff
ieee_test.good ieee_test.good

2
definitions/CMakeLists.txt
View File

@ -24,7 +24,6 @@ foreach( child ${children} )
endforeach() endforeach()
if( HAVE_INSTALL_ECCODES_DEFINITIONS ) if( HAVE_INSTALL_ECCODES_DEFINITIONS )
install( FILES ${definition_files} ${table_files} ${text_files} install( FILES ${definition_files} ${table_files} ${text_files}
DESTINATION ${ECCODES_DEFINITION_SUFF} DESTINATION ${ECCODES_DEFINITION_SUFF}
PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ ) PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ )
@ -41,7 +40,6 @@ if(HAVE_INSTALL_ECCODES_DEFINITIONS)
PATTERN "*.table" PATTERN "*.table"
PATTERN "4.2.192.*.table" EXCLUDE PATTERN "4.2.192.*.table" EXCLUDE
PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ ) PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ )
endif() endif()
# link to the definitions. See GRIB-786 # link to the definitions. See GRIB-786

3
fortran/CMakeLists.txt
View File

@ -58,8 +58,7 @@ if( HAVE_FORTRAN )
add_custom_command( TARGET eccodes_f90 POST_BUILD add_custom_command( TARGET eccodes_f90 POST_BUILD
COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/include COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/include
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_Fortran_MODULE_DIRECTORY}/${CMAKE_CFG_INTDIR}/eccodes.mod ${CMAKE_BINARY_DIR}/include COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_Fortran_MODULE_DIRECTORY}/${CMAKE_CFG_INTDIR}/eccodes.mod ${CMAKE_BINARY_DIR}/include
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_Fortran_MODULE_DIRECTORY}/${CMAKE_CFG_INTDIR}/grib_api.mod ${CMAKE_BINARY_DIR}/include COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_Fortran_MODULE_DIRECTORY}/${CMAKE_CFG_INTDIR}/grib_api.mod ${CMAKE_BINARY_DIR}/include )
)
# 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" )

3
memfs/CMakeLists.txt
View File

@ -14,7 +14,8 @@ add_custom_command(
${CMAKE_CURRENT_BINARY_DIR}/memfs.c ${CMAKE_CURRENT_BINARY_DIR}/memfs.c
DEPENDS ${PROJECT_SOURCE_DIR}/memfs.py) DEPENDS ${PROJECT_SOURCE_DIR}/memfs.py)
set_source_files_properties( ${CMAKE_CURRENT_BINARY_DIR}/memfs.c PROPERTIES OBJECT_DEPENDS set_source_files_properties(
${CMAKE_CURRENT_BINARY_DIR}/memfs.c PROPERTIES OBJECT_DEPENDS
"${PROJECT_SOURCE_DIR}/memfs.py" "${PROJECT_SOURCE_DIR}/memfs.py"
# "${PROJECT_SOURCE_DIR}/memfs.py" ${definition_files}" # "${PROJECT_SOURCE_DIR}/memfs.py" ${definition_files}"
) )