Skip to content

Commit

Permalink
Stop populating the SIERRA/ dir with configured headers
Browse files Browse the repository at this point in the history
After fixing fixing an misspelled TriBITS argument, this was again populating
the SIERRA/ directory with configured headers.  The current SIERRA Trilinos
integration process does not use this anymore so there is no reason to keep
populating these headers.  Therefore, this has been commented out (and the
misspelling was fixed).

This was triggered by change in TriBITSPub/TriBITS#200 for catching unparsed
arguments.
  • Loading branch information
bartlettroscoe committed Sep 6, 2017
1 parent 5245e6c commit 75efa41
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions cmake/TrilinosCreateClientTemplateHeaders.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,17 @@ FUNCTION(TRILINOS_CREATE_CLIENT_TEMPLATE_HEADERS BASE_DIR)
)

IF (NOT PARSE_NOSIERRABJAM)
SET(ADDITIONIAL_OUTPUT_DIRS_ARG
ADDITIONIAL_OUTPUT_DIRS
"${${PROJECT_NAME}_SOURCE_DIR}/SIERRA/bjam/config_headers")
# NOTE: The SIERRA integration system no longer uses this functionality to
# install configured headers into a SIERRA/ directory. Therefore, I am
# commenting this out.
#SET(ADDITIONAL_OUTPUT_DIRS_ARG
# ADDITIONAL_OUTPUT_DIRS
# "${${PROJECT_NAME}_SOURCE_DIR}/SIERRA/bjam/config_headers")
ELSE()
SET(ADDITIONIAL_OUTPUT_DIRS_ARG)
SET(ADDITIONAL_OUTPUT_DIRS_ARG)
ENDIF()

TRIBITS_CREATE_CLIENT_TEMPLATE_HEADERS(${BASE_DIR} ${ADDITIONIAL_OUTPUT_DIRS_ARG})
TRIBITS_CREATE_CLIENT_TEMPLATE_HEADERS(${BASE_DIR} ${ADDITIONAL_OUTPUT_DIRS_ARG})

ENDFUNCTION()

0 comments on commit 75efa41

Please sign in to comment.