diff options
| author | Phil Christensen <philc@microsoft.com> | 2019-04-11 08:25:55 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-11 08:25:55 -0700 |
| commit | c6fd076372fe6733d73c23fd1da60e9f97230a9a (patch) | |
| tree | 5332f4e03cc2720d7d5e2c1b4c66219dab2bb045 | |
| parent | dc65ec9e68a8e280ad9865d956853cdc6f8f2396 (diff) | |
| download | vcpkg-c6fd076372fe6733d73c23fd1da60e9f97230a9a.tar.gz vcpkg-c6fd076372fe6733d73c23fd1da60e9f97230a9a.zip | |
[devil/libcopp/spaceland] stable cmake config (#6046)
| -rw-r--r-- | ports/devil/CONTROL | 2 | ||||
| -rw-r--r-- | ports/devil/portfile.cmake | 1 | ||||
| -rw-r--r-- | ports/libcopp/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libcopp/portfile.cmake | 1 | ||||
| -rw-r--r-- | ports/spaceland/CONTROL | 2 | ||||
| -rw-r--r-- | ports/spaceland/portfile.cmake | 9 |
6 files changed, 10 insertions, 7 deletions
diff --git a/ports/devil/CONTROL b/ports/devil/CONTROL index 18d263348..98c27363a 100644 --- a/ports/devil/CONTROL +++ b/ports/devil/CONTROL @@ -1,5 +1,5 @@ Source: devil -Version: 1.8.0-3 +Version: 1.8.0-4 Build-Depends: Description: A full featured cross-platform image library Default-Features: libpng, tiff, libjpeg, openexr, jasper, lcms diff --git a/ports/devil/portfile.cmake b/ports/devil/portfile.cmake index 7ab5a6c06..db9944895 100644 --- a/ports/devil/portfile.cmake +++ b/ports/devil/portfile.cmake @@ -61,6 +61,7 @@ set(IL_USE_DXTC_SQUISH 0) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH}/DevIL PREFER_NINJA + DISABLE_PARALLEL_CONFIGURE OPTIONS -DIL_NO_PNG=${IL_NO_PNG} -DIL_NO_TIF=${IL_NO_TIF} diff --git a/ports/libcopp/CONTROL b/ports/libcopp/CONTROL index 35fca9b7e..68115219f 100644 --- a/ports/libcopp/CONTROL +++ b/ports/libcopp/CONTROL @@ -1,3 +1,3 @@ Source: libcopp -Version: 1.1.0-1 +Version: 1.1.0-2 Description: A cross-platfrom coroutine library for C++ diff --git a/ports/libcopp/portfile.cmake b/ports/libcopp/portfile.cmake index 85b2de09c..026e4a14c 100644 --- a/ports/libcopp/portfile.cmake +++ b/ports/libcopp/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_from_github( # Use libcopp's own build process, skipping examples and tests vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + DISABLE_PARALLEL_CONFIGURE # PREFER_NINJA # Disabled because Ninja does not invoke masm correctly for this project ) vcpkg_install_cmake() diff --git a/ports/spaceland/CONTROL b/ports/spaceland/CONTROL index 2baf34633..4319a9797 100644 --- a/ports/spaceland/CONTROL +++ b/ports/spaceland/CONTROL @@ -1,4 +1,4 @@ Source: spaceland
-Version: 7.8.2-0
+Version: 7.8.2-1
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 d22276d60..5e84296cd 100644 --- a/ports/spaceland/portfile.cmake +++ b/ports/spaceland/portfile.cmake @@ -17,10 +17,11 @@ vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
- OPTIONS
- -DSL_TEST=OFF
- -DSL_INSTALL_SLFIND_MODULE=OFF
- OPTIONS_DEBUG
+ DISABLE_PARALLEL_CONFIGURE
+ OPTIONS
+ -DSL_TEST=OFF
+ -DSL_INSTALL_SLFIND_MODULE=OFF
+ OPTIONS_DEBUG
-DSL_TEST=OFF
-DSL_INSTALL_SLFIND_MODULE=OFF
)
|