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.

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

CMake: re-run to get version information when .git/HEAD changes #4841

Merged
merged 1 commit into from
Feb 7, 2017

Conversation

ligfx
Copy link
Contributor

@ligfx ligfx commented Feb 7, 2017

Fixes an issue where Dolphin's revision information could be incorrect
when:

  1. CMake was run while HEAD was at commit A
  2. HEAD was set to commit B, which didn't have differences from A
    that would cause CMake to be re-run

This does not fix the issue with incorrect information about whether
Dolphin was built from a dirty revision or not.

CMakeLists.txt Outdated
@@ -918,6 +918,7 @@ else()
set(DOLPHIN_WC_IS_STABLE "0")
endif()

set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS "${CMAKE_SOURCE_DIR}/.git/HEAD")

This comment was marked as off-topic.

Fixes an issue where Dolphin's revision information could be incorrect
when:

1) CMake was run while HEAD was at commit A
2) HEAD was set to commit B, which didn't have differences from A
that would cause CMake to be re-run

This does not fix the issue with incorrect information about whether
Dolphin was built from a dirty working tree or not.
@ligfx ligfx force-pushed the accuratescmrev branch 3 times, most recently from eafdba9 to 9502f32 Compare February 7, 2017 02:37
@lioncash lioncash merged commit bdf09c7 into dolphin-emu:master Feb 7, 2017
ligfx added a commit to ligfx/dolphin that referenced this pull request Feb 7, 2017
In an oversight, PR dolphin-emu#4841 didn't handle committing to a branch.
ligfx added a commit to ligfx/dolphin that referenced this pull request Feb 7, 2017
In an oversight, PR dolphin-emu#4841 didn't handle committing to a branch.
ligfx added a commit to ligfx/dolphin that referenced this pull request Feb 7, 2017
In an oversight, PR dolphin-emu#4841 didn't handle committing to or amending a
branch.
@ligfx ligfx deleted the accuratescmrev branch May 24, 2017 21:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants