Skip to content

Commit 5a1d322

Browse files
authored
Merge pull request #1682 from DARMA-tasking/1679-release-1-1-1-beta-7
1679: Create `1.1.1 beta v7` release candidate
2 parents 2ac948c + 8bfefd2 commit 5a1d322

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+1393
-873
lines changed

.clang-format

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ FixNamespaceComments: true
6060
IncludeBlocks: Preserve
6161
IndentCaseLabels: false
6262
IndentGotoLabels: false
63-
IndentPPDirectives: BeforeHash
63+
IndentPPDirectives: PPDIS_None
6464
IndentWidth: 2
6565
IndentWrappedFunctionNames: false
6666
KeepEmptyLinesAtTheStartOfBlocks: false

CMakeLists.txt

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
cmake_minimum_required(VERSION 3.17 FATAL_ERROR)
2-
project(vt VERSION 1.1.0)
2+
3+
file(READ "VERSION" _vt_version_str)
4+
string(STRIP "${_vt_version_str}" _vt_version_str)
5+
project(vt VERSION ${_vt_version_str})
36

47
# To generate output file with compilation errors and warnings
58
# CMake generator needs to be known
@@ -64,8 +67,6 @@ include(cmake/link_vt.cmake)
6467
# Load packages that are required for core VT build
6568
include(cmake/load_packages.cmake)
6669

67-
include(cmake/build_git_info.cmake)
68-
6970
include(cmake/check_compiler.cmake)
7071

7172
option(vt_gold_linker_enabled "Build VT using the `gold' linker" ON)

cmake-modules/GetGitRevisionDescription.cmake

-166
This file was deleted.

cmake-modules/GetGitRevisionDescription.cmake.in

-41
This file was deleted.

cmake/build_git_info.cmake

+43-31
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,46 @@
1+
find_package(Git REQUIRED)
12

2-
include(GetGitRevisionDescription)
3+
set(GIT_DIR)
4+
set(HEAD_FILE)
5+
execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --git-dir
6+
WORKING_DIRECTORY
7+
"${PROJECT_BASE_DIR}"
8+
RESULT_VARIABLE
9+
res
10+
OUTPUT_VARIABLE
11+
REL_GIT_DIR
12+
OUTPUT_STRIP_TRAILING_WHITESPACE)
13+
if (NOT res EQUAL 0)
14+
message(STATUS "git invocation failed, git info cannot be obtained")
15+
else()
16+
get_filename_component(GIT_DIR ${REL_GIT_DIR} ABSOLUTE BASE_DIR ${PROJECT_BASE_DIR})
17+
message(STATUS "Git DIR: ${GIT_DIR}")
18+
if (NOT GIT_DIR)
19+
message(STATUS "no git directory present")
20+
else()
21+
if(NOT EXISTS "${GIT_DIR}/HEAD")
22+
message(STATUS "no such file: \"${GIT_DIR}/HEAD\"")
23+
else()
24+
set(HEAD_FILE "${GIT_DIR}/HEAD")
25+
message(STATUS "Git HEAD file: \"${HEAD_FILE}\"")
26+
endif()
27+
endif()
28+
endif()
329

4-
get_git_head_revision(GIT_REFSPEC GIT_SHA1)
30+
set(VT_GIT_CONFIG_FILE "${PROJECT_BIN_DIR}/src/vt/configs/generated/vt_git_revision.cc")
31+
add_custom_command(
32+
OUTPUT ${VT_GIT_CONFIG_FILE}
33+
COMMAND ${CMAKE_COMMAND}
34+
-DIN_FILE=${PROJECT_BASE_DIR}/vt_git_revision.cc.in
35+
-DOUT_FILE=${VT_GIT_CONFIG_FILE}
36+
-DGIT_EXECUTABLE=${GIT_EXECUTABLE}
37+
-DGIT_DIR=${GIT_DIR}
38+
-DHEAD_FILE=${HEAD_FILE}
39+
-DPROJECT_VERSION_MAJOR=${PROJECT_VERSION_MAJOR}
40+
-DPROJECT_VERSION_MINOR=${PROJECT_VERSION_MINOR}
41+
-DPROJECT_VERSION_PATCH=${PROJECT_VERSION_PATCH}
42+
-P ${CMAKE_CURRENT_LIST_DIR}/run-git.cmake
43+
DEPENDS ${GIT_DIR}
44+
)
545

6-
# set some variables related to GIT state information
7-
get_git_head_revision(GIT_REFSPEC GIT_SHA1)
8-
git_describe(GIT_EXACT_TAG --tags --abbrev=0 --all)
9-
git_describe(GIT_DESCRIPTION --abbrev=10 --always --tags --long --all)
10-
git_local_changes(GIT_CLEAN_STATUS)
11-
12-
message(STATUS "REF:${GIT_REFSPEC}")
13-
message(STATUS "REF:${GIT_SHA1}")
14-
message(STATUS "REF:${GIT_DESCRIPTION}")
15-
message(STATUS "REF:${GIT_CLEAN_STATUS}")
16-
message(STATUS "REF:${GIT_EXACT_TAG}")
17-
18-
configure_file(
19-
${PROJECT_BASE_DIR}/vt_git_revision.cc.in
20-
${PROJECT_BIN_DIR}/src/vt/configs/generated/vt_git_revision.cc
21-
@ONLY
22-
)
23-
24-
# install(
25-
# FILES "${PROJECT_BINARY_DIR}/${cur_build_type}/cmake_config.h"
26-
# DESTINATION include
27-
# CONFIGURATIONS ${cur_build_type}
28-
# )
29-
30-
# configure_file(
31-
# "${PROJECT_SOURCE_DIR}/vt_git_revision.cc.in"
32-
# "${CMAKE_CURRENT_BINARY_DIR}/vt_git_revision.cc"
33-
# @ONLY
34-
# )
46+
target_sources(${VIRTUAL_TRANSPORT_LIBRARY} PRIVATE ${VT_GIT_CONFIG_FILE})

cmake/load_doxygen.cmake

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ if (${vt_doxygen_enabled})
1010
set(doxygen_out ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
1111

1212
set(DOXYGEN_PROJECT_NAME "vt")
13-
set(VERSION_MAJOR "1")
14-
set(VERSION_MINOR "0")
15-
set(VERSION_PATCH "0")
13+
set(VERSION_MAJOR "${PROJECT_VERSION_MAJOR}")
14+
set(VERSION_MINOR "${PROJECT_VERSION_MINOR}")
15+
set(VERSION_PATCH "${PROJECT_VERSION_PATCH}")
1616
set(DOXYGEN_INPUT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/")
1717
set(DOXYGEN_CHECKPOINT_SHARED_DOCS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/lib/checkpoint/docs/shared")
1818
set(DOXYGEN_CHECKPOINT_EXAMPLE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/lib/checkpoint/examples")

0 commit comments

Comments
 (0)