diff options
| author | fuzzard <fuzzard@kodi.tv> | 2022-02-12 19:12:53 +1000 |
|---|---|---|
| committer | fuzzard <fuzzard@kodi.tv> | 2022-03-21 17:42:23 +1000 |
| commit | f32595fdf791be6bd765ebc7792770d06a9e2c80 (patch) | |
| tree | 363b7c16a7fff6e1df794ccd4c40b89557e40072 /CMakeLists.txt | |
| parent | dbcf8ec99e3e497246c61eaee3f13fbc2b25db51 (diff) | |
[cmake] update + build crossguid all platforms
crossguid hasnt been updated in a long time (~2015 was our previous hash)
crossguid now natively uses cmake, so remove our cmakelists file
first patch is to get around a failure due to unused function on apple platforms.
a second patch is introduced due to a build failure with the default -Werror used
Build crossguid in core cmake project for all platforms by default.
Remove from windows the bundled download of crossguid lib
rework usage of debug_postfix in SETUP_BUILD_VARS macro
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a2dca574db..db9f62dc4b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,11 +55,12 @@ option(ENABLE_AIRTUNES "Enable AirTunes support?" ON) option(ENABLE_OPTICAL "Enable optical support?" ON) option(ENABLE_PYTHON "Enable python support?" ON) option(ENABLE_TESTING "Enable testing support?" ON) + +option(ENABLE_INTERNAL_CROSSGUID "Enable internal crossguid?" ON) # use ffmpeg from depends or system option(ENABLE_INTERNAL_FFMPEG "Enable internal ffmpeg?" OFF) if(UNIX) option(FFMPEG_PATH "Path to external ffmpeg?" "") - option(ENABLE_INTERNAL_CROSSGUID "Enable internal crossguid?" ON) option(ENABLE_INTERNAL_RapidJSON "Enable internal rapidjson?" OFF) option(ENABLE_INTERNAL_FMT "Enable internal fmt?" OFF) option(ENABLE_INTERNAL_FSTRCMP "Enable internal fstrcmp?" OFF) |