From bcff929875d76ade98c251038eea6f48171facc6 Mon Sep 17 00:00:00 2001 From: Phoebe <925731795@qq.com> Date: Thu, 1 Aug 2019 04:01:02 +0800 Subject: [PATCH] Add PREFER_NINJA to many ports (#7468) * Add PREFER_NINJA to many ports --- ports/alembic/CONTROL | 2 +- ports/alembic/portfile.cmake | 1 + ports/ampl-mp/CONTROL | 2 +- ports/ampl-mp/portfile.cmake | 1 + ports/anax/CONTROL | 2 +- ports/anax/portfile.cmake | 1 + ports/apr/CONTROL | 2 +- ports/apr/portfile.cmake | 1 + ports/azure-storage-cpp/CONTROL | 2 +- ports/azure-storage-cpp/portfile.cmake | 1 + ports/basisu/CONTROL | 2 +- ports/basisu/portfile.cmake | 1 + ports/blosc/CONTROL | 2 +- ports/blosc/portfile.cmake | 1 + ports/bullet3/CONTROL | 2 +- ports/bullet3/portfile.cmake | 1 + ports/capnproto/CONTROL | 2 +- ports/capnproto/portfile.cmake | 5 ++++- ports/cgicc/CONTROL | 2 +- ports/cgicc/portfile.cmake | 1 + ports/charls/CONTROL | 2 +- ports/charls/portfile.cmake | 1 + ports/collada-dom/CONTROL | 2 +- ports/collada-dom/portfile.cmake | 1 + ports/ctemplate/CONTROL | 2 +- ports/ctemplate/portfile.cmake | 1 + ports/dlfcn-win32/CONTROL | 2 +- ports/dlfcn-win32/portfile.cmake | 1 + ports/duktape/CONTROL | 2 +- ports/duktape/portfile.cmake | 1 + ports/easyloggingpp/CONTROL | 2 +- ports/easyloggingpp/portfile.cmake | 1 + ports/ecm/CONTROL | 2 +- ports/ecm/portfile.cmake | 1 + ports/fastfeat/CONTROL | 2 +- ports/fastfeat/portfile.cmake | 1 + ports/fastlz/CONTROL | 2 +- ports/fastlz/portfile.cmake | 1 + ports/freeglut/CONTROL | 2 +- ports/freeglut/portfile.cmake | 1 + ports/gherkin-c/CONTROL | 2 +- ports/gherkin-c/portfile.cmake | 1 + ports/gl2ps/CONTROL | 2 +- ports/gl2ps/portfile.cmake | 1 + ports/glbinding/CONTROL | 2 +- ports/glbinding/portfile.cmake | 1 + ports/glew/CONTROL | 2 +- ports/glew/portfile.cmake | 1 + ports/glfw3/CONTROL | 2 +- ports/glfw3/portfile.cmake | 1 + ports/graphicsmagick/CONTROL | 2 +- ports/graphicsmagick/portfile.cmake | 1 + ports/hypre/CONTROL | 2 +- ports/hypre/portfile.cmake | 1 + ports/jack2/CONTROL | 2 +- ports/jack2/portfile.cmake | 1 + ports/jxrlib/CONTROL | 2 +- ports/jxrlib/portfile.cmake | 1 + ports/kangaru/CONTROL | 2 +- ports/kangaru/portfile.cmake | 1 + ports/leaf/CONTROL | 2 +- ports/leaf/portfile.cmake | 1 + ports/libconfig/CONTROL | 2 +- ports/libconfig/portfile.cmake | 1 + ports/libfreenect2/CONTROL | 2 +- ports/libfreenect2/portfile.cmake | 1 + ports/libmad/CONTROL | 2 +- ports/libmad/portfile.cmake | 1 + ports/libmariadb/CONTROL | 2 +- ports/libmariadb/portfile.cmake | 1 + ports/libmspack/CONTROL | 2 +- ports/libmspack/portfile.cmake | 1 + ports/libnice/CONTROL | 2 +- ports/libnice/portfile.cmake | 1 + ports/libodb-boost/CONTROL | 2 +- ports/libodb-boost/portfile.cmake | 1 + ports/libodb-mysql/CONTROL | 2 +- ports/libodb-mysql/portfile.cmake | 1 + ports/libodb-pgsql/CONTROL | 2 +- ports/libodb-pgsql/portfile.cmake | 1 + ports/libodb-sqlite/CONTROL | 2 +- ports/libodb-sqlite/portfile.cmake | 1 + ports/libodb/CONTROL | 2 +- ports/libodb/portfile.cmake | 1 + ports/librabbitmq/CONTROL | 2 +- ports/librabbitmq/portfile.cmake | 1 + ports/libsamplerate/CONTROL | 2 +- ports/libsamplerate/portfile.cmake | 1 + ports/libwebsockets/CONTROL | 2 +- ports/libwebsockets/portfile.cmake | 1 + ports/lmdb/CONTROL | 2 +- ports/lmdb/portfile.cmake | 1 + ports/metis/CONTROL | 2 +- ports/metis/portfile.cmake | 1 + ports/mozjpeg/CONTROL | 2 +- ports/mozjpeg/portfile.cmake | 1 + ports/nanodbc/CONTROL | 2 +- ports/nanodbc/portfile.cmake | 1 + ports/nmslib/CONTROL | 2 +- ports/nmslib/portfile.cmake | 1 + ports/parmetis/CONTROL | 2 +- ports/parmetis/portfile.cmake | 1 + ports/plibsys/CONTROL | 2 +- ports/plibsys/portfile.cmake | 1 + ports/proj4/CONTROL | 2 +- ports/proj4/portfile.cmake | 1 + ports/pugixml/CONTROL | 2 +- ports/pugixml/portfile.cmake | 1 + ports/ragel/CONTROL | 2 +- ports/ragel/portfile.cmake | 1 + ports/re2/CONTROL | 2 +- ports/re2/portfile.cmake | 1 + ports/recast/CONTROL | 2 +- ports/recast/portfile.cmake | 1 + ports/sdl2-gfx/CONTROL | 2 +- ports/sdl2-gfx/portfile.cmake | 1 + ports/septag-sx/CONTROL | 2 +- ports/septag-sx/portfile.cmake | 1 + ports/sfml/CONTROL | 2 +- ports/sfml/portfile.cmake | 1 + ports/shaderc/CONTROL | 2 +- ports/shaderc/portfile.cmake | 1 + ports/signalrclient/CONTROL | 2 +- ports/signalrclient/portfile.cmake | 1 + ports/so5extra/CONTROL | 2 +- ports/so5extra/portfile.cmake | 1 + ports/spaceland/CONTROL | 2 +- ports/spaceland/portfile.cmake | 1 + ports/speexdsp/CONTROL | 2 +- ports/speexdsp/portfile.cmake | 1 + ports/sqlpp11-connector-mysql/CONTROL | 2 +- ports/sqlpp11-connector-mysql/portfile.cmake | 1 + ports/sqlpp11-connector-sqlite3/CONTROL | 2 +- ports/sqlpp11-connector-sqlite3/portfile.cmake | 1 + ports/sqlpp11/CONTROL | 2 +- ports/sqlpp11/portfile.cmake | 1 + ports/stlab/CONTROL | 2 +- ports/stlab/portfile.cmake | 1 + ports/stxxl/CONTROL | 2 +- ports/stxxl/portfile.cmake | 1 + ports/sundials/CONTROL | 2 +- ports/sundials/portfile.cmake | 1 + ports/szip/CONTROL | 2 +- ports/szip/portfile.cmake | 1 + ports/tinyxml2/CONTROL | 2 +- ports/tinyxml2/portfile.cmake | 1 + ports/tsl-hopscotch-map/CONTROL | 2 +- ports/tsl-hopscotch-map/portfile.cmake | 1 + ports/tsl-ordered-map/CONTROL | 2 +- ports/tsl-ordered-map/portfile.cmake | 1 + ports/tsl-sparse-map/CONTROL | 2 +- ports/tsl-sparse-map/portfile.cmake | 1 + ports/usd/CONTROL | 2 +- ports/usd/portfile.cmake | 1 + ports/xlnt/CONTROL | 2 +- ports/xlnt/portfile.cmake | 1 + ports/yato/CONTROL | 2 +- ports/yato/portfile.cmake | 1 + 158 files changed, 161 insertions(+), 80 deletions(-) diff --git a/ports/alembic/CONTROL b/ports/alembic/CONTROL index a1a47a3ff9..a705d3f2c3 100644 --- a/ports/alembic/CONTROL +++ b/ports/alembic/CONTROL @@ -1,5 +1,5 @@ Source: alembic -Version: 1.7.11-2 +Version: 1.7.11-3 Build-Depends: ilmbase, hdf5 Description: Alembic is an open framework for storing and sharing scene data that includes a C++ library, a file format, and client plugins and applications. Homepage: https://alembic.io/ diff --git a/ports/alembic/portfile.cmake b/ports/alembic/portfile.cmake index 8b3e8568d0..b26f07ef8e 100644 --- a/ports/alembic/portfile.cmake +++ b/ports/alembic/portfile.cmake @@ -23,6 +23,7 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS -DUSE_HDF5=ON -DHDF5_ROOT=${CURRENT_INSTALLED_DIR} diff --git a/ports/ampl-mp/CONTROL b/ports/ampl-mp/CONTROL index 84523e2814..d45564c4f3 100644 --- a/ports/ampl-mp/CONTROL +++ b/ports/ampl-mp/CONTROL @@ -1,3 +1,3 @@ Source: ampl-mp -Version: 2019-03-21 +Version: 2019-03-21-1 Description: An open-source library for mathematical programming diff --git a/ports/ampl-mp/portfile.cmake b/ports/ampl-mp/portfile.cmake index dafdb10fd4..00d577e56a 100644 --- a/ports/ampl-mp/portfile.cmake +++ b/ports/ampl-mp/portfile.cmake @@ -20,6 +20,7 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS -DBUILD=asl -DBUILD_TESTING=OFF diff --git a/ports/anax/CONTROL b/ports/anax/CONTROL index 14b10c9af9..a672637cf6 100644 --- a/ports/anax/CONTROL +++ b/ports/anax/CONTROL @@ -1,4 +1,4 @@ Source: anax -Version: 2.1.0-5 +Version: 2.1.0-6 Description: An open source C++ entity system. Homepage: https://github.com/miguelmartin75/anax diff --git a/ports/anax/portfile.cmake b/ports/anax/portfile.cmake index 346e45edb1..bdecbf39e5 100644 --- a/ports/anax/portfile.cmake +++ b/ports/anax/portfile.cmake @@ -14,6 +14,7 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA DISABLE_PARALLEL_CONFIGURE ) diff --git a/ports/apr/CONTROL b/ports/apr/CONTROL index 7a35c5b48d..41c7c453ac 100644 --- a/ports/apr/CONTROL +++ b/ports/apr/CONTROL @@ -1,5 +1,5 @@ Source: apr -Version: 1.6.5-1 +Version: 1.6.5-2 Homepage: https://apr.apache.org/ Description: The Apache Portable Runtime (APR) is a C library that forms a system portability layer that covers many operating systems. diff --git a/ports/apr/portfile.cmake b/ports/apr/portfile.cmake index 1e9de7ffb6..6ef062bf36 100644 --- a/ports/apr/portfile.cmake +++ b/ports/apr/portfile.cmake @@ -22,6 +22,7 @@ endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS -DINSTALL_PDB=OFF -DMIN_WINDOWS_VER=Windows7 diff --git a/ports/azure-storage-cpp/CONTROL b/ports/azure-storage-cpp/CONTROL index 91c155f004..563c3d15fc 100644 --- a/ports/azure-storage-cpp/CONTROL +++ b/ports/azure-storage-cpp/CONTROL @@ -1,5 +1,5 @@ Source: azure-storage-cpp -Version: 6.1.0-1 +Version: 6.1.0-2 Build-Depends: cpprestsdk[core], atlmfc (windows), boost-log (!windows&!uwp), boost-locale (!windows&!uwp), libxml2 (!windows&!uwp), libuuid (!windows&!uwp&!osx), gettext Description: Microsoft Azure Storage Client SDK for C++ A client library for working with Microsoft Azure storage services including blobs, files, tables, and queues. This client library enables working with the Microsoft Azure storage services which include the blob service for storing binary and text data, the file service for storing binary and text data, the table service for storing structured non-relational data, and the queue service for storing messages that may be accessed by a client. diff --git a/ports/azure-storage-cpp/portfile.cmake b/ports/azure-storage-cpp/portfile.cmake index c0909bff3e..b558fa51d5 100644 --- a/ports/azure-storage-cpp/portfile.cmake +++ b/ports/azure-storage-cpp/portfile.cmake @@ -18,6 +18,7 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH}/Microsoft.WindowsAzure.Storage + PREFER_NINJA OPTIONS -DCMAKE_FIND_FRAMEWORK=LAST -DBUILD_TESTS=OFF diff --git a/ports/basisu/CONTROL b/ports/basisu/CONTROL index f514dbf251..f31edab077 100644 --- a/ports/basisu/CONTROL +++ b/ports/basisu/CONTROL @@ -1,5 +1,5 @@ Source: basisu -Version: 0.0.1 +Version: 0.0.1-1 Homepage: https://github.com/BinomialLLC/basis_universal Description: Basis Universal is a supercompressed GPU texture and video compression format that outputs a highly compressed intermediate file format (.basis) that can be quickly transcoded to a wide variety of GPU texture compression formats. Build-Depends: lodepng \ No newline at end of file diff --git a/ports/basisu/portfile.cmake b/ports/basisu/portfile.cmake index 02956b584e..7882f0d226 100644 --- a/ports/basisu/portfile.cmake +++ b/ports/basisu/portfile.cmake @@ -10,6 +10,7 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS -DBUILD_TESTS=OFF ) diff --git a/ports/blosc/CONTROL b/ports/blosc/CONTROL index 4dc7bf81f8..f2558ab41c 100644 --- a/ports/blosc/CONTROL +++ b/ports/blosc/CONTROL @@ -1,5 +1,5 @@ Source: blosc -Version: 1.16.3-1 +Version: 1.16.3-2 Build-Depends: lz4, snappy, zlib, zstd Homepage: https://github.com/Blosc/c-blosc Description: A blocking, shuffling and loss-less compression library that can be faster than `memcpy()` diff --git a/ports/blosc/portfile.cmake b/ports/blosc/portfile.cmake index 367c591944..c8fad02b2d 100644 --- a/ports/blosc/portfile.cmake +++ b/ports/blosc/portfile.cmake @@ -20,6 +20,7 @@ file(REMOVE_RECURSE ${SOURCE_PATH}/internal-complibs) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS -DPREFER_EXTERNAL_LZ4=ON -DPREFER_EXTERNAL_SNAPPY=ON -DPREFER_EXTERNAL_ZLIB=ON diff --git a/ports/bullet3/CONTROL b/ports/bullet3/CONTROL index 512b5d527f..d313255a5e 100644 --- a/ports/bullet3/CONTROL +++ b/ports/bullet3/CONTROL @@ -1,5 +1,5 @@ Source: bullet3 -Version: 2.88 +Version: 2.88-1 Homepage: https://github.com/bulletphysics/bullet3 Description: Bullet Physics is a professional collision detection, rigid body, and soft body dynamics library diff --git a/ports/bullet3/portfile.cmake b/ports/bullet3/portfile.cmake index fc3e7bc343..031ddf23fa 100644 --- a/ports/bullet3/portfile.cmake +++ b/ports/bullet3/portfile.cmake @@ -17,6 +17,7 @@ endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS -DUSE_MSVC_RUNTIME_LIBRARY_DLL=ON -DBUILD_DEMOS=OFF diff --git a/ports/capnproto/CONTROL b/ports/capnproto/CONTROL index 694469b1fb..02cc080f17 100644 --- a/ports/capnproto/CONTROL +++ b/ports/capnproto/CONTROL @@ -1,5 +1,5 @@ Source: capnproto -Version: 0.7.0-2 +Version: 0.7.0-3 Description: Data interchange format and capability-based RPC system Homepage: https://capnproto.org/ Build-Depends: zlib diff --git a/ports/capnproto/portfile.cmake b/ports/capnproto/portfile.cmake index 5c189acc7f..4e149a0356 100644 --- a/ports/capnproto/portfile.cmake +++ b/ports/capnproto/portfile.cmake @@ -15,7 +15,10 @@ vcpkg_from_github( PATCHES "${CMAKE_CURRENT_LIST_DIR}/0001-fix-capnpc-extension-handling-on-Windows.patch" ) -vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH}) +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) vcpkg_install_cmake() diff --git a/ports/cgicc/CONTROL b/ports/cgicc/CONTROL index 9e18277a9a..1e3716e0e8 100644 --- a/ports/cgicc/CONTROL +++ b/ports/cgicc/CONTROL @@ -1,4 +1,4 @@ Source: cgicc -Version: 3.2.19-1 +Version: 3.2.19-2 Homepage: https://www.gnu.org/software/cgicc/ Description: GNU Cgicc is an ANSI C++ compliant class library that greatly simplifies the creation of CGI applications for the World Wide Web diff --git a/ports/cgicc/portfile.cmake b/ports/cgicc/portfile.cmake index 58a9708771..24447e884a 100644 --- a/ports/cgicc/portfile.cmake +++ b/ports/cgicc/portfile.cmake @@ -15,6 +15,7 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON -DDISABLE_INSTALL_TOOLS=ON ) diff --git a/ports/charls/CONTROL b/ports/charls/CONTROL index 00f6777a4a..e8fabbf228 100644 --- a/ports/charls/CONTROL +++ b/ports/charls/CONTROL @@ -1,4 +1,4 @@ Source: charls -Version: 2.0.0-1 +Version: 2.0.0-2 Homepage: https://github.com/team-charls/charls Description: CharLS, a C++ JPEG-LS library implementation. diff --git a/ports/charls/portfile.cmake b/ports/charls/portfile.cmake index 69726f1c38..0f622c7e31 100644 --- a/ports/charls/portfile.cmake +++ b/ports/charls/portfile.cmake @@ -15,6 +15,7 @@ vcpkg_apply_patches( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS -DBUILD_TESTING=OFF ) diff --git a/ports/collada-dom/CONTROL b/ports/collada-dom/CONTROL index 952f4ae504..31ded72532 100644 --- a/ports/collada-dom/CONTROL +++ b/ports/collada-dom/CONTROL @@ -1,4 +1,4 @@ Source: collada-dom -Version: 2.5.0-1 +Version: 2.5.0-2 Description: The COLLADA Document Object Model (DOM) is an application programming interface (API) that provides a C++ object representation of a COLLADA XML instance document. Build-Depends: zlib, libxml2, minizip, pcre, uriparser, boost-filesystem, boost-system diff --git a/ports/collada-dom/portfile.cmake b/ports/collada-dom/portfile.cmake index f36d8e4a95..20ee9fffad 100644 --- a/ports/collada-dom/portfile.cmake +++ b/ports/collada-dom/portfile.cmake @@ -14,6 +14,7 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA ) vcpkg_install_cmake() diff --git a/ports/ctemplate/CONTROL b/ports/ctemplate/CONTROL index d5fadf3ead..00abc1f960 100644 --- a/ports/ctemplate/CONTROL +++ b/ports/ctemplate/CONTROL @@ -1,4 +1,4 @@ Source: ctemplate -Version: 2017-06-23-44b7c5-3 +Version: 2017-06-23-44b7c5-4 Homepage: https://github.com/OlafvdSpek/ctemplate Description: C++ CTemplate system diff --git a/ports/ctemplate/portfile.cmake b/ports/ctemplate/portfile.cmake index d22c3afa40..d5d8b39608 100644 --- a/ports/ctemplate/portfile.cmake +++ b/ports/ctemplate/portfile.cmake @@ -14,6 +14,7 @@ vcpkg_find_acquire_program(PYTHON3) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS -DPYTHON_EXECUTABLE=${PYTHON3} OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON ) diff --git a/ports/dlfcn-win32/CONTROL b/ports/dlfcn-win32/CONTROL index 24af3631fc..453ecf9e4d 100644 --- a/ports/dlfcn-win32/CONTROL +++ b/ports/dlfcn-win32/CONTROL @@ -1,4 +1,4 @@ Source: dlfcn-win32 -Version: 1.1.1-1 +Version: 1.1.1-2 Homepage: https://github.com/dlfcn-win32/dlfcn-win32 Description: dlfcn-win32 is an implementation of dlfcn for Windows. diff --git a/ports/dlfcn-win32/portfile.cmake b/ports/dlfcn-win32/portfile.cmake index 77fd87b12e..d67fb00fe1 100644 --- a/ports/dlfcn-win32/portfile.cmake +++ b/ports/dlfcn-win32/portfile.cmake @@ -22,6 +22,7 @@ vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA ) vcpkg_install_cmake() diff --git a/ports/duktape/CONTROL b/ports/duktape/CONTROL index 5f212d705a..08c822fadf 100644 --- a/ports/duktape/CONTROL +++ b/ports/duktape/CONTROL @@ -1,5 +1,5 @@ Source: duktape -Version: 2.3.0-1 +Version: 2.3.0-2 Homepage: https://github.com/svaarala/duktape Description: Embeddable Javascript engine with a focus on portability and compact footprint. Build-Depends: diff --git a/ports/duktape/portfile.cmake b/ports/duktape/portfile.cmake index e15ca137b5..fe2c9a494e 100644 --- a/ports/duktape/portfile.cmake +++ b/ports/duktape/portfile.cmake @@ -48,6 +48,7 @@ vcpkg_apply_patches( ) vcpkg_configure_cmake( + PREFER_NINJA SOURCE_PATH ${SOURCE_PATH} ) diff --git a/ports/easyloggingpp/CONTROL b/ports/easyloggingpp/CONTROL index 9e2427ff91..a10dbb2d66 100644 --- a/ports/easyloggingpp/CONTROL +++ b/ports/easyloggingpp/CONTROL @@ -1,3 +1,3 @@ Source: easyloggingpp -Version: 9.96.7 +Version: 9.96.7-1 Description: Easylogging++ is a single header efficient logging library for C++ applications. \ No newline at end of file diff --git a/ports/easyloggingpp/portfile.cmake b/ports/easyloggingpp/portfile.cmake index 8294e0a817..56ba406b73 100644 --- a/ports/easyloggingpp/portfile.cmake +++ b/ports/easyloggingpp/portfile.cmake @@ -12,6 +12,7 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS -Dbuild_static_lib=ON ) diff --git a/ports/ecm/CONTROL b/ports/ecm/CONTROL index 05595fcfe1..4f98c2290e 100644 --- a/ports/ecm/CONTROL +++ b/ports/ecm/CONTROL @@ -1,4 +1,4 @@ Source: ecm -Version: 5.60.0 +Version: 5.60.0-1 Homepage: https://github.com/KDE/extra-cmake-modules Description: Extra CMake Modules (ECM), extra modules and scripts for CMake diff --git a/ports/ecm/portfile.cmake b/ports/ecm/portfile.cmake index 14419c1747..ab92b30862 100644 --- a/ports/ecm/portfile.cmake +++ b/ports/ecm/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS -DBUILD_HTML_DOCS=OFF -DBUILD_MAN_DOCS=OFF -DBUILD_QTHELP_DOCS=OFF diff --git a/ports/fastfeat/CONTROL b/ports/fastfeat/CONTROL index ff76128fcc..9349930346 100644 --- a/ports/fastfeat/CONTROL +++ b/ports/fastfeat/CONTROL @@ -1,3 +1,3 @@ Source: fastfeat -Version: 391d5e9 +Version: 391d5e9-1 Description: FAST feature detectors in C diff --git a/ports/fastfeat/portfile.cmake b/ports/fastfeat/portfile.cmake index 95d178ea4c..7fd35b9f84 100644 --- a/ports/fastfeat/portfile.cmake +++ b/ports/fastfeat/portfile.cmake @@ -17,6 +17,7 @@ DESTINATION ${SOURCE_PATH} vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON ) diff --git a/ports/fastlz/CONTROL b/ports/fastlz/CONTROL index 4154ea9533..98b53557e3 100644 --- a/ports/fastlz/CONTROL +++ b/ports/fastlz/CONTROL @@ -1,4 +1,4 @@ Source: fastlz -Version: 1.0-2 +Version: 1.0-3 Homepage: https://github.com/ariya/FastLZ Description: A lightning-fast lossless compression library diff --git a/ports/fastlz/portfile.cmake b/ports/fastlz/portfile.cmake index 857dd7d0bb..38c71aaded 100644 --- a/ports/fastlz/portfile.cmake +++ b/ports/fastlz/portfile.cmake @@ -14,6 +14,7 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA ) vcpkg_install_cmake() diff --git a/ports/freeglut/CONTROL b/ports/freeglut/CONTROL index 1ee44b7f37..7489109c49 100644 --- a/ports/freeglut/CONTROL +++ b/ports/freeglut/CONTROL @@ -1,4 +1,4 @@ Source: freeglut -Version: 3.0.0-6 +Version: 3.0.0-7 Homepage: https://sourceforge.net/projects/freeglut/ Description: Open source implementation of GLUT with source and binary backwards compatibility. diff --git a/ports/freeglut/portfile.cmake b/ports/freeglut/portfile.cmake index 86d6915939..ab95e3165a 100644 --- a/ports/freeglut/portfile.cmake +++ b/ports/freeglut/portfile.cmake @@ -36,6 +36,7 @@ file(WRITE ${SOURCE_PATH}/include/GL/freeglut_std.h "${FREEGLUT_STDH}") vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS -DFREEGLUT_BUILD_STATIC_LIBS=${FREEGLUT_STATIC} -DFREEGLUT_BUILD_SHARED_LIBS=${FREEGLUT_DYNAMIC} diff --git a/ports/gherkin-c/CONTROL b/ports/gherkin-c/CONTROL index 3ded484441..e1533180f8 100644 --- a/ports/gherkin-c/CONTROL +++ b/ports/gherkin-c/CONTROL @@ -1,3 +1,3 @@ Source: gherkin-c -Version: 2019-10-07 +Version: 2019-10-07-1 Description: Gherkin parser/compiler in C diff --git a/ports/gherkin-c/portfile.cmake b/ports/gherkin-c/portfile.cmake index 04e104235a..adb13076d8 100644 --- a/ports/gherkin-c/portfile.cmake +++ b/ports/gherkin-c/portfile.cmake @@ -10,6 +10,7 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS -DBUILD_GHERKIN_TESTS=OFF ) diff --git a/ports/gl2ps/CONTROL b/ports/gl2ps/CONTROL index b4721a1138..deb9483aaf 100644 --- a/ports/gl2ps/CONTROL +++ b/ports/gl2ps/CONTROL @@ -1,5 +1,5 @@ Source: gl2ps -Version: 1.4.0-2 +Version: 1.4.0-3 Homepage: https://gitlab.onelab.info/gl2ps/gl2ps Description: OpenGL to PostScript Printing Library Build-Depends: freeglut, zlib, libpng diff --git a/ports/gl2ps/portfile.cmake b/ports/gl2ps/portfile.cmake index c1568b443f..eaee562705 100644 --- a/ports/gl2ps/portfile.cmake +++ b/ports/gl2ps/portfile.cmake @@ -12,6 +12,7 @@ vcpkg_from_gitlab( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON ) diff --git a/ports/glbinding/CONTROL b/ports/glbinding/CONTROL index 016283ca94..5bef7210a1 100644 --- a/ports/glbinding/CONTROL +++ b/ports/glbinding/CONTROL @@ -1,5 +1,5 @@ Source: glbinding -Version: 3.1.0-1 +Version: 3.1.0-2 Description: glbinding is an MIT licensed, cross-platform C++ binding for the OpenGL API Homepage: https://github.com/cginternals/glbinding Build-Depends: egl-registry diff --git a/ports/glbinding/portfile.cmake b/ports/glbinding/portfile.cmake index d9fb5c0b21..863426282b 100644 --- a/ports/glbinding/portfile.cmake +++ b/ports/glbinding/portfile.cmake @@ -14,6 +14,7 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS -DOPTION_BUILD_TESTS=OFF -DOPTION_BUILD_GPU_TESTS=OFF diff --git a/ports/glew/CONTROL b/ports/glew/CONTROL index 8d336de5a3..41df4d08ce 100644 --- a/ports/glew/CONTROL +++ b/ports/glew/CONTROL @@ -1,4 +1,4 @@ Source: glew -Version: 2.1.0-4 +Version: 2.1.0-5 Description: The OpenGL Extension Wrangler Library (GLEW) is a cross-platform open-source C/C++ extension loading library. Homepage: https://github.com/nigels-com/glew diff --git a/ports/glew/portfile.cmake b/ports/glew/portfile.cmake index 2637b20913..818ee52ea8 100644 --- a/ports/glew/portfile.cmake +++ b/ports/glew/portfile.cmake @@ -18,6 +18,7 @@ vcpkg_extract_source_archive_ex( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH}/build/cmake + PREFER_NINJA DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_UTILS=OFF diff --git a/ports/glfw3/CONTROL b/ports/glfw3/CONTROL index 361820820e..6cbc41564a 100644 --- a/ports/glfw3/CONTROL +++ b/ports/glfw3/CONTROL @@ -1,4 +1,4 @@ Source: glfw3 -Version: 3.3 +Version: 3.3-1 Homepage: https://github.com/glfw/glfw Description: GLFW is a free, Open Source, multi-platform library for OpenGL, OpenGL ES and Vulkan application development. It provides a simple, platform-independent API for creating windows, contexts and surfaces, reading input, handling events, etc. diff --git a/ports/glfw3/portfile.cmake b/ports/glfw3/portfile.cmake index ea3e4eaec7..c8948628fe 100644 --- a/ports/glfw3/portfile.cmake +++ b/ports/glfw3/portfile.cmake @@ -20,6 +20,7 @@ endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS -DGLFW_BUILD_EXAMPLES=OFF -DGLFW_BUILD_TESTS=OFF diff --git a/ports/graphicsmagick/CONTROL b/ports/graphicsmagick/CONTROL index 631fd52f3c..350ccd1785 100644 --- a/ports/graphicsmagick/CONTROL +++ b/ports/graphicsmagick/CONTROL @@ -1,6 +1,6 @@ Source: graphicsmagick Maintainer: josuegomes@gmail.com -Version: 1.3.32 +Version: 1.3.32-1 Build-Depends: zlib, bzip2, freetype, libjpeg-turbo, libpng, tiff Homepage: https://sourceforge.net/projects/graphicsmagick/ Description: Image processing library diff --git a/ports/graphicsmagick/portfile.cmake b/ports/graphicsmagick/portfile.cmake index b976bfbee0..1764b30e72 100644 --- a/ports/graphicsmagick/portfile.cmake +++ b/ports/graphicsmagick/portfile.cmake @@ -28,6 +28,7 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/magick_types.h DESTINATION ${SOURCE_PATH}/ma vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS_DEBUG -DINSTALL_HEADERS=OFF ) diff --git a/ports/hypre/CONTROL b/ports/hypre/CONTROL index 907e64b87b..6151eca3b5 100644 --- a/ports/hypre/CONTROL +++ b/ports/hypre/CONTROL @@ -1,5 +1,5 @@ Source: hypre -Version: 2.11.2-1 +Version: 2.11.2-2 Homepage: https://computation.llnl.gov/projects/hypre-scalable-linear-solvers-multigrid-methods Description: SCALABLE LINEAR SOLVERS AND MULTIGRID METHODS Build-Depends: msmpi diff --git a/ports/hypre/portfile.cmake b/ports/hypre/portfile.cmake index a0b38216e7..f8ab07b9d0 100644 --- a/ports/hypre/portfile.cmake +++ b/ports/hypre/portfile.cmake @@ -25,6 +25,7 @@ endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS ${OPTIONS} OPTIONS_RELEASE diff --git a/ports/jack2/CONTROL b/ports/jack2/CONTROL index d665dbe241..fb3fed91fa 100644 --- a/ports/jack2/CONTROL +++ b/ports/jack2/CONTROL @@ -1,5 +1,5 @@ Source: jack2 -Version: 1.9.12-1 +Version: 1.9.12-2 Homepage: https://github.com/jackaudio/jack2 Description: Cross-platform API that enables device sharing and inter-application audio routing diff --git a/ports/jack2/portfile.cmake b/ports/jack2/portfile.cmake index f7109aafdc..3cb59189e5 100644 --- a/ports/jack2/portfile.cmake +++ b/ports/jack2/portfile.cmake @@ -15,6 +15,7 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA ) vcpkg_install_cmake() diff --git a/ports/jxrlib/CONTROL b/ports/jxrlib/CONTROL index f104c4c844..8ed2805a4f 100644 --- a/ports/jxrlib/CONTROL +++ b/ports/jxrlib/CONTROL @@ -1,4 +1,4 @@ Source: jxrlib -Version: 1.1-7 +Version: 1.1-8 Homepage: https://github.com/4creators/jxrlib Description: Open source implementation of the jpegxr image format standard. diff --git a/ports/jxrlib/portfile.cmake b/ports/jxrlib/portfile.cmake index 43358fa154..76b0f61fa6 100644 --- a/ports/jxrlib/portfile.cmake +++ b/ports/jxrlib/portfile.cmake @@ -22,6 +22,7 @@ endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA ) vcpkg_install_cmake() diff --git a/ports/kangaru/CONTROL b/ports/kangaru/CONTROL index 6990d51902..81289a286e 100644 --- a/ports/kangaru/CONTROL +++ b/ports/kangaru/CONTROL @@ -1,3 +1,3 @@ Source: kangaru -Version: 4.1.3-1 +Version: 4.1.3-2 Description: A dependency injection container for C++11, C++14 and later diff --git a/ports/kangaru/portfile.cmake b/ports/kangaru/portfile.cmake index 15af5ded0c..cc49b66690 100644 --- a/ports/kangaru/portfile.cmake +++ b/ports/kangaru/portfile.cmake @@ -10,6 +10,7 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS -DKANGARU_EXPORT=Off -DKANGARU_TEST=Off ) diff --git a/ports/leaf/CONTROL b/ports/leaf/CONTROL index 27db9dc33e..d85d93d9af 100644 --- a/ports/leaf/CONTROL +++ b/ports/leaf/CONTROL @@ -1,3 +1,3 @@ Source: leaf -Version: 0.2.1-1 +Version: 0.2.1-2 Description: Lightweight error augmentation framework \ No newline at end of file diff --git a/ports/leaf/portfile.cmake b/ports/leaf/portfile.cmake index 64d6ae50e3..1ff5e1e536 100644 --- a/ports/leaf/portfile.cmake +++ b/ports/leaf/portfile.cmake @@ -10,6 +10,7 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA ) vcpkg_install_cmake() diff --git a/ports/libconfig/CONTROL b/ports/libconfig/CONTROL index 8b64a280e0..3cbedcf5c4 100644 --- a/ports/libconfig/CONTROL +++ b/ports/libconfig/CONTROL @@ -1,4 +1,4 @@ Source: libconfig -Version: 1.7.2 +Version: 1.7.2-1 Homepage: https://github.com/hyperrealm/libconfig Description: C/C++ library for processing configuration files diff --git a/ports/libconfig/portfile.cmake b/ports/libconfig/portfile.cmake index 9456636a93..a3958d342d 100644 --- a/ports/libconfig/portfile.cmake +++ b/ports/libconfig/portfile.cmake @@ -13,6 +13,7 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON ) diff --git a/ports/libfreenect2/CONTROL b/ports/libfreenect2/CONTROL index bb0b638717..6734e25cc6 100644 --- a/ports/libfreenect2/CONTROL +++ b/ports/libfreenect2/CONTROL @@ -1,5 +1,5 @@ Source: libfreenect2 -Version: 0.2.0-2 +Version: 0.2.0-3 Build-Depends: libusb, libjpeg-turbo Homepage: https://github.com/OpenKinect/libfreenect2 Description: Open source drivers for the Kinect for Windows v2 device diff --git a/ports/libfreenect2/portfile.cmake b/ports/libfreenect2/portfile.cmake index 839c7073ea..9ca8867fb3 100644 --- a/ports/libfreenect2/portfile.cmake +++ b/ports/libfreenect2/portfile.cmake @@ -20,6 +20,7 @@ file(WRITE ${SOURCE_PATH}/examples/CMakeLists.txt "${EXAMPLECMAKE}") vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS -DENABLE_CUDA=OFF ) diff --git a/ports/libmad/CONTROL b/ports/libmad/CONTROL index ae26eebab3..e3adc42be8 100644 --- a/ports/libmad/CONTROL +++ b/ports/libmad/CONTROL @@ -1,3 +1,3 @@ Source: libmad -Version: 0.15.1-2 +Version: 0.15.1-3 Description: high-quality MPEG audio decoder diff --git a/ports/libmad/portfile.cmake b/ports/libmad/portfile.cmake index cc50279631..9c1f43b56e 100644 --- a/ports/libmad/portfile.cmake +++ b/ports/libmad/portfile.cmake @@ -24,6 +24,7 @@ file(COPY ${SOURCE_PATH}/msvc++/mad.h DESTINATION ${SOURCE_PATH}) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA ) vcpkg_install_cmake() diff --git a/ports/libmariadb/CONTROL b/ports/libmariadb/CONTROL index 887a52ed02..0e3327bb4c 100644 --- a/ports/libmariadb/CONTROL +++ b/ports/libmariadb/CONTROL @@ -1,4 +1,4 @@ Source: libmariadb -Version: 3.0.10-2 +Version: 3.0.10-3 Homepage: https://github.com/MariaDB/mariadb-connector-c Description: MariaDB Connector/C is used to connect C/C++ applications to MariaDB and MySQL databases diff --git a/ports/libmariadb/portfile.cmake b/ports/libmariadb/portfile.cmake index 5fab1502c8..ebf8b9f24e 100644 --- a/ports/libmariadb/portfile.cmake +++ b/ports/libmariadb/portfile.cmake @@ -19,6 +19,7 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS -DWITH_UNITTEST=OFF -DWITH_SSL=OFF diff --git a/ports/libmspack/CONTROL b/ports/libmspack/CONTROL index de476a430c..c81f19005f 100644 --- a/ports/libmspack/CONTROL +++ b/ports/libmspack/CONTROL @@ -1,5 +1,5 @@ Source: libmspack -Version: 0.10.1 +Version: 0.10.1-1 Build-Depends: Homepage: https://www.cabextract.org.uk/libmspack Description: libmspack is a portable library for some loosely related Microsoft compression formats. diff --git a/ports/libmspack/portfile.cmake b/ports/libmspack/portfile.cmake index 759f017248..b476ad9a62 100644 --- a/ports/libmspack/portfile.cmake +++ b/ports/libmspack/portfile.cmake @@ -18,6 +18,7 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/libmspack.def DESTINATION ${SOURCE_PATH}) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA ) vcpkg_install_cmake() diff --git a/ports/libnice/CONTROL b/ports/libnice/CONTROL index 2d542c41d9..8f79f6b0a0 100644 --- a/ports/libnice/CONTROL +++ b/ports/libnice/CONTROL @@ -1,5 +1,5 @@ Source: libnice -Version: 0.1.15 +Version: 0.1.15-1 Homepage: https://nice.freedesktop.org Description: Libnice is an implementation of the IETF's Interactive Connectivity Establishment (ICE) standard (RFC 5245) and the Session Traversal Utilities for NAT (STUN) standard (RFC 5389). Build-Depends: glib, openssl diff --git a/ports/libnice/portfile.cmake b/ports/libnice/portfile.cmake index 2c0f87afee..14fb0d646c 100644 --- a/ports/libnice/portfile.cmake +++ b/ports/libnice/portfile.cmake @@ -15,6 +15,7 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS_RELEASE -DOPTIMIZE=1 OPTIONS_DEBUG -DDEBUGGABLE=1 ) diff --git a/ports/libodb-boost/CONTROL b/ports/libodb-boost/CONTROL index 24f7d18b92..3dec841035 100644 --- a/ports/libodb-boost/CONTROL +++ b/ports/libodb-boost/CONTROL @@ -1,4 +1,4 @@ Source: libodb-boost -Version: 2.4.0-2 +Version: 2.4.0-3 Description: Description: Boost support for the ODB ORM library Build-Depends: libodb diff --git a/ports/libodb-boost/portfile.cmake b/ports/libodb-boost/portfile.cmake index 212e6b01ae..dc94a232f5 100644 --- a/ports/libodb-boost/portfile.cmake +++ b/ports/libodb-boost/portfile.cmake @@ -14,6 +14,7 @@ file(COPY vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS_DEBUG -DLIBODB_INSTALL_HEADERS=OFF ) diff --git a/ports/libodb-mysql/CONTROL b/ports/libodb-mysql/CONTROL index fe5a28e8ac..7d2ee12f11 100644 --- a/ports/libodb-mysql/CONTROL +++ b/ports/libodb-mysql/CONTROL @@ -1,5 +1,5 @@ Source: libodb-mysql -Version: 2.4.0-2 +Version: 2.4.0-3 Homepage: https://www.codesynthesis.com/products/odb/ Description: MySQL support for the ODB ORM library Build-Depends: libodb, libmysql \ No newline at end of file diff --git a/ports/libodb-mysql/portfile.cmake b/ports/libodb-mysql/portfile.cmake index 88684bd357..cf2d8b8c79 100644 --- a/ports/libodb-mysql/portfile.cmake +++ b/ports/libodb-mysql/portfile.cmake @@ -35,6 +35,7 @@ set(MYSQL_LIB "${CURRENT_INSTALLED_DIR}/lib/libmysql.lib") set(MYSQL_LIB_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/libmysql.lib") vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS -DMYSQL_INCLUDE_DIR=${MYSQL_INCLUDE_DIR} OPTIONS_RELEASE diff --git a/ports/libodb-pgsql/CONTROL b/ports/libodb-pgsql/CONTROL index d35291135e..a6988eeb0c 100644 --- a/ports/libodb-pgsql/CONTROL +++ b/ports/libodb-pgsql/CONTROL @@ -1,5 +1,5 @@ Source: libodb-pgsql -Version: 2.4.0-2 +Version: 2.4.0-3 Homepage: https://www.codesynthesis.com/products/odb/ Description: Description: PostgreSQL support for the ODB ORM library Build-Depends: libodb, libpq diff --git a/ports/libodb-pgsql/portfile.cmake b/ports/libodb-pgsql/portfile.cmake index 3e31f2aa73..ed9f35034b 100644 --- a/ports/libodb-pgsql/portfile.cmake +++ b/ports/libodb-pgsql/portfile.cmake @@ -14,6 +14,7 @@ file(COPY vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS_DEBUG -DLIBODB_INSTALL_HEADERS=OFF ) diff --git a/ports/libodb-sqlite/CONTROL b/ports/libodb-sqlite/CONTROL index a8d9ef41f2..ed02fa8155 100644 --- a/ports/libodb-sqlite/CONTROL +++ b/ports/libodb-sqlite/CONTROL @@ -1,5 +1,5 @@ Source: libodb-sqlite -Version: 2.4.0-3 +Version: 2.4.0-4 Homepage: https://www.codesynthesis.com/products/odb/ Description: Sqlite support for the ODB ORM library Build-Depends: libodb, sqlite3 diff --git a/ports/libodb-sqlite/portfile.cmake b/ports/libodb-sqlite/portfile.cmake index b301169a70..67e4ffb378 100644 --- a/ports/libodb-sqlite/portfile.cmake +++ b/ports/libodb-sqlite/portfile.cmake @@ -22,6 +22,7 @@ file(COPY vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS_DEBUG -DLIBODB_INSTALL_HEADERS=OFF ) diff --git a/ports/libodb/CONTROL b/ports/libodb/CONTROL index 049a1bd127..129db70ab4 100644 --- a/ports/libodb/CONTROL +++ b/ports/libodb/CONTROL @@ -1,4 +1,4 @@ Source: libodb -Version: 2.4.0-4 +Version: 2.4.0-5 Homepage: https://www.codesynthesis.com/products/odb/ Description: ODB library, base runtime for the ODB ORM solution diff --git a/ports/libodb/portfile.cmake b/ports/libodb/portfile.cmake index 1ca5d4a1a0..7e48f43e52 100644 --- a/ports/libodb/portfile.cmake +++ b/ports/libodb/portfile.cmake @@ -22,6 +22,7 @@ file(COPY vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS_DEBUG -DLIBODB_INSTALL_HEADERS=OFF ) diff --git a/ports/librabbitmq/CONTROL b/ports/librabbitmq/CONTROL index 38287971d4..9f2d0fae63 100644 --- a/ports/librabbitmq/CONTROL +++ b/ports/librabbitmq/CONTROL @@ -1,5 +1,5 @@ Source: librabbitmq -Version: 0.9.0 +Version: 0.9.0-1 Build-Depends: openssl Homepage: https://github.com/alanxz/rabbitmq-c Description: A C-language AMQP client library for use with v2.0+ of the RabbitMQ broker. diff --git a/ports/librabbitmq/portfile.cmake b/ports/librabbitmq/portfile.cmake index 79463c26c9..3bf4d25cca 100644 --- a/ports/librabbitmq/portfile.cmake +++ b/ports/librabbitmq/portfile.cmake @@ -15,6 +15,7 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS -DBUILD_EXAMPLES=OFF -DBUILD_TESTS=OFF diff --git a/ports/libsamplerate/CONTROL b/ports/libsamplerate/CONTROL index dc0bf20dc2..36e5df98c3 100644 --- a/ports/libsamplerate/CONTROL +++ b/ports/libsamplerate/CONTROL @@ -1,4 +1,4 @@ Source: libsamplerate -Version: 0.1.9.0 +Version: 0.1.9.0-1 Homepage: https://www.mega-nerd.com/SRC Description: Sample Rate Converter for audio diff --git a/ports/libsamplerate/portfile.cmake b/ports/libsamplerate/portfile.cmake index 87712f6d2f..9cd648a6d9 100644 --- a/ports/libsamplerate/portfile.cmake +++ b/ports/libsamplerate/portfile.cmake @@ -15,6 +15,7 @@ file(COPY ${SOURCE_PATH}/Win32/config.h DESTINATION ${SOURCE_PATH}/src) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH}/src + PREFER_NINJA ) vcpkg_install_cmake() diff --git a/ports/libwebsockets/CONTROL b/ports/libwebsockets/CONTROL index 1b091480a5..a180ec4201 100644 --- a/ports/libwebsockets/CONTROL +++ b/ports/libwebsockets/CONTROL @@ -1,5 +1,5 @@ Source: libwebsockets -Version: 3.1.0-2 +Version: 3.1.0-3 Build-Depends: zlib, openssl Homepage: https://github.com/warmcat/libwebsockets Description: Libwebsockets is a lightweight pure C library built to use minimal CPU and memory resources, and provide fast throughput in both directions as client or server. diff --git a/ports/libwebsockets/portfile.cmake b/ports/libwebsockets/portfile.cmake index b2b90cccff..06793dd8e5 100644 --- a/ports/libwebsockets/portfile.cmake +++ b/ports/libwebsockets/portfile.cmake @@ -13,6 +13,7 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" LWS_WITH_SHARED) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS -DLWS_WITH_STATIC=${LWS_WITH_STATIC} -DLWS_WITH_SHARED=${LWS_WITH_SHARED} diff --git a/ports/lmdb/CONTROL b/ports/lmdb/CONTROL index eea847401f..eac4b017fb 100644 --- a/ports/lmdb/CONTROL +++ b/ports/lmdb/CONTROL @@ -1,4 +1,4 @@ Source: lmdb -Version: 0.9.23-1 +Version: 0.9.23-2 Homepage: https://github.com/LMDB/lmdb Description: LMDB is an extraordinarily fast, memory-efficient database diff --git a/ports/lmdb/portfile.cmake b/ports/lmdb/portfile.cmake index 9dc1aeeb2d..064f7cff6b 100644 --- a/ports/lmdb/portfile.cmake +++ b/ports/lmdb/portfile.cmake @@ -13,6 +13,7 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/cmake/ DESTINATION ${SOURCE_PATH}/libraries/ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH}/libraries/liblmdb + PREFER_NINJA OPTIONS_DEBUG -DLMDB_INSTALL_HEADERS=OFF ) diff --git a/ports/metis/CONTROL b/ports/metis/CONTROL index 02f5eb9e14..3ddfbb788c 100644 --- a/ports/metis/CONTROL +++ b/ports/metis/CONTROL @@ -1,4 +1,4 @@ Source: metis -Version: 5.1.0-4 +Version: 5.1.0-5 Homepage: https://glaros.dtc.umn.edu/gkhome/metis/metis/overview Description: Serial Graph Partitioning and Fill-reducing Matrix Ordering diff --git a/ports/metis/portfile.cmake b/ports/metis/portfile.cmake index 7a7f575a6e..ec17f0dc30 100644 --- a/ports/metis/portfile.cmake +++ b/ports/metis/portfile.cmake @@ -26,6 +26,7 @@ vcpkg_extract_source_archive_ex( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS ${OPTIONS} ) diff --git a/ports/mozjpeg/CONTROL b/ports/mozjpeg/CONTROL index c5180d1405..2f786a1c21 100644 --- a/ports/mozjpeg/CONTROL +++ b/ports/mozjpeg/CONTROL @@ -1,4 +1,4 @@ Source: mozjpeg -Version: 3.2-2 +Version: 3.2-3 Homepage: https://github.com/mozilla/mozjpeg Description: MozJPEG reduces file sizes of JPEG images while retaining quality and compatibility with the vast majority of the world's deployed decoders. It's compatible with libjpeg API and ABI, and can be used as a drop-in replacement for libjpeg. diff --git a/ports/mozjpeg/portfile.cmake b/ports/mozjpeg/portfile.cmake index 70fc58dc41..d771fd2053 100644 --- a/ports/mozjpeg/portfile.cmake +++ b/ports/mozjpeg/portfile.cmake @@ -26,6 +26,7 @@ string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" WITH_CRT_DLL) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS -DDENABLE_SHARED=${ENABLE_SHARED_BUILD} -DENABLE_STATIC=${ENABLE_STATIC_BUILD} diff --git a/ports/nanodbc/CONTROL b/ports/nanodbc/CONTROL index bf1aaa69ed..20c7c28b56 100644 --- a/ports/nanodbc/CONTROL +++ b/ports/nanodbc/CONTROL @@ -1,4 +1,4 @@ Source: nanodbc -Version: 2.12.4-3 +Version: 2.12.4-4 Homepage: https://github.com/lexicalunit/nanodbc Description: A small C++ wrapper for the native C ODBC API. diff --git a/ports/nanodbc/portfile.cmake b/ports/nanodbc/portfile.cmake index 7014c7eacf..0b31d6f6fe 100644 --- a/ports/nanodbc/portfile.cmake +++ b/ports/nanodbc/portfile.cmake @@ -14,6 +14,7 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS # Legacy, remove at release of v2.13 -DNANODBC_EXAMPLES=OFF diff --git a/ports/nmslib/CONTROL b/ports/nmslib/CONTROL index 262c406823..5f61fa1f9a 100644 --- a/ports/nmslib/CONTROL +++ b/ports/nmslib/CONTROL @@ -1,5 +1,5 @@ Source: nmslib -Version: 1.7.3.6 +Version: 1.7.3.6-1 Homepage: https://github.com/searchivarius/nmslib Description: Non-Metric Space Library (NMSLIB) is an efficient similarity search library and a toolkit for evaluation of k-NN methods for generic non-metric spaces. # diff --git a/ports/nmslib/portfile.cmake b/ports/nmslib/portfile.cmake index ffea74d75c..ed5d902baf 100644 --- a/ports/nmslib/portfile.cmake +++ b/ports/nmslib/portfile.cmake @@ -25,6 +25,7 @@ endif() # TODO: check SSE and AVX avability and set corresponding tags vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH}/similarity_search + PREFER_NINJA OPTIONS -DWITH_EXTRAS=${WITH_EXTRAS} ) diff --git a/ports/parmetis/CONTROL b/ports/parmetis/CONTROL index 7e5e3b21b6..ca5e4fe807 100644 --- a/ports/parmetis/CONTROL +++ b/ports/parmetis/CONTROL @@ -1,5 +1,5 @@ Source: parmetis -Version: 4.0.3-2 +Version: 4.0.3-3 Homepage: https://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview Description: Parallel Graph Partitioning and Fill-reducing Matrix Ordering Build-Depends: metis, msmpi diff --git a/ports/parmetis/portfile.cmake b/ports/parmetis/portfile.cmake index 63b2cb87bc..f3eee992f2 100644 --- a/ports/parmetis/portfile.cmake +++ b/ports/parmetis/portfile.cmake @@ -22,6 +22,7 @@ vcpkg_extract_source_archive_ex( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS ${ADDITIONAL_OPTIONS} ) diff --git a/ports/plibsys/CONTROL b/ports/plibsys/CONTROL index 2c71346bbf..004f070848 100644 --- a/ports/plibsys/CONTROL +++ b/ports/plibsys/CONTROL @@ -1,4 +1,4 @@ Source: plibsys -Version: 0.0.4-1 +Version: 0.0.4-2 Homepage: https://github.com/saprykin/plibsys Description: Highly portable C system library: threads and synchronization, sockets, IPC, data structures and more. diff --git a/ports/plibsys/portfile.cmake b/ports/plibsys/portfile.cmake index 210fddd37e..a4a032370c 100644 --- a/ports/plibsys/portfile.cmake +++ b/ports/plibsys/portfile.cmake @@ -15,6 +15,7 @@ endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS -DPLIBSYS_TESTS=OFF -DPLIBSYS_COVERAGE=OFF diff --git a/ports/proj4/CONTROL b/ports/proj4/CONTROL index 265b8173dd..f2a6ae8b62 100644 --- a/ports/proj4/CONTROL +++ b/ports/proj4/CONTROL @@ -1,4 +1,4 @@ Source: proj4 -Version: 4.9.3-3 +Version: 4.9.3-4 Homepage: https://download.osgeo.org/proj Description: PROJ.4 library for cartographic projections diff --git a/ports/proj4/portfile.cmake b/ports/proj4/portfile.cmake index b34f04ac33..70878aae64 100644 --- a/ports/proj4/portfile.cmake +++ b/ports/proj4/portfile.cmake @@ -26,6 +26,7 @@ endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS -DBUILD_LIBPROJ_SHARED=${VCPKG_BUILD_SHARED_LIBS} -DPROJ_LIB_SUBDIR=lib diff --git a/ports/pugixml/CONTROL b/ports/pugixml/CONTROL index a68f438334..7024b6b049 100644 --- a/ports/pugixml/CONTROL +++ b/ports/pugixml/CONTROL @@ -1,4 +1,4 @@ Source: pugixml -Version: 1.9-2 +Version: 1.9-3 Homepage: https://github.com/zeux/pugixml Description: C++ XML processing library diff --git a/ports/pugixml/portfile.cmake b/ports/pugixml/portfile.cmake index 62d0a4b74a..746e9c2d4c 100644 --- a/ports/pugixml/portfile.cmake +++ b/ports/pugixml/portfile.cmake @@ -10,6 +10,7 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA ) vcpkg_install_cmake() diff --git a/ports/ragel/CONTROL b/ports/ragel/CONTROL index 112128a521..1e23db1175 100644 --- a/ports/ragel/CONTROL +++ b/ports/ragel/CONTROL @@ -1,4 +1,4 @@ Source: ragel -Version: 6.10-1 +Version: 6.10-2 Homepage: https://www.colm.net/files/ragel Description: Ragel State Machine Compiler diff --git a/ports/ragel/portfile.cmake b/ports/ragel/portfile.cmake index 00082e4bde..820ded5df2 100644 --- a/ports/ragel/portfile.cmake +++ b/ports/ragel/portfile.cmake @@ -19,6 +19,7 @@ vcpkg_apply_patches( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA ) vcpkg_install_cmake() diff --git a/ports/re2/CONTROL b/ports/re2/CONTROL index 4bf7106e7d..d8ff925d80 100644 --- a/ports/re2/CONTROL +++ b/ports/re2/CONTROL @@ -1,4 +1,4 @@ Source: re2 -Version: 2019-05-07-1 +Version: 2019-05-07-2 Homepage: https://github.com/google/re2 Description: RE2 is a fast, safe, thread-friendly alternative to backtracking regular expression engines like those used in PCRE, Perl, and Python. It is a C++ library. diff --git a/ports/re2/portfile.cmake b/ports/re2/portfile.cmake index ef2c9e842f..690889c70f 100644 --- a/ports/re2/portfile.cmake +++ b/ports/re2/portfile.cmake @@ -10,6 +10,7 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS -DRE2_BUILD_TESTING=OFF ) diff --git a/ports/recast/CONTROL b/ports/recast/CONTROL index e19df38c8f..3726b99d50 100644 --- a/ports/recast/CONTROL +++ b/ports/recast/CONTROL @@ -1,4 +1,4 @@ Source: recast -Version: 1.5.1-2 +Version: 1.5.1-3 Homepage: https://github.com/recastnavigation/recastnavigation Description: Navigation-mesh Toolset for Games diff --git a/ports/recast/portfile.cmake b/ports/recast/portfile.cmake index a544971d82..a84d06e3c0 100644 --- a/ports/recast/portfile.cmake +++ b/ports/recast/portfile.cmake @@ -14,6 +14,7 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA ) vcpkg_install_cmake() diff --git a/ports/sdl2-gfx/CONTROL b/ports/sdl2-gfx/CONTROL index 96a4d2776f..8b4af0e61d 100644 --- a/ports/sdl2-gfx/CONTROL +++ b/ports/sdl2-gfx/CONTROL @@ -1,4 +1,4 @@ Source: sdl2-gfx -Version: 1.0.4-1 +Version: 1.0.4-2 Build-Depends: sdl2 Description: Graphics primitives (line, circle, rectangle etc.) with AA support, rotozoomer and other drawing related support functions wrapped up in a C based add-on library for the Simple Direct Media (SDL) cross-platform API layer. diff --git a/ports/sdl2-gfx/portfile.cmake b/ports/sdl2-gfx/portfile.cmake index 9cc6a6ca8a..ce83fd21e4 100644 --- a/ports/sdl2-gfx/portfile.cmake +++ b/ports/sdl2-gfx/portfile.cmake @@ -18,6 +18,7 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS_DEBUG -DSDL_GFX_SKIP_HEADERS=1 ) diff --git a/ports/septag-sx/CONTROL b/ports/septag-sx/CONTROL index a9748b910e..ee9917e667 100644 --- a/ports/septag-sx/CONTROL +++ b/ports/septag-sx/CONTROL @@ -1,3 +1,3 @@ Source: septag-sx -Version: 2019-05-07-1 +Version: 2019-05-07-2 Description: Portable base library for C programmers, designed for performance and simplicity. diff --git a/ports/septag-sx/portfile.cmake b/ports/septag-sx/portfile.cmake index d775451342..4fb87a250e 100644 --- a/ports/septag-sx/portfile.cmake +++ b/ports/septag-sx/portfile.cmake @@ -16,6 +16,7 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SX_SHARED_LIB) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS -DSX_BUILD_TESTS=OFF -DSX_SHARED_LIB=${SX_SHARED_LIB} diff --git a/ports/sfml/CONTROL b/ports/sfml/CONTROL index d23645a301..606095d882 100644 --- a/ports/sfml/CONTROL +++ b/ports/sfml/CONTROL @@ -1,5 +1,5 @@ Source: sfml -Version: 2.5.1-1 +Version: 2.5.1-2 Homepage: https://github.com/sfml/sfml Description: Simple and fast multimedia library Build-Depends: freetype, libflac, libogg, libvorbis, openal-soft, stb diff --git a/ports/sfml/portfile.cmake b/ports/sfml/portfile.cmake index a25c5628bd..a4c0d89c42 100644 --- a/ports/sfml/portfile.cmake +++ b/ports/sfml/portfile.cmake @@ -21,6 +21,7 @@ endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS -DSFML_BUILD_FRAMEWORKS=OFF -DSFML_USE_SYSTEM_DEPS=ON diff --git a/ports/shaderc/CONTROL b/ports/shaderc/CONTROL index 044fdd4105..0878b17bec 100644 --- a/ports/shaderc/CONTROL +++ b/ports/shaderc/CONTROL @@ -1,5 +1,5 @@ Source: shaderc -Version: 2019-06-26 +Version: 2019-06-26-1 Homepage: https://github.com/google/shaderc Description: A collection of tools, libraries and tests for shader compilation. Build-Depends: glslang, spirv-tools \ No newline at end of file diff --git a/ports/shaderc/portfile.cmake b/ports/shaderc/portfile.cmake index fbdc1e4dd1..2978422965 100644 --- a/ports/shaderc/portfile.cmake +++ b/ports/shaderc/portfile.cmake @@ -32,6 +32,7 @@ vcpkg_add_to_path(PREPEND "${PYTHON3_EXE_PATH}") vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS -DSHADERC_SKIP_TESTS=true ${OPTIONS} -Dglslang_SOURCE_DIR=${CURRENT_INSTALLED_DIR}/include -Dspirv-tools_SOURCE_DIR=${CURRENT_INSTALLED_DIR}/include OPTIONS_DEBUG -DSUFFIX_D=true OPTIONS_RELEASE -DSUFFIX_D=false diff --git a/ports/signalrclient/CONTROL b/ports/signalrclient/CONTROL index e64b920bae..85e4427d5b 100644 --- a/ports/signalrclient/CONTROL +++ b/ports/signalrclient/CONTROL @@ -1,5 +1,5 @@ Source: signalrclient -Version: 1.0.0-beta1-6 +Version: 1.0.0-beta1-7 Build-Depends: cpprestsdk, openssl Homepage: https://github.com/aspnet/SignalR-Client-Cpp Description: C++ client for SignalR. diff --git a/ports/signalrclient/portfile.cmake b/ports/signalrclient/portfile.cmake index e3b6e7c4d6..39f1992b86 100644 --- a/ports/signalrclient/portfile.cmake +++ b/ports/signalrclient/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS_DEBUG -DCPPREST_SO=${CURRENT_INSTALLED_DIR}/debug/lib/cpprest_2_10d.lib OPTIONS_RELEASE diff --git a/ports/so5extra/CONTROL b/ports/so5extra/CONTROL index 22abf134cb..fbe4a1e16d 100644 --- a/ports/so5extra/CONTROL +++ b/ports/so5extra/CONTROL @@ -1,4 +1,4 @@ Source: so5extra -Version: 1.3.1 +Version: 1.3.1-1 Description: A set of additional tools for SObjectizer framework. Build-Depends: sobjectizer diff --git a/ports/so5extra/portfile.cmake b/ports/so5extra/portfile.cmake index d660fbbca8..71e1cb443e 100644 --- a/ports/so5extra/portfile.cmake +++ b/ports/so5extra/portfile.cmake @@ -12,6 +12,7 @@ vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS -DSO5EXTRA_INSTALL=ON ) diff --git a/ports/spaceland/CONTROL b/ports/spaceland/CONTROL index 4f885e6ebc..97b5a9156e 100644 --- a/ports/spaceland/CONTROL +++ b/ports/spaceland/CONTROL @@ -1,4 +1,4 @@ Source: spaceland -Version: 7.8.2-2 +Version: 7.8.2-3 Description: Spaceland Lib (sl) is a suite for geometric computation, specifically adapted to OpenGL. Build-Depends: zlib diff --git a/ports/spaceland/portfile.cmake b/ports/spaceland/portfile.cmake index d90ceafd7e..def38d6d15 100644 --- a/ports/spaceland/portfile.cmake +++ b/ports/spaceland/portfile.cmake @@ -14,6 +14,7 @@ vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA DISABLE_PARALLEL_CONFIGURE OPTIONS -DSL_TEST=OFF diff --git a/ports/speexdsp/CONTROL b/ports/speexdsp/CONTROL index d96eb11c1d..793281d419 100644 --- a/ports/speexdsp/CONTROL +++ b/ports/speexdsp/CONTROL @@ -1,5 +1,5 @@ Source: speexdsp -Version: 1.2rc3-2 +Version: 1.2rc3-3 Homepage: https://ftp.osuosl.org/pub/xiph/releases/speex/ Description: A patent-free, Open Source/Free Software DSP library. Build-Depends: diff --git a/ports/speexdsp/portfile.cmake b/ports/speexdsp/portfile.cmake index 72bc313d7f..0cc6ac71cb 100644 --- a/ports/speexdsp/portfile.cmake +++ b/ports/speexdsp/portfile.cmake @@ -16,6 +16,7 @@ endif() vcpkg_configure_cmake( SOURCE_PATH ${CMAKE_PATH} + PREFER_NINJA OPTIONS -DSOURCE_PATH=${SOURCE_PATH} -DUSE_SSE=${USE_SSE} ) diff --git a/ports/sqlpp11-connector-mysql/CONTROL b/ports/sqlpp11-connector-mysql/CONTROL index e562751376..78817eae76 100644 --- a/ports/sqlpp11-connector-mysql/CONTROL +++ b/ports/sqlpp11-connector-mysql/CONTROL @@ -1,4 +1,4 @@ Source: sqlpp11-connector-mysql -Version: 0.25-1 +Version: 0.25-2 Description: A C++ wrapper for MySQL meant to be used in combination with sqlpp11. Build-Depends: date, libmariadb, sqlpp11 diff --git a/ports/sqlpp11-connector-mysql/portfile.cmake b/ports/sqlpp11-connector-mysql/portfile.cmake index fbaaebaf1c..9f93058a4a 100644 --- a/ports/sqlpp11-connector-mysql/portfile.cmake +++ b/ports/sqlpp11-connector-mysql/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_from_github( # Use sqlpp11-connector-mysql's own build process, skipping tests vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS -DENABLE_TESTS:BOOL=OFF -DDATE_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include diff --git a/ports/sqlpp11-connector-sqlite3/CONTROL b/ports/sqlpp11-connector-sqlite3/CONTROL index 25e680eda8..564a9a9a4d 100644 --- a/ports/sqlpp11-connector-sqlite3/CONTROL +++ b/ports/sqlpp11-connector-sqlite3/CONTROL @@ -1,4 +1,4 @@ Source: sqlpp11-connector-sqlite3 -Version: 0.29-1 +Version: 0.29-2 Description: A C++ wrapper for sqlite3 meant to be used in combination with sqlpp11. Build-Depends: date, sqlite3, sqlpp11 diff --git a/ports/sqlpp11-connector-sqlite3/portfile.cmake b/ports/sqlpp11-connector-sqlite3/portfile.cmake index 735912a863..6587df313e 100644 --- a/ports/sqlpp11-connector-sqlite3/portfile.cmake +++ b/ports/sqlpp11-connector-sqlite3/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_from_github( # Use sqlpp11-connector-sqlite3's own build process, skipping tests vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS -DENABLE_TESTS:BOOL=OFF -DSQLPP11_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include diff --git a/ports/sqlpp11/CONTROL b/ports/sqlpp11/CONTROL index 282598dc52..b371f0a8c6 100644 --- a/ports/sqlpp11/CONTROL +++ b/ports/sqlpp11/CONTROL @@ -1,4 +1,4 @@ Source: sqlpp11 -Version: 0.58 +Version: 0.58-1 Description: A type safe embedded domain specific language for SQL queries and results in C++. Build-Depends: date diff --git a/ports/sqlpp11/portfile.cmake b/ports/sqlpp11/portfile.cmake index a11d563d9c..7fe915213c 100644 --- a/ports/sqlpp11/portfile.cmake +++ b/ports/sqlpp11/portfile.cmake @@ -12,6 +12,7 @@ vcpkg_from_github( # Use sqlpp11's own build process, skipping tests vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS -DENABLE_TESTS:BOOL=OFF ) diff --git a/ports/stlab/CONTROL b/ports/stlab/CONTROL index 01651f59ba..6a289c5319 100644 --- a/ports/stlab/CONTROL +++ b/ports/stlab/CONTROL @@ -1,5 +1,5 @@ Source: stlab -Version: 1.4.1 +Version: 1.4.1-1 Description: stlab is the ongoing work of what was Adobe’s Software Technology Lab. The Concurrency library provides futures and channels, high level constructs for implementing algorithms that eases the use of multiple CPU cores while minimizing contention. This library solves several problems of the C++11 and C++17 TS futures. diff --git a/ports/stlab/portfile.cmake b/ports/stlab/portfile.cmake index 7c8925d93f..2bcb7d1028 100644 --- a/ports/stlab/portfile.cmake +++ b/ports/stlab/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS -DBUILD_TESTING=OFF ) diff --git a/ports/stxxl/CONTROL b/ports/stxxl/CONTROL index 847a310670..42609d34f3 100644 --- a/ports/stxxl/CONTROL +++ b/ports/stxxl/CONTROL @@ -1,3 +1,3 @@ Source: stxxl -Version: 2018-11-15-1 +Version: 2018-11-15-2 Description: Standard Template Library for Extra Large Data Sets diff --git a/ports/stxxl/portfile.cmake b/ports/stxxl/portfile.cmake index 41665c4cd0..23414f08eb 100644 --- a/ports/stxxl/portfile.cmake +++ b/ports/stxxl/portfile.cmake @@ -15,6 +15,7 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS -DBUILD_STATIC_LIBS=ON -DBUILD_EXAMPLES=OFF diff --git a/ports/sundials/CONTROL b/ports/sundials/CONTROL index dc6955d40d..101325d379 100644 --- a/ports/sundials/CONTROL +++ b/ports/sundials/CONTROL @@ -1,4 +1,4 @@ Source: sundials -Version: 3.1.1 +Version: 3.1.1-1 Homepage: https://computation.llnl.gov/projects/sundials Description: SUNDIALS (SUite of Nonlinear and DIfferential/ALgebraic equation Solvers) diff --git a/ports/sundials/portfile.cmake b/ports/sundials/portfile.cmake index 6798f02727..da4d9c4a25 100644 --- a/ports/sundials/portfile.cmake +++ b/ports/sundials/portfile.cmake @@ -18,6 +18,7 @@ vcpkg_apply_patches( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS -DEXAMPLES_ENABLE=OFF ) diff --git a/ports/szip/CONTROL b/ports/szip/CONTROL index ac60f1a9d0..8f1fedbc64 100644 --- a/ports/szip/CONTROL +++ b/ports/szip/CONTROL @@ -1,4 +1,4 @@ Source: szip -Version: 2.1.1-4 +Version: 2.1.1-5 Homepage: https://support.hdfgroup.org/ftp/lib-external/szip Description: Szip compression software, providing lossless compression of scientific data diff --git a/ports/szip/portfile.cmake b/ports/szip/portfile.cmake index 047abf3924..cffb1693c6 100644 --- a/ports/szip/portfile.cmake +++ b/ports/szip/portfile.cmake @@ -17,6 +17,7 @@ vcpkg_extract_source_archive_ex( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS -DSZIP_INSTALL_DATA_DIR=share/szip/data -DSZIP_INSTALL_CMAKE_DIR=share/szip diff --git a/ports/tinyxml2/CONTROL b/ports/tinyxml2/CONTROL index 5a33ae078a..c0016a412f 100644 --- a/ports/tinyxml2/CONTROL +++ b/ports/tinyxml2/CONTROL @@ -1,5 +1,5 @@ Source: tinyxml2 -Version: 7.0.1-1 +Version: 7.0.1-2 Homepage: https://github.com/leethomason/tinyxml2 Description: A simple, small, efficient, C++ XML parser diff --git a/ports/tinyxml2/portfile.cmake b/ports/tinyxml2/portfile.cmake index 7d4ceaff1e..b98e45a5a4 100644 --- a/ports/tinyxml2/portfile.cmake +++ b/ports/tinyxml2/portfile.cmake @@ -10,6 +10,7 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA ) vcpkg_install_cmake() diff --git a/ports/tsl-hopscotch-map/CONTROL b/ports/tsl-hopscotch-map/CONTROL index 5fe5d726ae..0f2b82e360 100644 --- a/ports/tsl-hopscotch-map/CONTROL +++ b/ports/tsl-hopscotch-map/CONTROL @@ -1,3 +1,3 @@ Source: tsl-hopscotch-map -Version: 2.2.1 +Version: 2.2.1-1 Description: C++ implementation of a fast hash map and hash set using hopscotch hashing diff --git a/ports/tsl-hopscotch-map/portfile.cmake b/ports/tsl-hopscotch-map/portfile.cmake index c96df35c6d..00998338a0 100644 --- a/ports/tsl-hopscotch-map/portfile.cmake +++ b/ports/tsl-hopscotch-map/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA ) vcpkg_install_cmake() diff --git a/ports/tsl-ordered-map/CONTROL b/ports/tsl-ordered-map/CONTROL index bb2b75a9d9..2170432d22 100644 --- a/ports/tsl-ordered-map/CONTROL +++ b/ports/tsl-ordered-map/CONTROL @@ -1,3 +1,3 @@ Source: tsl-ordered-map -Version: 0.8.1 +Version: 0.8.1-1 Description: C++ hash map and hash set which preserve the order of insertion diff --git a/ports/tsl-ordered-map/portfile.cmake b/ports/tsl-ordered-map/portfile.cmake index 19940d2707..9f4fe996b1 100644 --- a/ports/tsl-ordered-map/portfile.cmake +++ b/ports/tsl-ordered-map/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA ) vcpkg_install_cmake() diff --git a/ports/tsl-sparse-map/CONTROL b/ports/tsl-sparse-map/CONTROL index 627d5bea1c..5563868572 100644 --- a/ports/tsl-sparse-map/CONTROL +++ b/ports/tsl-sparse-map/CONTROL @@ -1,3 +1,3 @@ Source: tsl-sparse-map -Version: 0.6.1 +Version: 0.6.1-1 Description: C++ implementation of a memory efficient hash map and hash set diff --git a/ports/tsl-sparse-map/portfile.cmake b/ports/tsl-sparse-map/portfile.cmake index 07d1f30488..44a366d878 100644 --- a/ports/tsl-sparse-map/portfile.cmake +++ b/ports/tsl-sparse-map/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA ) vcpkg_install_cmake() diff --git a/ports/usd/CONTROL b/ports/usd/CONTROL index e04784de4d..d14831d543 100644 --- a/ports/usd/CONTROL +++ b/ports/usd/CONTROL @@ -1,4 +1,4 @@ Source: usd -Version: 0.8.4-1 +Version: 0.8.4-2 Build-Depends: boost-assign, boost-crc, boost-date-time, boost-filesystem, boost-format, boost-multi-index, boost-program-options, boost-regex, boost-system, boost-vmd, tbb, zlib Description: Universal Scene Description (USD) is an efficient, scalable system for authoring, reading, and streaming time-sampled scene description for interchange between graphics applications. diff --git a/ports/usd/portfile.cmake b/ports/usd/portfile.cmake index cada7b4e1f..76b1473be7 100644 --- a/ports/usd/portfile.cmake +++ b/ports/usd/portfile.cmake @@ -17,6 +17,7 @@ vcpkg_add_to_path("${PYTHON2_DIR}") vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS -DPXR_BUILD_ALEMBIC_PLUGIN:BOOL=OFF -DPXR_BUILD_EMBREE_PLUGIN:BOOL=OFF diff --git a/ports/xlnt/CONTROL b/ports/xlnt/CONTROL index 6433b748e7..b3fbc84225 100644 --- a/ports/xlnt/CONTROL +++ b/ports/xlnt/CONTROL @@ -1,4 +1,4 @@ Source: xlnt -Version: 1.3.0-1 +Version: 1.3.0-2 Homepage: https://github.com/tfussell/xlnt Description: Cross-platform user-friendly xlsx library for C++14 diff --git a/ports/xlnt/portfile.cmake b/ports/xlnt/portfile.cmake index 29a0e22012..1e1a9cb435 100644 --- a/ports/xlnt/portfile.cmake +++ b/ports/xlnt/portfile.cmake @@ -16,6 +16,7 @@ endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS -DTESTS=OFF -DSAMPLES=OFF -DBENCHMARKS=OFF -DSTATIC=${STATIC} ) diff --git a/ports/yato/CONTROL b/ports/yato/CONTROL index f195193150..65546494d0 100644 --- a/ports/yato/CONTROL +++ b/ports/yato/CONTROL @@ -1,3 +1,3 @@ Source: yato -Version: 1.0-1 +Version: 1.0-2 Description: Modern C++14 containers and utilities, actors system, typesafe config diff --git a/ports/yato/portfile.cmake b/ports/yato/portfile.cmake index 44ee937820..76a54ee136 100644 --- a/ports/yato/portfile.cmake +++ b/ports/yato/portfile.cmake @@ -21,6 +21,7 @@ file(COPY "${SOURCE_PATH}/modules/config/yato" vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS -DYATO_BUILD_TESTS:BOOL=OFF -DYATO_BUILD_ACTORS:BOOL=ON