diff options
| author | NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> | 2020-09-05 11:16:00 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-04 20:16:00 -0700 |
| commit | e0f0e7c1ec9b59543190543bfac93a37a2d1094a (patch) | |
| tree | 630d8b24a82a1f9fd5b19d692e6689d013ec8562 /ports/sqlite-orm/fix-usage.patch | |
| parent | 2e110d26c621ba2536de7f47708bf1bf16f5159d (diff) | |
| download | vcpkg-e0f0e7c1ec9b59543190543bfac93a37a2d1094a.tar.gz vcpkg-e0f0e7c1ec9b59543190543bfac93a37a2d1094a.zip | |
[sqlite-orm] Add features and also fix usage (#13328)
Diffstat (limited to 'ports/sqlite-orm/fix-usage.patch')
| -rw-r--r-- | ports/sqlite-orm/fix-usage.patch | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/ports/sqlite-orm/fix-usage.patch b/ports/sqlite-orm/fix-usage.patch new file mode 100644 index 000000000..7e90b0edf --- /dev/null +++ b/ports/sqlite-orm/fix-usage.patch @@ -0,0 +1,59 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6debae6..facdc1e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -47,7 +47,7 @@ add_library(sqlite_orm INTERFACE)
+
+ target_sources(sqlite_orm INTERFACE
+ $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/sqlite_orm/sqlite_orm.h>
+- $<INSTALL_INTERFACE:include/sqlite_orm/sqlite_orm.h>)
++ $<INSTALL_INTERFACE:include/sqlite_orm.h>)
+
+ target_include_directories(sqlite_orm INTERFACE
+ $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
+@@ -83,11 +83,11 @@ add_subdirectory(examples)
+ endif()
+
+ install(TARGETS sqlite_orm EXPORT "${ProjectName}Targets"
+- INCLUDES DESTINATION "${INCLUDE_INSTALL_DIR}" COMPONENT Development
+- PUBLIC_HEADER DESTINATION "${INCLUDE_INSTALL_DIR}" COMPONENT Development)
++ INCLUDES DESTINATION "${INCLUDE_INSTALL_DIR}"
++ PUBLIC_HEADER DESTINATION "${INCLUDE_INSTALL_DIR}")
+
+ install(FILES "include/sqlite_orm/sqlite_orm.h"
+- DESTINATION "${INCLUDE_INSTALL_DIR}" COMPONENT Development)
++ DESTINATION "${INCLUDE_INSTALL_DIR}")
+
+ export(EXPORT "${ProjectName}Targets"
+ FILE "${CMAKE_CURRENT_BINARY_DIR}/${ProjectName}/${ProjectName}Targets.cmake"
+diff --git a/build/cmake/GenerateConfigModule.cmake b/build/cmake/GenerateConfigModule.cmake
+index 3c5143d..a49f76a 100644
+--- a/build/cmake/GenerateConfigModule.cmake
++++ b/build/cmake/GenerateConfigModule.cmake
+@@ -1,7 +1,7 @@
+ include(CMakePackageConfigHelpers)
+
+-set(PACKAGE_INCLUDE_INSTALL_DIR "${includedir}/sqlite_orm")
+-set(PACKAGE_CMAKE_INSTALL_DIR "${cmakedir}/sqlite_orm")
++set(PACKAGE_INCLUDE_INSTALL_DIR "${includedir}")
++set(PACKAGE_CMAKE_INSTALL_DIR "${cmakedir}")
+
+ # In CYGWIN enviroment below commands does not work properly
+ if (NOT CYGWIN)
+diff --git a/build/cmake/SqliteOrmConfig.cmake.in b/build/cmake/SqliteOrmConfig.cmake.in
+index a6b6f20..7411aa1 100644
+--- a/build/cmake/SqliteOrmConfig.cmake.in
++++ b/build/cmake/SqliteOrmConfig.cmake.in
+@@ -3,10 +3,10 @@ set(SQLITE_ORM_VERSION ${sqlite_orm_VERSION})
+ @PACKAGE_INIT@
+
+ set_and_check(SQLITE_ORM_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
+-set_and_check(SQLITE_ORM_CMAKE_DIR "@PACKAGE_CMAKE_INSTALL_DIR@")
++set_and_check(SQLITE_ORM_CMAKE_DIR "@PACKAGE_CMAKE_INSTALL_DIR@/../../")
+
+ if (NOT TARGET sqlite_orm::sqlite_orm)
+- include("${SQLITE_ORM_CMAKE_DIR}/SqliteOrmTargets.cmake")
++ include("${SQLITE_ORM_CMAKE_DIR}/share/SqliteOrm/SqliteOrmTargets.cmake")
+ endif()
+
+ set(SQLITE_ORM_LIBRARIES sqlite_orm::sqlite_orm)
|