diff --git a/ports/mlpack/fix-dependencies.patch b/ports/mlpack/fix-dependencies.patch new file mode 100644 index 00000000000000..2de2682ac416c4 --- /dev/null +++ b/ports/mlpack/fix-dependencies.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4dd92f0..bfa697d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -488,7 +488,7 @@ add_definitions(-DBOOST_TEST_DYN_LINK) + # } + # #endif + if (USE_OPENMP) +- find_package(OpenMP) ++ find_package(OpenMP REQUIRED) + endif () + + if (OPENMP_FOUND) diff --git a/ports/mlpack/portfile.cmake b/ports/mlpack/portfile.cmake index 51e2ac6f060610..058bcf9f8740a0 100644 --- a/ports/mlpack/portfile.cmake +++ b/ports/mlpack/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( cmakelists.patch fix-configure-error.patch fix-test-dependency.patch + fix-dependencies.patch ) file(REMOVE ${SOURCE_PATH}/CMake/ARMA_FindACML.cmake) @@ -22,7 +23,9 @@ file(REMOVE ${SOURCE_PATH}/CMake/ARMA_FindOpenBLAS.cmake) file(REMOVE ${SOURCE_PATH}/CMake/FindArmadillo.cmake) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - tools BUILD_CLI_EXECUTABLES + FEATURES + tools BUILD_CLI_EXECUTABLES + openmp USE_OPENMP ) vcpkg_configure_cmake( diff --git a/ports/mlpack/vcpkg.json b/ports/mlpack/vcpkg.json index 62317fa71eec19..2998ba1f5ce855 100644 --- a/ports/mlpack/vcpkg.json +++ b/ports/mlpack/vcpkg.json @@ -1,7 +1,7 @@ { "name": "mlpack", "version": "3.4.1", - "port-version": 1, + "port-version": 2, "description": "mlpack is a fast, flexible machine learning library, written in C++, that aims to provide fast, extensible implementations of cutting-edge machine learning algorithms.", "homepage": "https://github.com/mlpack/mlpack", "supports": "uwp", @@ -17,6 +17,9 @@ "stb" ], "features": { + "openmp": { + "description": "use OpenMP for parallelization." + }, "tools": { "description": "Build command-line executables." } diff --git a/versions/baseline.json b/versions/baseline.json index 1d13df61403923..f28b4b17c093ee 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4070,7 +4070,7 @@ }, "mlpack": { "baseline": "3.4.1", - "port-version": 1 + "port-version": 2 }, "mman": { "baseline": "git-f5ff813-3", diff --git a/versions/m-/mlpack.json b/versions/m-/mlpack.json index 585e56e2741986..cb0e68931db259 100644 --- a/versions/m-/mlpack.json +++ b/versions/m-/mlpack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "587ee2575ef7543ff9a0ed30e645154db26f0001", + "version": "3.4.1", + "port-version": 2 + }, { "git-tree": "4793fb5802e10e645d5d33e0ec2baf6f1a0a337b", "version": "3.4.1",