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

cmakelists and windows_buildenv fixes #3471

Merged
merged 5 commits into from
Dec 21, 2020

Conversation

JosepMaJAZ
Copy link
Contributor

CMakelists.txt: Do not duplicate the runtime binaries on install dir.
windows_buildenv.bat : Fixes on the generation of the CMakeSettings.txt

windows_buildenv.bat : Fixes on the generation of the CMakeSettings.txt
@github-actions github-actions bot added the build label Dec 20, 2020
CMakeLists.txt Outdated Show resolved Hide resolved
@Be-ing
Copy link
Contributor

Be-ing commented Dec 20, 2020

Please fix pre-commit errors.

Co-authored-by: Be <be.0@gmx.com>
@JoergAtGithub
Copy link
Member

Why you changed the type of CMAKE_PREFIX_PATH from path to string?

@JosepMaJAZ
Copy link
Contributor Author

JosepMaJAZ commented Dec 20, 2020

Why you changed the type of CMAKE_PREFIX_PATH from path to string?

Because PATH means that it is a folder, but here it actually is multiple paths, so it is a string.
Yet, I basically replicated what my manually generated CMakeSettings had.

Anyway, there might be something strange going on there, as the CMakeCache that I generated using cmake from commandline has this (UNINITIALIZED)
//No help, variable specified on the command line.
CMAKE_PREFIX_PATH:UNINITIALIZED=D:\programacio\mixxx\mixxx-master\buildenv\2.3-j00019-x64-release-fastbuild-static-55e94982-minimal;D:\programacio\mixxx\mixxx-master\buildenv\2.3-j00019-x64-release-fastbuild-static-55e94982-minimal\Qt-5.14.2

and the one on Visual studio has this (STRING):
CMAKE_PREFIX_PATH:STRING=D:\programacio\mixxx\mixxx-master\buildenv\2.3-j00019-x64-release-fastbuild-static-55e94982-minimal;D:\programacio\mixxx\mixxx-master\buildenv\2.3-j00019-x64-release-fastbuild-static-55e94982-minimal\Qt-5.14.2

Also used the BUILD_ROOT and INSTALL_ROOT defined in variables, since those can be outside of the project
@JoergAtGithub
Copy link
Member

Did you know that you can download the patch file with the code style fixes as build artifact? https://github.com/mixxxdj/mixxx/suites/1700507024/artifacts/32000776

@Be-ing
Copy link
Contributor

Be-ing commented Dec 20, 2020

I don't know what's going on with this Windows stuff. @JoergAtGithub do you think this is ready to merge?

@JoergAtGithub
Copy link
Member

I do not know the purpose of these console settings. Everything else looks reasonful to me. I did not tested it yet.

@JosepMaJAZ
Copy link
Contributor Author

Those console settings are in order to create an UTF8 file with a BOM on it. My Visual Studio created file had such a BOM, so I tried to replicate it as much as I could.

In most cases, it could work without these changes, but this should ensure that it keeps working on other locales.

@Be-ing Be-ing merged commit dc1c0bc into mixxxdj:main Dec 21, 2020
@Holzhaus
Copy link
Member

Holzhaus commented Jan 2, 2021

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants