diff --git a/ports/cnl/CONTROL b/ports/cnl/CONTROL deleted file mode 100644 index ac6f8f2caa1..00000000000 --- a/ports/cnl/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: cnl -Version: 1.1.7 -Description: A Compositional Numeric Library for C++ -Homepage: https://github.com/johnmcfarlane/cnl diff --git a/ports/cnl/disable-test.patch b/ports/cnl/disable-test.patch new file mode 100644 index 00000000000..58ecad53552 --- /dev/null +++ b/ports/cnl/disable-test.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 73111fc..a0cb3db 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -9,8 +9,8 @@ project(cnl) + + cmake_minimum_required(VERSION 3.5.1) + +-include(CTest) +-add_subdirectory("test") ++# include(CTest) ++# add_subdirectory("test") + + # the CNL library + add_library(Cnl INTERFACE) diff --git a/ports/cnl/portfile.cmake b/ports/cnl/portfile.cmake index 3c54e457914..13ba7327585 100644 --- a/ports/cnl/portfile.cmake +++ b/ports/cnl/portfile.cmake @@ -5,6 +5,8 @@ vcpkg_from_github( REF 2dde6e62e608a4adc3c5504f067575efa4910568 #v1.1.7 SHA512 33a81ea726802c71a684bcd002b5119cde4db471ebc9ba02cd15c7487ab468eeca09fb8dcaed953e3f3cded2cd813a903f808d97527b0ec7f393647b64a22572 HEAD_REF main + PATCHES + disable-test.patch ) vcpkg_configure_cmake( diff --git a/ports/cnl/vcpkg.json b/ports/cnl/vcpkg.json new file mode 100644 index 00000000000..930fcdeed67 --- /dev/null +++ b/ports/cnl/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "cnl", + "version-string": "1.1.7", + "port-version": 1, + "description": "A Compositional Numeric Library for C++", + "homepage": "https://github.com/johnmcfarlane/cnl" +} diff --git a/versions/baseline.json b/versions/baseline.json index 9cbe756ae00..1a73714f950 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1326,7 +1326,7 @@ }, "cnl": { "baseline": "1.1.7", - "port-version": 0 + "port-version": 1 }, "coin": { "baseline": "4.0.0", diff --git a/versions/c-/cnl.json b/versions/c-/cnl.json index dc0a2ce0168..a7f667331c8 100644 --- a/versions/c-/cnl.json +++ b/versions/c-/cnl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3fe1aa7188d2e673265a0c1f20616bdf647c7390", + "version-string": "1.1.7", + "port-version": 1 + }, { "git-tree": "645e64c52fc7d6d9570376aba9c684ca45038f54", "version-string": "1.1.7",