[sqlpp11] fixed ddl2cpp path (#8837)

* [sqlpp11] fixed ddl2cpp path

* Incremented sqlpp11 CONTROL version to 0.58-3
This commit is contained in:
lex-96 2019-11-02 00:46:26 +03:00 committed by Robert Schumacher
parent ad34a65684
commit 63b556732a
3 changed files with 18 additions and 3 deletions

View File

@ -1,4 +1,4 @@
Source: sqlpp11 Source: sqlpp11
Version: 0.58-2 Version: 0.58-3
Description: A type safe embedded domain specific language for SQL queries and results in C++. Description: A type safe embedded domain specific language for SQL queries and results in C++.
Build-Depends: date Build-Depends: date

View File

@ -0,0 +1,13 @@
diff --git a/cmake/Sqlpp11Config.cmake b/cmake/Sqlpp11Config.cmake
index 720fef2..d8f93b8 100644
--- a/cmake/Sqlpp11Config.cmake
+++ b/cmake/Sqlpp11Config.cmake
@@ -34,7 +34,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/Sqlpp11Targets.cmake")
if(TARGET sqlpp11::ddl2cpp)
message(FATAL_ERROR "Target sqlpp11::ddl2cpp already defined")
endif()
-get_filename_component(sqlpp11_ddl2cpp_location "${CMAKE_CURRENT_LIST_DIR}/../../../bin/sqlpp11-ddl2cpp" REALPATH)
+get_filename_component(sqlpp11_ddl2cpp_location "${CMAKE_CURRENT_LIST_DIR}/../../scripts/sqlpp11-ddl2cpp" REALPATH)
if(NOT EXISTS "${sqlpp11_ddl2cpp_location}")
message(FATAL_ERROR "The imported target sqlpp11::ddl2cpp references the file '${sqlpp11_ddl2cpp_location}' but this file does not exists.")
endif()

View File

@ -6,6 +6,7 @@ vcpkg_from_github(
REF 0.58 REF 0.58
SHA512 c391e72638a748e0e25b53176dc371ba468bc14bdcb6dda2f2418c4ab4d620ebc5507ee284ff81c3104888d0d959703c6c91b55ccd69a8641b07dcb20cd56209 SHA512 c391e72638a748e0e25b53176dc371ba468bc14bdcb6dda2f2418c4ab4d620ebc5507ee284ff81c3104888d0d959703c6c91b55ccd69a8641b07dcb20cd56209
HEAD_REF master HEAD_REF master
PATCHES ddl2cpp_path.patch
) )
# Use sqlpp11's own build process, skipping tests # Use sqlpp11's own build process, skipping tests
@ -19,7 +20,8 @@ vcpkg_configure_cmake(
vcpkg_install_cmake() vcpkg_install_cmake()
# Move CMake config files to the right place # Move CMake config files to the right place
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake) vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Sqlpp11 TARGET_PATH share/sqlpp11)
# Delete redundant and unnecessary directories # Delete redundant and unnecessary directories
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib)