Skip to content

Commit

Permalink
Move load_matching_env.sh into subdir (ATDM)
Browse files Browse the repository at this point in the history
This avoids having it sit in the source dir along side the load-env.sh script
so tab completion works better and it moves it out of the base build directory
to avoid confusion (because it is only for the install dir).

I tested this manually and it seems to do exactly what it is supposed to do.
  • Loading branch information
bartlettroscoe committed Mar 21, 2019
1 parent e1b7eee commit 27bd653
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions cmake/std/atdm/ATDMDevEnvSettings.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -430,10 +430,10 @@ IF (COMMAND INSTALL AND NOT "${CMAKE_INSTALL_PREFIX}" STREQUAL "")
CACHE STRING
"Name of env var set to <CMAKE_INSTALL_PREFIX> set in installed script <ATDM_INSTALLED_ENV_LOAD_SCRIPT_NAME>." )

CONFIGURE_FILE( ${CMAKE_CURRENT_LIST_DIR}/load_matching_env.sh.in
${CMAKE_CURRENT_BINARY_DIR}/load_matching_env.sh @ONLY )
CONFIGURE_FILE( ${CMAKE_CURRENT_LIST_DIR}/utils/load_matching_env.sh.in
${CMAKE_CURRENT_BINARY_DIR}/cmake/std/atdm/utils/load_matching_env.sh @ONLY )

INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/load_matching_env.sh
INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/cmake/std/atdm/utils/load_matching_env.sh
DESTINATION ${CMAKE_INSTALL_PREFIX}
RENAME ${ATDM_INSTALLED_ENV_LOAD_SCRIPT_NAME} )

Expand Down
File renamed without changes.

0 comments on commit 27bd653

Please sign in to comment.