diff --git a/ports/libodb-boost/CMakeLists.txt b/ports/libodb-boost/CMakeLists.txt index 5dd0eb9b80..4269c81fbc 100644 --- a/ports/libodb-boost/CMakeLists.txt +++ b/ports/libodb-boost/CMakeLists.txt @@ -1,8 +1,6 @@ cmake_minimum_required(VERSION 3.0) project(libodb-boost VERSION 2.4.0 LANGUAGES CXX) find_package(odb 2.4.0 REQUIRED COMPONENTS libodb) -configure_file(config.unix.h.in - ${CMAKE_CURRENT_SOURCE_DIR}/odb/boost/details/config.h COPYONLY) # FIXME: should we require boost? which packages? # find_package(PostgreSQL REQUIRED) diff --git a/ports/libodb-boost/config.unix.h.in b/ports/libodb-boost/config.h similarity index 100% rename from ports/libodb-boost/config.unix.h.in rename to ports/libodb-boost/config.h diff --git a/ports/libodb-boost/portfile.cmake b/ports/libodb-boost/portfile.cmake index 5e0c3b7d47..444bc0ad65 100644 --- a/ports/libodb-boost/portfile.cmake +++ b/ports/libodb-boost/portfile.cmake @@ -10,10 +10,8 @@ vcpkg_extract_source_archive( ) file(REMOVE "${SOURCE_PATH}/version") -file(COPY - "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" - "${CMAKE_CURRENT_LIST_DIR}/config.unix.h.in" - DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/config.h" DESTINATION "${SOURCE_PATH}/odb/boost/details") vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" diff --git a/ports/libodb-boost/vcpkg.json b/ports/libodb-boost/vcpkg.json index b216d72c22..a8f46c5180 100644 --- a/ports/libodb-boost/vcpkg.json +++ b/ports/libodb-boost/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libodb-boost", "version": "2.4.0", - "port-version": 7, + "port-version": 8, "description": "Description: Boost support for the ODB ORM library", "dependencies": [ "libodb", diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index cc655b76f7..d812a95d31 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -882,7 +882,6 @@ libnice-gst:arm64-uwp = cascade libnice-gst:x64-uwp = cascade libnick:arm64-osx = fail libnick:x64-linux = fail -libodb-boost:x64-linux = cascade libodb-mysql:arm64-uwp = cascade libodb-mysql:x64-linux = cascade libodb-mysql:x64-uwp = cascade diff --git a/versions/baseline.json b/versions/baseline.json index aca5a7950a..48d03f3aa4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5258,7 +5258,7 @@ }, "libodb-boost": { "baseline": "2.4.0", - "port-version": 7 + "port-version": 8 }, "libodb-mysql": { "baseline": "2.4.0", diff --git a/versions/l-/libodb-boost.json b/versions/l-/libodb-boost.json index 19e431262c..8688eb4de7 100644 --- a/versions/l-/libodb-boost.json +++ b/versions/l-/libodb-boost.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "45270c8ae9a3d084244bad1003a7fe6942dfc6d5", + "version": "2.4.0", + "port-version": 8 + }, { "git-tree": "e2ecfb7ccff63ea209a0b559e4acc342ff400e54", "version": "2.4.0",