Skip to content

Commit

Permalink
Merge Pull Request #7109 from bartlettroscoe/Trilinos/7094-cts1-gnu-m…
Browse files Browse the repository at this point in the history 
…ake-files

Automatically Merged using Trilinos Pull Request AutoTester
PR Title: cts1, tlcc2: Switch from Ninja to Unix Makefiles (#7094, ATDV-328)
PR Author: bartlettroscoe
  • Loading branch information
@trilinos-autotester
trilinos-autotester authored Apr 2, 2020
2 parents 779032e + b667742 commit 055011d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion cmake/std/atdm/common/toss3/environment_new.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
echo "Using $ATDM_CONFIG_SYSTEM_NAME toss3 compiler stack $ATDM_CONFIG_COMPILER to build $ATDM_CONFIG_BUILD_TYPE code with Kokkos node type $ATDM_CONFIG_NODE_TYPE"

export ATDM_CONFIG_ENABLE_SPARC_SETTINGS=ON
export ATDM_CONFIG_USE_NINJA=ON
export ATDM_CONFIG_USE_NINJA=OFF
export ATDM_CONFIG_BUILD_COUNT=8
# export ATDM_CONFIG_CMAKE_JOB_POOL_LINK=2
# NOTE: Above, currently setting CMAKE_JOB_POOL_LINK results in a build
Expand Down
2 changes: 1 addition & 1 deletion cmake/std/atdm/common/toss3/environment_tlcc2.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ fi

echo "Using toss3 compiler stack $ATDM_CONFIG_COMPILER to build $ATDM_CONFIG_BUILD_TYPE code with Kokkos node type $ATDM_CONFIG_NODE_TYPE"

export ATDM_CONFIG_USE_NINJA=ON
export ATDM_CONFIG_USE_NINJA=OFF
export ATDM_CONFIG_BUILD_COUNT=8
# export ATDM_CONFIG_CMAKE_JOB_POOL_LINK=2
# NOTE: Above, currently setting CMAKE_JOB_POOL_LINK results in a build
Expand Down

0 comments on commit 055011d

Please sign in to comment.