Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix a bad merge that reverted draco's published version number. #1061

Merged
merged 1 commit into from
May 11, 2021
Merged

Fix a bad merge that reverted draco's published version number. #1061

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ string(CONCAT ddesc "An object-oriented component library supporting radiation t
project(
Draco
DESCRIPTION ${ddesc}
VERSION 7.9
VERSION 7.10
LANGUAGES CXX C)

# Export compile commands for compiler tools
Expand Down
5 changes: 4 additions & 1 deletion config/platform_checks.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@ function(dbs_set_sitename)
if(${SITENAME} MATCHES "ba")
set(SITENAME "Badger")
set(SITENAME_FAMILY "CTS-1")
elseif(${SITENAME} MATCHES "cp-rfe" OR ${SITENAME} MATCHES "cp-login")
elseif(
${SITENAME} MATCHES "cp-rfe"
OR ${SITENAME} MATCHES "cp-login"
OR ${SITENAME} MATCHES "cp-rlogin")
set(SITENAME "Capulin")
set(SITENAME_FAMILY "IC-ARM")
elseif(${SITENAME} MATCHES "ccscs[0-9]+")
Expand Down
9 changes: 4 additions & 5 deletions config/unix-xl.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,10 @@ if(NOT CXX_FLAGS_INITIALIZED)
string(
CONCAT CMAKE_CXX_COMPILER_CONFIG_FILE
"/projects/opt/ppc64le/ibm/xlc-${xlc_version}/xlC/${xlc_version_3}/etc/xlc.cfg.rhel."
"${redhat_version}.gcc.${gcc_version}.cuda.${cuda_version}"
CACHE
FILEPATH
"XL config file"
FORCE)
"${redhat_version}.gcc.${gcc_version}.cuda.${cuda_version}")
set(CMAKE_CXX_COMPILER_CONFIG_FILE
${CMAKE_CXX_COMPILER_CONFIG_FILE}
CACHE FILEPATH "XL config file" FORCE)
if(EXISTS ${CMAKE_CXX_COMPILER_CONFIG_FILE})
string(APPEND CMAKE_C_FLAGS " -F${CMAKE_CXX_COMPILER_CONFIG_FILE}")
else()
Expand Down
2 changes: 1 addition & 1 deletion environment/bashrc/.bashrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ if [[ ${INTERACTIVE} == true ]]; then
source "${DRACO_ENV_DIR}/bashrc/.bashrc_rfta" ;;

# capulin, thunder, trinitite (tt-rfe) | trinity (tr-fe)
cp-rfe* | th-login* |tt-fey* | tt-rfe* | tt-login* | tr-fe* | tr-login* | nid* )
cp-rfe* | cp-rlogin* | th-login* |tt-fey* | tt-rfe* | tt-login* | tr-fe* | tr-login* | nid* )
# shellcheck source=/dev/null
source "${DRACO_ENV_DIR}/bashrc/.bashrc_cray" ;;

Expand Down
4 changes: 2 additions & 2 deletions src/c4/ftest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ if(NOT TARGET Lib_dsxx)

# CAFS setup unique to this directory.
#
# 1. create import targets that we will link against.
# Create import targets that we will link against.
if(NOT fc4_BINARY_DIR)
set(fc4_BINARY_DIR "${draco_BINARY_DIR}/src/c4/fc4")
endif()
cafs_create_imported_targets(Lib_c4_fc4 "librtt_fc4" "${fc4_BINARY_DIR}" CXX)

# 1. Vendor discovery is not needed for this package
# Vendor discovery is not needed for this package
#
# setupVendorLibraries()
endif()
Expand Down