diff --git a/ports/coin-or-cbc/portfile.cmake b/ports/coin-or-cbc/portfile.cmake deleted file mode 100644 index c05382e65..000000000 --- a/ports/coin-or-cbc/portfile.cmake +++ /dev/null @@ -1,23 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO "Mizux/Cbc" - REF "b01a53da39577380acdb84d8a3577911c5d91a13" #stable/2.10 - SHA512 98a0e75dc1ac8ead134391ebd442d9cead0b1182620bff4058eb59e6cc843eaa9d0f70b956d1d1202836e5b3820a95107bec9e2233354080ab0a3a56dea1b20a - HEAD_REF master -) -if (WIN32) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -endif() -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" -) - -vcpkg_cmake_install() - -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Cbc PACKAGE_NAME Cbc) - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - -vcpkg_copy_pdbs() - -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/coin-or-cbc/vcpkg.json b/ports/coin-or-cbc/vcpkg.json deleted file mode 100644 index 90c1e040b..000000000 --- a/ports/coin-or-cbc/vcpkg.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name": "coin-or-cbc", - "version": "2.10.7", - "port-version": 0, - "description": "Fork from CBC", - "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - }, - "coin-or-cgl", - "coin-or-clp", - "coin-or-osi", - "coinutils" - ] -} diff --git a/ports/coin-or-cgl/portfile.cmake b/ports/coin-or-cgl/portfile.cmake deleted file mode 100644 index e735f9894..000000000 --- a/ports/coin-or-cgl/portfile.cmake +++ /dev/null @@ -1,23 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO "Mizux/Cgl" - REF "59d95fba6605329d615d44ac7be0be2397210d5a" #stable/0.60 - SHA512 5667c59a632bf30f43dbb993b434d81599d6933ffff874bbee92f4850229b0e6b0c20deacabc31d30ffd5c7484d048df1835e4524e98162b838deb621e94a373 - HEAD_REF master -) -if (WIN32) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -endif() -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" -) - -vcpkg_cmake_install() - -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Cgl PACKAGE_NAME Cgl) - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - -vcpkg_copy_pdbs() - -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/coin-or-cgl/vcpkg.json b/ports/coin-or-cgl/vcpkg.json deleted file mode 100644 index 9c149f623..000000000 --- a/ports/coin-or-cgl/vcpkg.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "coin-or-cgl", - "version": "0.60.5", - "port-version": 0, - "description": "Fork from CGl", - "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - }, - "coin-or-clp", - "coin-or-osi", - "coinutils" - ] -} diff --git a/ports/coin-or-clp/portfile.cmake b/ports/coin-or-clp/portfile.cmake deleted file mode 100644 index 42f4ab2ce..000000000 --- a/ports/coin-or-clp/portfile.cmake +++ /dev/null @@ -1,23 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO "Mizux/Clp" - REF "914e0af16285ab6b0514947296213a0e67e80880" #stable/1.17 - SHA512 c6a90007dc3177bb37800ae5c5c632403437df3a9ee54dfecf433e4c8b2ea403047c179ffdeef33b3aeab00c7ad2d859f4f56cca4488502dca8866889d909f1f - HEAD_REF master -) -if (WIN32) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -endif() -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" -) - -vcpkg_cmake_install() - -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Clp PACKAGE_NAME Clp) - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - -vcpkg_copy_pdbs() - -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/coin-or-clp/vcpkg.json b/ports/coin-or-clp/vcpkg.json deleted file mode 100644 index bc85177d5..000000000 --- a/ports/coin-or-clp/vcpkg.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "coin-or-clp", - "version": "1.17", - "port-version": 0, - "description": "Fork from Clp", - "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - }, - "coin-or-osi", - "coinutils" - ] -} diff --git a/ports/coin-or-osi/portfile.cmake b/ports/coin-or-osi/portfile.cmake deleted file mode 100644 index 051789d43..000000000 --- a/ports/coin-or-osi/portfile.cmake +++ /dev/null @@ -1,23 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO "Mizux/Osi" - REF "d2809dd1ab01eb5c766edce7cea2ca2c1c5ecd2a" #stable/0.108 - SHA512 0b15a823666f7d381dadf360b6443fd28e9ba1f2c4c157309e10318d0a836014ec2a37bce0f0efdd9960769d839352aca0ba60f862b9c7eeaa96fabdffb7e9ca - HEAD_REF master -) -if (WIN32) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -endif() -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" -) - -vcpkg_cmake_install() - -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Osi PACKAGE_NAME Osi) - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - -vcpkg_copy_pdbs() - -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/coin-or-osi/vcpkg.json b/ports/coin-or-osi/vcpkg.json deleted file mode 100644 index c8b1ff4b3..000000000 --- a/ports/coin-or-osi/vcpkg.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "coin-or-osi", - "version": "0.108.7", - "port-version": 0, - "description": "Fork from Osi", - "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - }, - "coinutils" - ] -} diff --git a/ports/coinutils/portfile.cmake b/ports/coinutils/portfile.cmake deleted file mode 100644 index 5ae8608da..000000000 --- a/ports/coinutils/portfile.cmake +++ /dev/null @@ -1,25 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO "Mizux/CoinUtils" - REF "675cbb8e131f07705544a2e9074355cfa1a319b4" #stable 2.11 - SHA512 19e68fd43a90f3c6ba84aef90fc8b108550efee6345a3a467995791955322b531abf6e410ed656b10a353108e73d8558e9cb6e24aa93a273686e226d17381c48 - HEAD_REF master -) - -if (WIN32) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -endif() - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" -) - -vcpkg_cmake_install() - -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/CoinUtils) - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - -vcpkg_copy_pdbs() - -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/coinutils/vcpkg.json b/ports/coinutils/vcpkg.json deleted file mode 100644 index 833a6b3dc..000000000 --- a/ports/coinutils/vcpkg.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "coinutils", - "version": "2.11.6", - "port-version": 0, - "description": "Fork from CoinUtils", - "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - }, - "bzip2", - "coin-or-buildtools", - "zlib" - ], - "features": { - "glpk": { - "description": "Build with Glpk", - "dependencies": [ - { - "name": "glpk", - "default-features": false - } - ] - } - } -} diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json new file mode 100644 index 000000000..55f0c9b7b --- /dev/null +++ b/vcpkg-configuration.json @@ -0,0 +1,22 @@ +{ + "default-registry": { + "kind": "git", + "baseline": "b8a9371ae5a920b021132f443cc5658e82ac7551", + "repository": "https://github.com/microsoft/vcpkg" + }, + "registries": [ + { + "kind": "git", + "repository": "https://github.com/AntaresSimulatorTeam/antares-vcpkg-registry", + "baseline": "3fa279503f88d764778bcaacdacd3aa27e323025", + "packages": [ + "coin-or-cbc", + "coin-or-cgl", + "coin-or-clp", + "coin-or-osi", + "coinutils", + "sirius-solver" + ] + } + ] +} diff --git a/vcpkg.json b/vcpkg.json index feeab6030..3291d49e8 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,16 +1,11 @@ { "name": "antares-xpansion", "version-string": "1.3.2", - "builtin-baseline": "943c5ef1c8f6b5e6ced092b242c8299caae2ff01", - "vcpkg-configuration": { - "overlay-ports": [ - "./ports" - ] - }, "dependencies": [ "jsoncpp", "gtest", "gflags", + "sirius-solver", "coin-or-cbc", { "name": "boost-mpi",