Context Navigation

← Previous Change
Next Change →

Changeset 22758 for issm/trunk/externalpackages/dakota/configs/6.2/BuildDakotaCustom.cmake.patch

Timestamp:

05/10/18 10:24:27 (7 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 22757

Location:

Files:

: 3 edited

. (modified) (1 prop)
externalpackages (modified) (1 prop)
externalpackages/dakota/configs/6.2/BuildDakotaCustom.cmake.patch (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed

issm/trunk

Property svn:mergeinfo changed

/issm/trunk-jpl

merged: 21730-21731,21736-21753,21755,21760,21762-21960,21962-21970,21974-22017,22019,22021-22022,22024-22028,22031,22033,22035-22037,22039-22081,22096-22105,22107,22109-22110,22116-22117,22122-22138,22141-22142,22145-22154,22158,22173-22178,22181,22183-22204,22207,22210-22216,22236-22243,22249-22480,22482-22493,22495-22621,22623-22649,22652-22754

issm/trunk/externalpackages

Property svn:ignore

old	new
18	18	Makefile
19	19	CMakeFiles
	20	matlab
	21	svn-commit.tmp

issm/trunk/externalpackages/dakota/configs/6.2/BuildDakotaCustom.cmake.patch

-              r20500
+              r22758
 a68,75
+a68,78
 > set( DAKOTA_HAVE_MPI ON
 >  CACHE BOOL "Always build with MPI enabled" FORCE)
 …
 >  "$ENV{ISSM_DIR}/externalpackages/mpich/install/lib/libmpich.so"
 >  CACHE FILEPATH "Use installed MPI library" FORCE)
+> set( MPI_EXTRA_LIBRARY
+>  "$ENV{ISSM_DIR}/externalpackages/mpich/install/lib/libmpich.so"
+>       CACHE FILEPATH "Use MPI extra libraries" FORCE)
 ,77c73,77
 < #set(BOOST_ROOT

Note: See TracChangeset for help on using the changeset viewer.

Download in other formats: