diff --git a/.gitignore b/.gitignore index 5351e0931d..1caac88d23 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,4 @@ _build* # pytest __pycache__ venv/ +vcpkg_installed \ No newline at end of file diff --git a/src/ports/sirius-solver/portfile.cmake b/src/ports/sirius-solver/portfile.cmake deleted file mode 100644 index bf6ac68a36..0000000000 --- a/src/ports/sirius-solver/portfile.cmake +++ /dev/null @@ -1,21 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO "rte-france/sirius-solver" - REF "antares-integration-v1.6" - SHA512 8d5992f036f35b73c11261e68e030c58c3ffe22b411921c7e08e62274feeed41227b59365a00a4e32e49f35cdaa733b079cfc0a7d98347825253ae67d9c69e4a - HEAD_REF main -) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}/src" -) - -vcpkg_cmake_install() - -vcpkg_cmake_config_fixup(PACKAGE_NAME sirius_solver CONFIG_PATH cmake) - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - -vcpkg_copy_pdbs() - -file(INSTALL "${SOURCE_PATH}/LICENSE.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/src/ports/sirius-solver/vcpkg.json b/src/ports/sirius-solver/vcpkg.json deleted file mode 100644 index ded804499d..0000000000 --- a/src/ports/sirius-solver/vcpkg.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "sirius-solver", - "version": "1.5", - "port-version": 0, - "description": "Sirius solver", - "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -} diff --git a/src/vcpkg-configuration.json b/src/vcpkg-configuration.json new file mode 100644 index 0000000000..36af36c588 --- /dev/null +++ b/src/vcpkg-configuration.json @@ -0,0 +1,20 @@ +{ + "overlay-triplets": [ + "./triplets" + ], + "default-registry": { + "kind": "git", + "baseline": "b322364f06308bdd24823f9d8f03fe0cc86fd46f", + "repository": "https://github.com/microsoft/vcpkg" + }, + "registries": [ + { + "kind": "git", + "repository": "https://github.com/AntaresSimulatorTeam/antares-vcpkg-registry", + "baseline": "db4099a569dd237a09e2f5afe9e1c52a44f5b55e", + "packages": [ + "sirius-solver" + ] + } + ] +} diff --git a/src/vcpkg.json b/src/vcpkg.json index 0a8e10c378..a325009a14 100644 --- a/src/vcpkg.json +++ b/src/vcpkg.json @@ -1,19 +1,10 @@ { "name": "antares-simulator", "version-string": "9.2.0", - "builtin-baseline": "b322364f06308bdd24823f9d8f03fe0cc86fd46f", - "vcpkg-configuration": { - "overlay-ports": [ - "./ports" - ], - "overlay-triplets": [ - "./triplets" - ] - }, "dependencies": [ { "name": "sirius-solver", - "version>=": "1.5" + "version>=": "1.7" }, { "name": "wxwidgets",