Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
5779779
single source of truth for version identifier
ahnaf-tahmid-chowdhury Sep 24, 2024
104dfb0
Follow PyPA compliant
ahnaf-tahmid-chowdhury Sep 27, 2024
cb849ee
move version file to root-level
ahnaf-tahmid-chowdhury Sep 27, 2024
0ce318c
add get_version_info function
ahnaf-tahmid-chowdhury Sep 27, 2024
0eff6a4
Merge remote-tracking branch 'upstream/develop' into version
ahnaf-tahmid-chowdhury Oct 3, 2024
dd6e579
Merge remote-tracking branch 'upstream/develop' into version
ahnaf-tahmid-chowdhury Oct 16, 2024
23b93e3
add export config
ahnaf-tahmid-chowdhury Oct 16, 2024
31e3692
remove version file
ahnaf-tahmid-chowdhury Oct 16, 2024
d6be0ff
Ensure the version string matches a standard format
ahnaf-tahmid-chowdhury Oct 16, 2024
8bc99cd
set fetch depth to zero
ahnaf-tahmid-chowdhury Oct 16, 2024
2eb6c93
Merge branch 'develop' into version
shimwell Jan 11, 2025
5219406
add hash
ahnaf-tahmid-chowdhury Jan 12, 2025
d4b37cf
Add more log
ahnaf-tahmid-chowdhury Jan 12, 2025
160bf43
clang format
ahnaf-tahmid-chowdhury Jan 12, 2025
2b47355
Find git at the beginning
ahnaf-tahmid-chowdhury Jan 12, 2025
923f84a
add VERSION_COMMIT_COUNT
ahnaf-tahmid-chowdhury Jan 19, 2025
07c65a3
Increment release number for dev versions
ahnaf-tahmid-chowdhury Jan 23, 2025
940c571
Merge remote-tracking branch 'upstream/develop' into version
ahnaf-tahmid-chowdhury Jan 23, 2025
21594d6
Move versioning to a separate file, as suggested by @gonuke
ahnaf-tahmid-chowdhury Jan 26, 2025
14e678f
add more info
ahnaf-tahmid-chowdhury Jan 26, 2025
075f92b
Merge remote-tracking branch 'upstream/develop' into version
ahnaf-tahmid-chowdhury Jan 26, 2025
dc28e2a
Update cmake/Modules/GetVersionFromGit.cmake
ahnaf-tahmid-chowdhury Jan 27, 2025
e2a64d7
Update cmake/Modules/GetVersionFromGit.cmake
ahnaf-tahmid-chowdhury Jan 27, 2025
1603dc5
add more variables
ahnaf-tahmid-chowdhury Jan 27, 2025
9dc344e
Update cmake/Modules/GetVersionFromGit.cmake
ahnaf-tahmid-chowdhury Jan 29, 2025
efc43ba
Merge branch 'develop' into version
ahnaf-tahmid-chowdhury Feb 17, 2025
a2942f6
Don't use PROJECT_ variable names
paulromano Feb 20, 2025
727a0ae
Get rid of unused variables
paulromano Feb 20, 2025
8440b2c
Fix fetch-depth
paulromano Feb 20, 2025
8ddcb06
Set fetch-depth to 0 as before
paulromano Feb 20, 2025
ece247a
Update cmake/Modules/GetVersionFromGit.cmake
paulromano Feb 21, 2025
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
Prev Previous commit
Next Next commit
Get rid of unused variables
  • Loading branch information
paulromano committed Feb 20, 2025
commit 727a0ae710f2fc07d734f5fd47df959f0edac06c
1 change: 0 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ message(STATUS "OpenMC version: ${OPENMC_VERSION}")
message(STATUS "OpenMC dev state: ${OPENMC_DEV_STATE}")
message(STATUS "OpenMC commit hash: ${OPENMC_COMMIT_HASH}")
message(STATUS "OpenMC commit count: ${OPENMC_COMMIT_COUNT}")
message(STATUS "OpenMC dirty state: ${OPENMC_DIRTY_STATE}")

# Generate version.h
configure_file(include/openmc/version.h.in "${CMAKE_BINARY_DIR}/include/openmc/version.h" @ONLY)
Expand Down
16 changes: 0 additions & 16 deletions cmake/Modules/GetVersionFromGit.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -88,20 +88,6 @@ else()
set(VERSION_WITHOUT_META "${VERSION_STRING}")
endif()

# Check for dirty state
if(VERSION_STRING MATCHES "-dirty")
set(DIRTY_STATE "true")
else()
set(DIRTY_STATE "false")
endif()

# Check for extra version
if(VERSION_WITHOUT_META MATCHES "${VERSION_SUFFIX}")
set(VERSION_EXTRA "${CMAKE_MATCH_1}")
else()
set(VERSION_EXTRA "")
endif()

# Split and set version components
string(REPLACE "." ";" VERSION_LIST "${VERSION_NO_SUFFIX}")
list(GET VERSION_LIST 0 VERSION_MAJOR)
Expand All @@ -117,9 +103,7 @@ endif()
set(OPENMC_VERSION_MAJOR "${VERSION_MAJOR}")
set(OPENMC_VERSION_MINOR "${VERSION_MINOR}")
set(OPENMC_VERSION_PATCH "${VERSION_PATCH}")
set(OPENMC_VERSION_EXTRA "${VERSION_EXTRA}")
set(OPENMC_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
set(OPENMC_COMMIT_HASH "${COMMIT_HASH}")
set(OPENMC_DIRTY_STATE "${DIRTY_STATE}")
set(OPENMC_DEV_STATE "${DEV_STATE}")
set(OPENMC_COMMIT_COUNT "${COMMIT_COUNT}")