Changeset 19541


Ignore:
Timestamp:
09/04/15 12:16:49 (10 years ago)
Author:
schlegel
Message:

CHG: revert dakota dev patch

Location:
issm/trunk-jpl/externalpackages/dakota
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/externalpackages/dakota/configs/6.1/BuildDakotaCustom.cmake.mac.patch

    r19532 r19541  
    1164,65c64,65
    2 < #set( DAKOTA_HAVE MPI ON
     2< #set( DAKOTA_HAVE_MPI ON
    33< #     CACHE BOOL "Build with MPI enabled" FORCE)
    44---
    5 > set( DAKOTA_HAVE MPI OFF
     5> set( DAKOTA_HAVE_MPI OFF
    66>      CACHE BOOL "Build with MPI disabled" FORCE)
    7791,93c91,93

  • issm/trunk-jpl/externalpackages/dakota/configs/6.1/BuildDakotaCustom.cmake.patch

    r19539 r19541  
    1164,65c64,65
    2 < #set( DAKOTA_HAVE MPI ON
     2< #set( DAKOTA_HAVE_MPI ON
    33< #     CACHE BOOL "Build with MPI enabled" FORCE)
    44---
    5 > set( DAKOTA_HAVE MPI OFF
     5> set( DAKOTA_HAVE_MPI OFF
    66>      CACHE BOOL "Build with MPI disabled" FORCE)
    7773,77c73,77

  • issm/trunk-jpl/externalpackages/dakota/install-6.1-linux64.sh

    r19540 r19541  
    2424cp $DAK_SRC/cmake/BuildDakotaTemplate.cmake $DAK_SRC/cmake/BuildDakotaCustom.cmake
    2525patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/6.1/BuildDakotaCustom.cmake.patch
    26 #patch $DAK_SRC/cmake/DakotaDev.cmake configs/6.1/DakotaDev.cmake.patch
     26patch $DAK_SRC/cmake/DakotaDev.cmake configs/6.1/DakotaDev.cmake.patch
    2727#patch $DAK_SRC/CMakeLists.txt configs/6.1/CMakeLists.txt.patch
    2828

  • issm/trunk-jpl/externalpackages/dakota/install-6.1-macosx64-yosemite.sh

    r19540 r19541  
    2424cp $DAK_SRC/cmake/BuildDakotaTemplate.cmake $DAK_SRC/cmake/BuildDakotaCustom.cmake
    2525patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/6.1/BuildDakotaCustom.cmake.patch
    26 #patch $DAK_SRC/cmake/DakotaDev.cmake configs/6.1/DakotaDev.cmake.patch
     26patch $DAK_SRC/cmake/DakotaDev.cmake configs/6.1/DakotaDev.cmake.patch
    2727patch $DAK_SRC/CMakeLists.txt configs/6.1/CMakeLists.txt.patch
    2828

  • issm/trunk-jpl/externalpackages/dakota/install-6.1-macosx64.sh

    r19540 r19541  
    2424cp $DAK_SRC/cmake/BuildDakotaTemplate.cmake $DAK_SRC/cmake/BuildDakotaCustom.cmake
    2525patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/6.1/BuildDakotaCustom.cmake.mac.patch
    26 #patch $DAK_SRC/cmake/DakotaDev.cmake configs/6.1/DakotaDev.cmake.patch
     26patch $DAK_SRC/cmake/DakotaDev.cmake configs/6.1/DakotaDev.cmake.patch
    2727patch $DAK_SRC/CMakeLists.txt configs/6.1/CMakeLists.txt.patch
    2828
Note: See TracChangeset for help on using the changeset viewer.