Skip to content

Commit

Permalink
Merge pull request #2 from GEOS-ESM/feature/mathomp4/makefixes-2019Jul08
Browse files Browse the repository at this point in the history
Install perl script. Update version
  • Loading branch information
bena-nasa authored Jul 8, 2019
2 parents 21beb3e + 9e93c2d commit ae870f4
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ cmake_policy (SET CMP0054 NEW)

project (
MAPL
VERSION 1.1
VERSION 1.1.1
LANGUAGES Fortran CXX C) # Note - CXX is required for ESMF

if (NOT COMMAND esma) # build as standalone project
Expand Down
14 changes: 7 additions & 7 deletions MAPL_Base/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ set (srcs
MAPL_Range.F90
MAPL_Config.F90
MAPL_CFIO.F90
#***DAS***# MAPL_newCFIO.F90
MAPL_IO.F90
MAPL_Comms.F90 MAPL_LocStreamMod.F90 MAPL_Mod.F90
MAPL_Constants.F90 MAPL_Profiler.F90 sort.c
Expand All @@ -34,10 +33,7 @@ set (srcs
MAPL_CapGridComp.F90
MAPL_GridType.F90
MAPL_GridSpec.F90
#***DAS***# MAPL_VerticalMethods.F90
#***DAS***# MAPL_newCFIOitem.F90
MAPL_VerticalInterpMod.F90
#***DAS***# MAPL_ESMFTimeVectorMod.F90 MAPL_TimeMethods.F90 MAPL_ioClients.F90
MAPL_DefGridName.F90
MAPL_DirPath.F90
MAPL_AbstractRegridder.F90 MAPL_IdentityRegridder.F90
Expand Down Expand Up @@ -66,12 +62,9 @@ set (srcs
memuse.c MAPL_MemUtils.F90 MAPL_Hash.F90
MAPL_MaxMinMod.F90 MAPL_SimpleBundleMod.F90
MAPL_OrbGridCompMod.F90 MAPL_NominalOrbitsMod.F90 MAPL_ExtDataGridCompMod.F90
#***DAS***# MAPL_ExtData_IOBundleMod.F90
#***DAS***# MAPL_ExtData_IOBundleVectorMod.F90
MAPL_NewArthParser.F90 MAPL_ShmemMod.F90 MAPL_LoadBalance.F90 MAPL_CFIOServer.F90
CFIOCollection.F90 ESMF_CFIOPtrVectorMod.F90
MAPL_TransposeRegridder.F90 MAPL_GetLatLonCoord.F90 MAPL_EsmfRegridder.F90
#***DAS***# MAPL_NUOPCWrapperMod.F90
)

esma_add_library(${this} SRCS ${srcs} DEPENDENCIES GMAO_pFIO MAPL_cfio_r4)
Expand Down Expand Up @@ -127,4 +120,11 @@ endif ()
install (
DIRECTORY Python
DESTINATION lib
USE_SOURCE_PERMISSIONS
)

install (
PROGRAMS red_ma.pl
DESTINATION bin
)

0 comments on commit ae870f4

Please sign in to comment.