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

Jump to bottom

Fix Test CMake project for Windows and parametrize paths #683

Merged
merged 2 commits into from
Feb 20, 2022
Merged

Fix Test CMake project for Windows and parametrize paths #683

merged 2 commits into from
Feb 20, 2022

Conversation

nicoraf
Copy link
Contributor

@nicoraf nicoraf commented Jan 23, 2022

No description provided.

@Calinou Calinou added the bug This has been identified as a bug label Jan 23, 2022
Calinou
Calinou reviewed Jan 23, 2022
View reviewed changes
test/cmake_build.bat Outdated Show resolved Hide resolved
Calinou
Calinou reviewed Jan 23, 2022
View reviewed changes
test/cmake_generate.bat Outdated Show resolved Hide resolved
Calinou
Calinou reviewed Jan 23, 2022
View reviewed changes
test/CMakeLists.txt Outdated Show resolved Hide resolved
@nicoraf nicoraf force-pushed the test_cmake_windows branch 3 times, most recently from 7ee5457 to 0715078 Compare January 24, 2022 01:28
@nicoraf nicoraf requested a review from Calinou January 24, 2022 13:08
@nicoraf nicoraf force-pushed the test_cmake_windows branch from 0715078 to 37de2b9 Compare January 25, 2022 01:14
Xrayez
Xrayez suggested changes Jan 26, 2022
View reviewed changes
test/CMakeLists.txt
Comment on lines -4 to -6
# Local dependency paths, adapt them to your setup
set(GODOT_HEADERS_PATH ../godot-headers/)
set(CPP_BINDINGS_PATH ../)
Copy link

@Xrayez Xrayez Jan 26, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That would require specifying options via command-line all the time. I suggest being able to override the options:

set(GODOT_HEADERS_PATH ../godot-headers/ CACHE PATH "Path to Godot headers")
set(CPP_BINDINGS_PATH ../ CACHE PATH "Path to C++ bindings")

CMake docs: https://cmake.org/cmake/help/latest/command/set.html

If using PATH breaks something, then a STRING argument could be used. But PATH gives a hint for cmake-gui to pick directories.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tested with PATH and it didn't work , so I used STRING

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Xrayez can you please review again the latest changes ? Thanks

nicoraf
nicoraf commented Jan 26, 2022
View reviewed changes
test/cmake_build.bat Outdated
@@ -0,0 +1,2 @@
REM for detailed log you can add -- /verbosity:detailed
cmake --build ./build
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Xrayez @Calinou , I think I should remove these .bat files, as I do not see any shell scripts or bat files. On the other hand this is a sample project so it makes me doubt a bit.

Copy link

@Xrayez Xrayez Jan 26, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know to be honest, if we do remove this then it's better to do via another PR in any case.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will remove it

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will create another PR to open the discussion about those .bat / shell scripts

@nicoraf nicoraf force-pushed the test_cmake_windows branch from 37de2b9 to f227a01 Compare January 26, 2022 19:12
Xrayez
Xrayez approved these changes Feb 17, 2022
View reviewed changes
Copy link

@Xrayez Xrayez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I haven't tested, but looks fine!

Calinou
Calinou approved these changes Feb 20, 2022
View reviewed changes
Copy link
Member

@Calinou Calinou left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Congratulations for your first merged pull request 🎉

@akien-mga akien-mga merged commit 1f03394 into godotengine:master Feb 20, 2022
@Faless Faless mentioned this pull request Apr 27, 2022
Merged
@akien-mga akien-mga added this to the 4.0 milestone Jul 22, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Xrayez Xrayez Xrayez approved these changes

@Calinou Calinou Calinou approved these changes

Assignees
No one assigned
Labels
bug This has been identified as a bug
Projects
None yet
Milestone
4.0
Development

Successfully merging this pull request may close these issues.
4 participants
@nicoraf @Calinou @Xrayez @akien-mga