4 files changed, 20 insertions, 29 deletions
diff --git a/ports/sqlpp11/CONTROL b/ports/sqlpp11/CONTROL
index 282598dc5..0d4e6ae9c 100644
--- a/ports/sqlpp11/CONTROL
+++ b/ports/sqlpp11/CONTROL
@@ -1,4 +1,4 @@
 Source: sqlpp11
-Version: 0.58
+Version: 0.58-3
 Description: A type safe embedded domain specific language for SQL queries and results in C++.
 Build-Depends: date
diff --git a/ports/sqlpp11/FixForMSVC.patch b/ports/sqlpp11/FixForMSVC.patch
deleted file mode 100644
index 753590707..000000000
--- a/ports/sqlpp11/FixForMSVC.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/include/sqlpp11/char_sequence.h b/include/sqlpp11/char_sequence.h
-index 5759525..96cdbd0 100644
---- a/include/sqlpp11/char_sequence.h
-+++ b/include/sqlpp11/char_sequence.h
-@@ -54,16 +54,16 @@ namespace sqlpp
-     }
-   };
- 
--  template <std::size_t N, const char (&s)[N], typename T>
-+  template <std::size_t N, const char* s, typename T>
-   struct make_char_sequence_impl;
- 
--  template <std::size_t N, const char (&s)[N], std::size_t... i>
-+  template <std::size_t N, const char* s, std::size_t... i>
-   struct make_char_sequence_impl<N, s, sqlpp::detail::index_sequence<i...>>
-   {
-     using type = char_sequence<s[i]...>;
-   };
- 
--  template <std::size_t N, const char (&Input)[N]>
-+  template <std::size_t N, const char* Input>
-   using make_char_sequence =
-       typename make_char_sequence_impl<N, Input, sqlpp::detail::make_index_sequence<N - 1>>::type;
- }  // namespace sqlpp
diff --git a/ports/sqlpp11/ddl2cpp_path.patch b/ports/sqlpp11/ddl2cpp_path.patch
new file mode 100644
index 000000000..b3c16570b
--- /dev/null
+++ b/ports/sqlpp11/ddl2cpp_path.patch
@@ -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()
diff --git a/ports/sqlpp11/portfile.cmake b/ports/sqlpp11/portfile.cmake
index a11d563d9..596df3977 100644
--- a/ports/sqlpp11/portfile.cmake
+++ b/ports/sqlpp11/portfile.cmake
@@ -3,23 +3,25 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO rbock/sqlpp11
-    REF 0.58
+    REF 0.58
     SHA512 c391e72638a748e0e25b53176dc371ba468bc14bdcb6dda2f2418c4ab4d620ebc5507ee284ff81c3104888d0d959703c6c91b55ccd69a8641b07dcb20cd56209
     HEAD_REF master
-    PATCHES FixForMSVC.patch
+    PATCHES ddl2cpp_path.patch
 )
 
 # Use sqlpp11's own build process, skipping tests
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
     OPTIONS
     -DENABLE_TESTS:BOOL=OFF
 )
-
+
 vcpkg_install_cmake()
 
 # 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
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib)