summaryrefslogtreecommitdiffstats
path: root/cmake
AgeCommit message (Collapse)Author
2022-01-02Happy New Year 2022!Sébastien Blaisot
2021-09-09Merge remote-tracking branch 'upstream/main' into vcpkg_osxDaniel Schürmann
# Conflicts: # cmake/modules/FindPortAudio.cmake
2021-09-07Merge remote-tracking branch 'upstream/2.3'Be
2021-09-07CMake: fix detection of SoundTouch versionBe
2021-09-07CMake: fix name of soundtouch pkgconfig fileBe
Files installed by the soundtouch-devel package in Fedora 34: ❯ rpm -ql soundtouch-devel /usr/include/soundtouch /usr/include/soundtouch/BPMDetect.h /usr/include/soundtouch/FIFOSampleBuffer.h /usr/include/soundtouch/FIFOSamplePipe.h /usr/include/soundtouch/STTypes.h /usr/include/soundtouch/SoundTouch.h /usr/include/soundtouch/soundtouch_config.h /usr/lib64/libSoundTouch.so /usr/lib64/pkgconfig/libSoundTouch.pc /usr/lib64/pkgconfig/soundtouch-1.0.pc /usr/lib64/pkgconfig/soundtouch.pc /usr/share/aclocal/soundtouch.m4
2021-08-28CMake: fix version detection for TagLibBe
On Windows, the pkgconfig file is found and the variable is defined but somehow set to empty string.
2021-08-28CMake: check for TagLib >= 1.11Be
2021-08-25do not assume PortAudio on Linux was built with ALSA backendBe
hack around a PipeWire bug: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/1547
2021-08-23IsStaticLibrary: Static library detection on windows is not implemented, ↵Daniel Schürmann
return FALSE
2021-08-18make pkg-config alo look also for hidapiDaniel Schürmann
2021-08-18[portaudio] directly link to jack in the static caseDaniel Schürmann
2021-08-18Remove unnecessary regex dependency from FindJACK.cmakeDaniel Schürmann
2021-08-18Fix FindJACK.cmake for cases others than windowsDaniel Schürmann
2021-08-18Added FindJACK.cmakeDaniel Schürmann
Copied from Be-ing/portaudio
2021-08-17Merge remote-tracking branch 'upstream/2.3'Be
2021-08-17Fix version detection in Findhidapi.cmake (#4215)Daniel Schürmann
* Findhidapi.cmake: Fix detection of Version 0 digits Co-authored-by: Be-ing <be@mixxx.org> * Improve messages when linking hidapi * Remove unreachable error message * Introduced a MINIMUM_hidapi_VERSION variable to avoid repeat the version number literaly * Make use of FindPackageHandleStandardArgs() to format user message Co-authored-by: Be-ing <be@mixxx.org>
2021-08-05CMake: support statically linking dependencies (#4163)Daniel Schürmann
* Move Apple extra linking to the block where extra linking is defined for the other targets as well * Added additional libraries required for static linking on macOs * Remove unneeded extra Apple link dependencies for the non static case * Added Qt5::PrintSupport needed for MacOS linking * Add Support for VCPKG_OVERLAY_TRIPLETS * Improve cmake find modules for static linking * Remove obsolete STATIC_DEPS parameter * Enable LOCALECOMPARE option for static linking on macOS and fix ENGINEPRIME relationship with SQLite
2021-07-31CMake: make FindPortAudio.cmake module export PortAudio::PortAudioBe
to match targets exported by config files https://github.com/PortAudio/portaudio/pull/461 https://github.com/mixxxdj/vcpkg/pull/20
2021-07-20Merge branch '2.3' of git@github.com:mixxxdj/mixxx.gitUwe Klotz
2021-07-19CMake: also search for libusb as 'usb' library without '-1.0'Be
This is required to locate libusb on FreeBSD.
2021-07-09Merge branch '2.3'Owen Williams
2021-07-07Fix wrong base tag used for deployment and displayed in About dialogJan Holthuis
By default, `git describe` shows the number of commits from the latest tag in the git history. In our case we don't want that, because this can cause problems: 2.4-alpha Expected: 2.4-alpha-N-abcdef123 main ---+X---------------+---> Actual: 2.3.0-M-abcdef456 \ / X------------X---> 2.3-beta 2.3.0 Hence, we need to add the `--first-parent` flag to git describe, so that it only follows the first parent of a merge and does not pull in tags from another branch. Fixes mixxxdj/website#248. See the issue for details: https://github.com/mixxxdj/website/issues/248
2021-07-06CMake: link hidraw backend of hidapi on Linux instead of libusbBe
The hidraw backend supports Bluetooth HID. This also works around a bug in the libusb backend affecting the Native Instruments Traktor Kontrol S4 Mk2 & Mk3: https://github.com/libusb/hidapi/issues/274
2021-06-29Fix misc. typosluz paz
Found via `codespell -q 3 -S *.ts,*.po,*.rtf,./.git,./src/library,./lib,./build/wix -L ba,chang,crate,ect,everytime,german,hace,iff,jus,ith,lokal,nd,ons,pevent,pparent,preverse,seeked,sheat,sinc,splitted,substract,thru,tim,uint`
2021-06-16Merge remote-tracking branch 'upstream/2.3' into mainDaniel Schürmann
# Conflicts: # src/dialog/dlgabout.cpp
2021-06-14Allow parentheses in default_option() depends stringDaniel Schürmann
2021-05-17Merge remote-tracking branch 'upstream/2.3' into mainDaniel Schürmann
2021-05-17Fall back to current time if GIT_DESCRIBE is set but no GIT_COMMIT_DATEDaniel Schürmann
2021-05-08Allow to set GIT_COMMIT_DATE and GIT_DESCRIBE during configuringDaniel Schürmann
2021-05-08Use build date in case of tar ball build and label date as more generic date.Daniel Schürmann
2021-05-08Added GitInfoStore class depending on mixxx-lib to calculate the dirty stateDaniel Schürmann
2021-05-08Merge branch '2.3' of git@github.com:mixxxdj/mixxx.gitUwe Klotz
# Conflicts: # src/util/cmdlineargs.cpp
2021-05-07CMake: Fetch latest Git information on build without reconfigJan Holthuis
2021-03-19Merge branch '2.3' of git@github.com:mixxxdj/mixxx.gitUwe Klotz
# Conflicts: # CMakeLists.txt # cmake/modules/Findhidapi.cmake
2021-03-19CMake: Fix detection of hidapi_VERSIONUwe Klotz
2021-03-19Merge branch '2.3' of github.com:mixxxdj/mixxxJan Holthuis
2021-03-18CMake: Explain difference between default_option and cmake_dependent_optionJan Holthuis
2021-03-18CMake: Use default_option instead of cmake_dependent_option for defaultsJan Holthuis
Before, we often used `cmake_dependent_option` for options depending on the availability of dependencies. However, this is not the proper way to use that macro, because if the dependencies is missing, it will forcibly set the option to off and not cause a warning if the user tries to set it to on. `cmake_dependent_option` should only be used for disabling options based on the platform, where that option will never be available, not based on dependencies that may be present or not. Instead, this adds a new macro `default_option` that allows to provide a default depending on the value of other variables/options. The user may still override that default and will run into an error message in that case. From the user's perspective this is preferable instead of silently dropping the option, because then the user will only notice afterwards that some functionality is missing (despite setting the corresponding feature flag `-DUSE_FOO=ON` on the command line).
2021-03-14Log FFmpeg component versions if foundUwe Klotz
2021-03-14Update commentUwe Klotz
2021-02-22Merge branch '2.3' of github.com:mixxxdj/mixxxJan Holthuis
2021-02-16CMake: add user feedback for FindFFMPEG.cmake moduleBe
2021-02-09CMake: Rewrite Ogg/Vorbis find moduleJan Holthuis
2021-01-30Merged Findhidapi.cmake and CMakeLists.txt after conflict with upstream/mainJoergAtGithub
2021-01-27Merge remote-tracking branch 'upstream/2.3' into fdkaac-encoder3Daniel Schürmann
2021-01-25Merge remote-tracking branch 'upstream/2.3' into mainDaniel Schürmann
2021-01-24Merge remote-tracking branch 'upstream/2.3' into mainDaniel Schürmann
2021-01-24CMake: rename HIDAPI to hidapi to match upstream target nameBe
2021-01-22CMake: Make the FindFFMPEG interface mirror the vcpkg-shipped oneJan Holthuis
2021-01-22CMake: Rename FindRubberband.cmake moduleJan Holthuis
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-07 08:42:36 +0000