Skip to content

Commit

Permalink
Create single file MpiReleaseDebugSharedPtPthreads.cmake read in with…
Browse files Browse the repository at this point in the history
… -C (#2462)

Now this makes it stupid easy to reproduce this particular build.  You just
do:

  source <trilinos-base-dir>/cmake/load_sems_dev_env.sh
  cmake -C <trilinos-base-dir>/cmake/std/MpiReleaseDebugSharedPtPthreads.cmake \
    -DTrilinos_ENABLE_TESTS=ON -DTrilinos_ENABLE_<PACKAGE>=ON \
    <trilinos-base-dir>
  • Loading branch information
bartlettroscoe committed Apr 20, 2018
1 parent 82477db commit ec01280
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ SET(Trilinos_BRANCH develop)
SET(EXTRA_EXCLUDE_PACKAGES)

SET( EXTRA_CONFIGURE_OPTIONS
"-DTrilinos_CONFIGURE_OPTIONS_FILE:STRING=cmake/std/MpiReleaseDebugSharedPtSettings.cmake,cmake/std/BasicCiTestingSettings.cmake,cmake/std/sems/SEMSDevEnv.cmake"
"-DTrilinos_CONFIGURE_OPTIONS_FILE:STRING=cmake/std/MpiReleaseDebugSharedPtPthreads.cmake"
"-DTrilinos_TEST_CATEGORIES=BASIC"
"-DTrilinos_ENABLE_CONFIGURE_TIMING=ON"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ SET(Trilinos_BRANCH develop)
SET(EXTRA_EXCLUDE_PACKAGES)

SET( EXTRA_CONFIGURE_OPTIONS
"-DTrilinos_CONFIGURE_OPTIONS_FILE:STRING=cmake/std/MpiReleaseDebugSharedPtSettings.cmake,cmake/std/BasicCiTestingSettings.cmake,cmake/std/sems/SEMSDevEnv.cmake"
"-DTrilinos_CONFIGURE_OPTIONS_FILE:STRING=cmake/std/MpiReleaseDebugSharedPtPthreads.cmake"
"-DTrilinos_TEST_CATEGORIES=BASIC"
"-DTrilinos_ENABLE_CONFIGURE_TIMING=ON"
)
Expand Down
21 changes: 21 additions & 0 deletions cmake/std/MpiReleaseDebugSharedPtPthreads.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# This file can be read in using either:
#
# -C <abs-path>/<file-name>.cmake
#
# or:
#
# -DTrilinos_CONFIGURE_OPTIONS_FILE:STRING=cmake/std/<file-name>.cmake
#

# Handle this being passed in with -C option instead of
# <Project>_CONFIGURE_OPTIONS_FILE.
IF ("${PROJECT_NAME}" STREQUAL "")
SET(PROJECT_NAME Trilinos)
INCLUDE("${CMAKE_CURRENT_LIST_DIR}/../tribits/core/utils/AssertDefined.cmake")
ENDIF()

# NOTE: The order of these includes matters!

include("${CMAKE_CURRENT_LIST_DIR}/MpiReleaseDebugSharedPtSettings.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/BasicCiTestingSettings.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/sems/SEMSDevEnv.cmake")
16 changes: 1 addition & 15 deletions project-checkin-test-config.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@

# Default options that are common to all builds.
'common': [
# Shared libs safes a ton of disk space and catches more errors
# than static builds.
'-DBUILD_SHARED_LIBS=ON',
# For graceful disables, we want to turn this on.
'-DTrilinos_DISABLE_ENABLED_FORWARD_DEP_PACKAGES=ON',
],
Expand All @@ -35,20 +32,9 @@
'default-builds': [

('MPI_RELEASE_DEBUG_SHARED_PT', [
'-DTrilinos_CONFIGURE_OPTIONS_FILE:STRING=cmake/std/MpiReleaseDebugSharedPtSettings.cmake,cmake/std/BasicCiTestingSettings.cmake,cmake/std/sems/SEMSDevEnv.cmake',
'-DTrilinos_CONFIGURE_OPTIONS_FILE:STRING=cmake/std/MpiReleaseDebugSharedPtPthreads.cmake',
]),

## Options for the SERIAL_RELEASE build.
#('SERIAL_RELEASE_SHARED', [
# '-DTPL_ENABLE_MPI:BOOL=OFF',
# '-DCMAKE_BUILD_TYPE:STRING=RELEASE',
# '-DTrilinos_ENABLE_DEBUG:BOOL=OFF',
# '-DBUILD_SHARED_LIBS=ON',
# '-DTrilinos_ENABLE_EXPLICIT_INSTANTIATION:BOOL=OFF',
# ]),
# ToDo: Should we define serial builds to allow developers to run
# them if they want?

], # default-builds

}, # cmake
Expand Down

0 comments on commit ec01280

Please sign in to comment.