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

Update to latest vcpkg build #4717

Merged
merged 3 commits into from
Jun 9, 2022
Merged

Update to latest vcpkg build #4717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
23c87d1
Devendor FindSQLite3.cmake
daschuer Dec 16, 2021
fbabbbc
Update to latest vcpkg build
daschuer Dec 16, 2021
eb1adc4
Make X_VCPKG_APPLOCAL_DEPS_INSTALL a cache variable to follow vcpkg u…
daschuer Jun 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ jobs:
-DMACOS_BUNDLE=ON
-DMODPLUG=OFF
-DWAVPACK=OFF
-DVCPKG_TARGET_TRIPLET=x64-osx-min10.12
-DVCPKG_DEFAULT_HOST_TRIPLET=x64-osx-min10.12
# TODO: Fix this broken test on macOS
ctest_args: --exclude-regex DirectoryDAOTest.relocateDirectory
cpack_generator: DragNDrop
Expand Down
8 changes: 4 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ if(DEFINED ENV{VCPKG_ROOT} AND NOT DEFINED VCPKG_ROOT)
endif()

if(DEFINED VCPKG_ROOT)
set(X_VCPKG_APPLOCAL_DEPS_INSTALL TRUE)
set(X_VCPKG_APPLOCAL_DEPS_INSTALL ON CACHE BOOL "Automatically copy dependencies into the install target directory for executables." FORCE)

if(NOT DEFINED VCPKG_OVERLAY_PORTS)
set(VCPKG_OVERLAY_PORTS "${VCPKG_ROOT}/overlay/ports")
Expand Down Expand Up @@ -1855,7 +1855,7 @@ find_package(SQLite3)
if(NOT SQLite3_FOUND)
set(LOCALECOMPARE_DEFAULT OFF)
else()
is_static_library(SQLite3_IS_STATIC SQLite3::SQLite3)
is_static_library(SQLite3_IS_STATIC SQLite::SQLite3)
if(SQLite3_IS_STATIC OR NOT APPLE)
set(LOCALECOMPARE_DEFAULT ON)
else()
Expand All @@ -1868,10 +1868,10 @@ if(LOCALECOMPARE)
message(FATAL_ERROR "Locale Aware Compare for SQLite requires libsqlite and its development headers.")
endif()
target_compile_definitions(mixxx-lib PUBLIC __SQLITE3__)
target_link_libraries(mixxx-lib PRIVATE SQLite3::SQLite3)
target_link_libraries(mixxx-lib PRIVATE SQLite::SQLite3)
elseif(SQLite3_IS_STATIC)
# in the static case we need to link SQLite3 uncoditionally
target_link_libraries(mixxx-lib PRIVATE SQLite3::SQLite3)
target_link_libraries(mixxx-lib PRIVATE SQLite::SQLite3)
endif()

# Denon Engine Prime library export support (using libdjinterop)
Expand Down
87 changes: 0 additions & 87 deletions cmake/modules/FindSQLite3.cmake
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions packaging/macos/build_environment
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
mixxx-deps-2.4-x64-osx-058063e
4ebfc80e20031bfe52589416a8465a07ef09ef8546a8d41b43c57e2c764a7545
mixxx-deps-2.4-x64-osx-min10.12-3ede1a3
afe8113d2ef6b8695610ba51bf7296b31a623f410ab8ee377173ea2214b5cca1
2 changes: 1 addition & 1 deletion packaging/windows/build_environment
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
mixxx-deps-2.4-x64-windows-058063e
mixxx-deps-2.4-x64-windows-3ede1a3