File tree Expand file tree Collapse file tree 5 files changed +58
-1
lines changed
Expand file tree Collapse file tree 5 files changed +58
-1
lines changed Original file line number Diff line number Diff line change 1+ diff --git a/CMakeLists.txt b/CMakeLists.txt
2+ index 7ca2d6f..f317c4d 100644
3+ --- a/CMakeLists.txt
4+ +++ b/CMakeLists.txt
5+ @@ -226,6 +226,9 @@ configure_file(
6+ include(GNUInstallDirs)
7+ set(DJINTEROP_INSTALL_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}/djinterop")
8+
9+ + find_package(date CONFIG REQUIRED)
10+ + find_path(SQLITE_MODERN_CPP_INCLUDE_DIRS "sqlite_modern_cpp.h")
11+ +
12+ target_include_directories(
13+ DjInterop PUBLIC
14+ $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
15+ @@ -234,13 +237,13 @@ target_include_directories(
16+ target_include_directories(
17+ DjInterop PRIVATE SYSTEM
18+ ${ZLIB_INCLUDE_DIRS}
19+ - ext/sqlite_modern_cpp
20+ - ext/date)
21+ + ${SQLITE_MODERN_CPP_INCLUDE_DIRS})
22+
23+ target_link_libraries(
24+ DjInterop PUBLIC
25+ - ${ZLIB_LIBRARIES})
26+ -
27+ + ${ZLIB_LIBRARIES}
28+ + PRIVATE
29+ + date::date)
30+
31+ if(SYSTEM_SQLITE)
32+ # Search for system installation of SQLite and use that.
33+ diff --git a/src/djinterop/util/chrono.cpp b/src/djinterop/util/chrono.cpp
34+ index 0d551dd..475aece 100644
35+ --- a/src/djinterop/util/chrono.cpp
36+ +++ b/src/djinterop/util/chrono.cpp
37+ @@ -22,7 +22,7 @@
38+ #include <stdexcept>
39+ #include <string>
40+
41+ - #include <date.h>
42+ + #include <date/date.h>
43+
44+ namespace djinterop::util
45+ {
Original file line number Diff line number Diff line change @@ -4,8 +4,12 @@ vcpkg_from_github(
44 REF "${VERSION} "
55 SHA512 45969510c2a2c863bd9627ddc73f404c84d12cc0eea922c23a04dc3486420188936ef556e6a5372e3cc390b3b12d748d64d0cae82a845d6306a4da18227bb435
66 HEAD_REF master
7+ PATCHES
8+ devendor_libs.diff
79)
810
11+ file (REMOVE_RECURSE "${SOURCE_PATH} /ext" )
12+
913vcpkg_cmake_configure (
1014 SOURCE_PATH "${SOURCE_PATH} "
1115 OPTIONS
Original file line number Diff line number Diff line change 11{
22 "name" : " libdjinterop" ,
33 "version" : " 0.27.0" ,
4+ "port-version" : 1 ,
45 "description" : " C++ library for access to DJ record libraries. Currently only supports Denon Engine Prime databases" ,
56 "homepage" : " https://github.com/xsco/libdjinterop" ,
67 "license" : " LGPL-3.0-or-later" ,
78 "supports" : " !xbox" ,
89 "dependencies" : [
10+ " date" ,
11+ " sqlite-modern-cpp" ,
912 " sqlite3" ,
1013 {
1114 "name" : " vcpkg-cmake" ,
Original file line number Diff line number Diff line change 45504550 },
45514551 "libdjinterop" : {
45524552 "baseline" : " 0.27.0" ,
4553- "port-version" : 0
4553+ "port-version" : 1
45544554 },
45554555 "libdmtx" : {
45564556 "baseline" : " 0.7.7" ,
Original file line number Diff line number Diff line change 11{
22 "versions" : [
3+ {
4+ "git-tree" : " eb88b6ff11d18e737c84eafdf99e4c555d8d7056" ,
5+ "version" : " 0.27.0" ,
6+ "port-version" : 1
7+ },
38 {
49 "git-tree" : " d49a24f19dcdfc7403bb37d41e30b9f7d96141e8" ,
510 "version" : " 0.27.0" ,
You can’t perform that action at this time.
0 commit comments