Fix #7047 #7075
Merged
Fix #7047 #7075
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
this looks like lots of unneeded changes, I'd prefer just restricting the |
sfan5
added
@ Build
|
This PR originally contained a more complicated fix (see https://github.com/nOOb3167/minetest/tree/cmakehdr3_old). |
sfan5
requested changes
Feb 24, 2018
src/CMakeLists.txt
Outdated
| @@ -530,7 +530,7 @@ set(server_SRCS | |||
| ) | |||
| list(SORT server_SRCS) | |||
|
|
|||
| if ((CMAKE_VERSION VERSION_GREATER 3.8) OR (CMAKE_VERSION VERSION_EQUAL 3.8)) | |||
| if (CMAKE_VERSION VERSION_GREATER 3.8.1) | |||
There was a problem hiding this comment.
maybe add a comment here stating why it's 3.8.1 and not something else
|
The comment now added to the change is formatted after a preexisting case in src/CMakeLists.txt about blacklisting locales (short summary line followed by issue numbers):
|
sfan5
approved these changes
Feb 24, 2018
minduser00
pushed a commit
to minduser00/minetest
that referenced
this pull request
Mar 18, 2018
minduser00
pushed a commit
to minduser00/minetest
that referenced
this pull request
Mar 18, 2018
Closed
osjc
pushed a commit
to osjc/minetest
that referenced
this pull request
Jan 23, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix #7047 by specifying absolute paths for source files within src/CMakeLists.txt (more detail as to why this works in the #7047 comments).
That file was the only place where relative paths were used for source files, therefore after this commit it is now consistent throughout the codebase.
Looking at the source lists, two files were found specified twice (first in common_SRCS, then again in client_SRCS. (client_SRCS includes common_SRCS)): convert_json.cpp and hud.cpp.
These two files are now specified just in common_SRCS.
Alternatively the required CMake version could be bumped past the version exhibiting this bug (3.8.1).