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

Building without tests-tools 2.5 #14269

Merged
merged 2 commits into from
Feb 2, 2025
Merged

Conversation

PPN-SD
Copy link
Contributor

@PPN-SD PPN-SD commented Jan 31, 2025

Today, we can't build mixxx without links to gtest/gperftools/benchmark

This PR allows building only mixxx and mixxx-lib targets without tests-tools.

Two common cmake-definitions are added :

  • BUILD_TESTING
  • BUILD_BENCH

And one compile definition for test.main.cpp :

  • USE_BENCH

This is helpful for packaging (gentoo here).

The negative effect is sorting of tests source files as soon as they are called by mixxx-benchmark target.

@PPN-SD PPN-SD force-pushed the cmake-mixxx-2.5 branch 2 times, most recently from 63de578 to 6be2412 Compare February 1, 2025 00:43
Today, we can't build mixxx without links to gtest/gperftools/benchmark

This PR allows building only mixxx and mixxx-lib targets without
tests-tools.

Two common cmake-definitions are added :
* BUILD_TESTING
* BUILD_BENCH

And one compile definition for test.main.cpp :
* USE_BENCH

This is helpful for packaging (gentoo here).

The negative effect is sorting of tests source files as soon
as they are called by mixxx-benchmark target.
@daschuer
Copy link
Member

daschuer commented Feb 2, 2025

Ups, I have merged the "main" version. We regularly merge 2.5 to main. So the main version should have been rebase onto 2.5. But never mind, I merge this now and resolve conflicts if there are any.

@daschuer daschuer merged commit 654d410 into mixxxdj:2.5 Feb 2, 2025
13 checks passed
@PPN-SD PPN-SD deleted the cmake-mixxx-2.5 branch February 2, 2025 12:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants