Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
45 changes: 45 additions & 0 deletions ports/libdjinterop/devendor_libs.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7ca2d6f..f317c4d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -226,6 +226,9 @@ configure_file(
include(GNUInstallDirs)
set(DJINTEROP_INSTALL_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}/djinterop")

+find_package(date CONFIG REQUIRED)
+find_path(SQLITE_MODERN_CPP_INCLUDE_DIRS "sqlite_modern_cpp.h")
+
target_include_directories(
DjInterop PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
@@ -234,13 +237,13 @@ target_include_directories(
target_include_directories(
DjInterop PRIVATE SYSTEM
${ZLIB_INCLUDE_DIRS}
- ext/sqlite_modern_cpp
- ext/date)
+ ${SQLITE_MODERN_CPP_INCLUDE_DIRS})

target_link_libraries(
DjInterop PUBLIC
- ${ZLIB_LIBRARIES})
-
+ ${ZLIB_LIBRARIES}
+ PRIVATE
+ date::date)

if(SYSTEM_SQLITE)
# Search for system installation of SQLite and use that.
diff --git a/src/djinterop/util/chrono.cpp b/src/djinterop/util/chrono.cpp
index 0d551dd..475aece 100644
--- a/src/djinterop/util/chrono.cpp
+++ b/src/djinterop/util/chrono.cpp
@@ -22,7 +22,7 @@
#include <stdexcept>
#include <string>

-#include <date.h>
+#include <date/date.h>

namespace djinterop::util
{
4 changes: 4 additions & 0 deletions ports/libdjinterop/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,12 @@ vcpkg_from_github(
REF "${VERSION}"
SHA512 45969510c2a2c863bd9627ddc73f404c84d12cc0eea922c23a04dc3486420188936ef556e6a5372e3cc390b3b12d748d64d0cae82a845d6306a4da18227bb435
HEAD_REF master
PATCHES
devendor_libs.diff
)

file(REMOVE_RECURSE "${SOURCE_PATH}/ext")

vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
Expand Down
3 changes: 3 additions & 0 deletions ports/libdjinterop/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
{
"name": "libdjinterop",
"version": "0.27.0",
"port-version": 1,
"description": "C++ library for access to DJ record libraries. Currently only supports Denon Engine Prime databases",
"homepage": "https://github.com/xsco/libdjinterop",
"license": "LGPL-3.0-or-later",
"supports": "!xbox",
"dependencies": [
"date",
"sqlite-modern-cpp",
"sqlite3",
{
"name": "vcpkg-cmake",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -4774,7 +4774,7 @@
},
"libdjinterop": {
"baseline": "0.27.0",
"port-version": 0
"port-version": 1
},
"libdmtx": {
"baseline": "0.7.7",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libdjinterop.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "eb88b6ff11d18e737c84eafdf99e4c555d8d7056",
"version": "0.27.0",
"port-version": 1
},
{
"git-tree": "d49a24f19dcdfc7403bb37d41e30b9f7d96141e8",
"version": "0.27.0",
Expand Down