From cadee66ca2d8048d7d6449ed0472d091350a617f Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Tue, 8 Nov 2016 14:38:47 -0800 Subject: [PATCH] If portfile is not static-enabled yet, warn and then build dynamic The opposite if portfile is not dynamic enabled --- ports/ace/portfile.cmake | 3 ++- ports/bond/portfile.cmake | 3 ++- ports/chakracore/portfile.cmake | 3 ++- ports/cryptopp/portfile.cmake | 3 ++- ports/curl/portfile.cmake | 3 ++- ports/dxut/portfile.cmake | 3 ++- ports/fmt/portfile.cmake | 3 ++- ports/freeglut/portfile.cmake | 3 ++- ports/glew/portfile.cmake | 3 ++- ports/glog/portfile.cmake | 3 ++- ports/grpc/portfile.cmake | 3 ++- ports/gtest/portfile.cmake | 3 ++- ports/harfbuzz/portfile.cmake | 3 ++- ports/libbson/portfile.cmake | 3 ++- ports/libmariadb/portfile.cmake | 3 ++- ports/libmysql/portfile.cmake | 3 ++- ports/libuv/portfile.cmake | 3 ++- ports/libvorbis/portfile.cmake | 3 ++- ports/libwebsockets/portfile.cmake | 3 ++- ports/mongo-c-driver/portfile.cmake | 3 ++- ports/mongo-cxx-driver/portfile.cmake | 3 ++- ports/mpg123/portfile.cmake | 3 ++- ports/mpir/portfile.cmake | 3 ++- ports/nanodbc/portfile.cmake | 3 ++- ports/openal-soft/portfile.cmake | 3 ++- ports/opencv/portfile.cmake | 3 ++- ports/physfs/portfile.cmake | 3 ++- ports/sdl2/portfile.cmake | 3 ++- ports/sery/portfile.cmake | 3 ++- ports/tbb/portfile.cmake | 3 ++- 30 files changed, 60 insertions(+), 30 deletions(-) diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake index 4642f9944e..8301fb2320 100644 --- a/ports/ace/portfile.cmake +++ b/ports/ace/portfile.cmake @@ -1,5 +1,6 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - message(FATAL_ERROR "Static building not supported yet") + message(STATUS "Warning: Static building not supported yet. Building dynamic.") + set(VCPKG_LIBRARY_LINKAGE dynamic) endif() include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ACE_wrappers/ace) diff --git a/ports/bond/portfile.cmake b/ports/bond/portfile.cmake index 3b1ed7116b..8dbf7cf535 100644 --- a/ports/bond/portfile.cmake +++ b/ports/bond/portfile.cmake @@ -1,5 +1,6 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - message(FATAL_ERROR "Static building not supported yet") + message(STATUS "Warning: Static building not supported yet. Building dynamic.") + set(VCPKG_LIBRARY_LINKAGE dynamic) endif() include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/bond-53ea13692925bee4ba494ee9de3614f15c09d85d) diff --git a/ports/chakracore/portfile.cmake b/ports/chakracore/portfile.cmake index 43710e53c1..ea4a3d7ff3 100644 --- a/ports/chakracore/portfile.cmake +++ b/ports/chakracore/portfile.cmake @@ -1,5 +1,6 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - message(FATAL_ERROR "Static building not supported yet") + message(STATUS "Warning: Static building not supported yet. Building dynamic.") + set(VCPKG_LIBRARY_LINKAGE dynamic) endif() include(vcpkg_common_functions) find_program(POWERSHELL powershell) diff --git a/ports/cryptopp/portfile.cmake b/ports/cryptopp/portfile.cmake index bdd4f9a12e..4847c208bb 100644 --- a/ports/cryptopp/portfile.cmake +++ b/ports/cryptopp/portfile.cmake @@ -1,5 +1,6 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - message(FATAL_ERROR "Dynamic building not supported") # See note below + message(STATUS "Warning: Dynamic building not supported. Building static.") # See note below + set(VCPKG_LIBRARY_LINKAGE static) endif() include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/cryptopp-CRYPTOPP_5_6_5) diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index 54fa7922be..8ad5ed7f78 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -1,5 +1,6 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - message(FATAL_ERROR "Static building not supported yet") + message(STATUS "Warning: Static building not supported yet. Building dynamic.") + set(VCPKG_LIBRARY_LINKAGE dynamic) endif() include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/curl-curl-7_51_0) diff --git a/ports/dxut/portfile.cmake b/ports/dxut/portfile.cmake index 849ae133af..774ef4d5fa 100644 --- a/ports/dxut/portfile.cmake +++ b/ports/dxut/portfile.cmake @@ -1,5 +1,6 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - message(FATAL_ERROR "Static building not supported yet") + message(STATUS "Warning: Static building not supported yet. Building dynamic.") + set(VCPKG_LIBRARY_LINKAGE dynamic) endif() include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/DXUT-sept2016) diff --git a/ports/fmt/portfile.cmake b/ports/fmt/portfile.cmake index fab2829591..6f9f422316 100644 --- a/ports/fmt/portfile.cmake +++ b/ports/fmt/portfile.cmake @@ -1,5 +1,6 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - message(FATAL_ERROR "Dynamic building not supported yet") + message(STATUS "Warning: Dynamic building not supported yet. Building static.") + set(VCPKG_LIBRARY_LINKAGE static) endif() include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/fmt-3.0.0) diff --git a/ports/freeglut/portfile.cmake b/ports/freeglut/portfile.cmake index 34413eb578..8ea89d780e 100644 --- a/ports/freeglut/portfile.cmake +++ b/ports/freeglut/portfile.cmake @@ -1,5 +1,6 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - message(FATAL_ERROR "Static building not supported yet") + message(STATUS "Warning: Static building not supported yet. Building dynamic.") + set(VCPKG_LIBRARY_LINKAGE dynamic) endif() include(vcpkg_common_functions) vcpkg_download_distfile(ARCHIVE diff --git a/ports/glew/portfile.cmake b/ports/glew/portfile.cmake index 8748f4a764..fd3c5ef9a5 100644 --- a/ports/glew/portfile.cmake +++ b/ports/glew/portfile.cmake @@ -1,5 +1,6 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - message(FATAL_ERROR "Static building not supported yet") + message(STATUS "Warning: Static building not supported yet. Building dynamic.") + set(VCPKG_LIBRARY_LINKAGE dynamic) endif() include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/glew-2.0.0) diff --git a/ports/glog/portfile.cmake b/ports/glog/portfile.cmake index c9f6bfa434..4895be6946 100644 --- a/ports/glog/portfile.cmake +++ b/ports/glog/portfile.cmake @@ -7,7 +7,8 @@ # if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - message(FATAL_ERROR "Static building not supported yet. Portfile needs modification and also blocked by flags") + message(STATUS "Warning: Static building not supported yet. Building dynamic.") + set(VCPKG_LIBRARY_LINKAGE dynamic) endif() include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/glog-0472b91c5defdf90cff7292e3bf7bd86770a9a0a) diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake index b8718ea104..a54af6e556 100644 --- a/ports/grpc/portfile.cmake +++ b/ports/grpc/portfile.cmake @@ -1,5 +1,6 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - message(FATAL_ERROR "Static building not supported yet") + message(STATUS "Warning: Static building not supported yet. Building dynamic.") + set(VCPKG_LIBRARY_LINKAGE dynamic) endif() include(vcpkg_common_functions) find_program(GIT git) diff --git a/ports/gtest/portfile.cmake b/ports/gtest/portfile.cmake index b7bfd4b397..e1d601d7bd 100644 --- a/ports/gtest/portfile.cmake +++ b/ports/gtest/portfile.cmake @@ -1,5 +1,6 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - message(FATAL_ERROR "Static building not supported yet") + message(STATUS "Warning: Static building not supported yet. Building dynamic.") + set(VCPKG_LIBRARY_LINKAGE dynamic) endif() include(vcpkg_common_functions) diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index 84aaed2a74..2603fdf0a1 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -7,7 +7,8 @@ # if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - message(FATAL_ERROR "Static building not supported yet. Portfile not modified for static and blocked on freetype.") + message(STATUS "Warning: Static building not supported yet. Building dynamic.") + set(VCPKG_LIBRARY_LINKAGE dynamic) endif() include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/harfbuzz-1.3.2) diff --git a/ports/libbson/portfile.cmake b/ports/libbson/portfile.cmake index 50ebf5eca6..71846b6439 100644 --- a/ports/libbson/portfile.cmake +++ b/ports/libbson/portfile.cmake @@ -1,5 +1,6 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - message(FATAL_ERROR "Static building not supported yet") + message(STATUS "Warning: Static building not supported yet. Building dynamic.") + set(VCPKG_LIBRARY_LINKAGE dynamic) endif() include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libbson-1.4.2) diff --git a/ports/libmariadb/portfile.cmake b/ports/libmariadb/portfile.cmake index 61e2ccee52..e6ccfa5084 100644 --- a/ports/libmariadb/portfile.cmake +++ b/ports/libmariadb/portfile.cmake @@ -1,5 +1,6 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - message(FATAL_ERROR "Static building not supported yet") + message(STATUS "Warning: Static building not supported yet. Building dynamic.") + set(VCPKG_LIBRARY_LINKAGE dynamic) endif() include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mariadb-connector-c-2.3.1) diff --git a/ports/libmysql/portfile.cmake b/ports/libmysql/portfile.cmake index 5f4f11a0cb..48412ccc74 100644 --- a/ports/libmysql/portfile.cmake +++ b/ports/libmysql/portfile.cmake @@ -1,5 +1,6 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - message(FATAL_ERROR "Static building not supported yet") + message(STATUS "Warning: Static building not supported yet. Building dynamic.") + set(VCPKG_LIBRARY_LINKAGE dynamic) endif() include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mysql-server-mysql-5.7.16) diff --git a/ports/libuv/portfile.cmake b/ports/libuv/portfile.cmake index bf7e10b551..5f5cd0474b 100644 --- a/ports/libuv/portfile.cmake +++ b/ports/libuv/portfile.cmake @@ -1,5 +1,6 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - message(FATAL_ERROR "Static building not supported yet") + message(STATUS "Warning: Static building not supported yet. Building dynamic.") + set(VCPKG_LIBRARY_LINKAGE dynamic) endif() include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-src/libuv-1.9.1) diff --git a/ports/libvorbis/portfile.cmake b/ports/libvorbis/portfile.cmake index 15cf488573..66bfca07c7 100644 --- a/ports/libvorbis/portfile.cmake +++ b/ports/libvorbis/portfile.cmake @@ -7,7 +7,8 @@ # if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - message(FATAL_ERROR "Static building not supported yet") + message(STATUS "Warning: Static building not supported yet. Building dynamic.") + set(VCPKG_LIBRARY_LINKAGE dynamic) endif() include(vcpkg_common_functions) find_program(GIT git) diff --git a/ports/libwebsockets/portfile.cmake b/ports/libwebsockets/portfile.cmake index f775692cfc..27088bf87d 100644 --- a/ports/libwebsockets/portfile.cmake +++ b/ports/libwebsockets/portfile.cmake @@ -1,5 +1,6 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - message(FATAL_ERROR "Static building not supported yet") + message(STATUS "Warning: Static building not supported yet. Building dynamic.") + set(VCPKG_LIBRARY_LINKAGE dynamic) endif() include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libwebsockets-2.0.0) diff --git a/ports/mongo-c-driver/portfile.cmake b/ports/mongo-c-driver/portfile.cmake index 7fbd73be1b..1aa83f6bb1 100644 --- a/ports/mongo-c-driver/portfile.cmake +++ b/ports/mongo-c-driver/portfile.cmake @@ -1,5 +1,6 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - message(FATAL_ERROR "Static building not supported yet. Portfile not modified and blocked by libbson.") + message(STATUS "Warning: Static building not supported yet. Building dynamic.") #Blocked by libbson + set(VCPKG_LIBRARY_LINKAGE dynamic) endif() include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mongo-c-driver-1.4.2) diff --git a/ports/mongo-cxx-driver/portfile.cmake b/ports/mongo-cxx-driver/portfile.cmake index 16a3eb56ae..2972f1c5b4 100644 --- a/ports/mongo-cxx-driver/portfile.cmake +++ b/ports/mongo-cxx-driver/portfile.cmake @@ -1,5 +1,6 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - message(FATAL_ERROR "Static building not supported yet. Portfile not modified and blocked by libbson.") + message(STATUS "Warning: Static building not supported yet. Building dynamic.") #Blocked by libbson + set(VCPKG_LIBRARY_LINKAGE dynamic) endif() include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mongo-cxx-driver-r3.0.2) diff --git a/ports/mpg123/portfile.cmake b/ports/mpg123/portfile.cmake index 8cf90bc293..0308bb17e8 100644 --- a/ports/mpg123/portfile.cmake +++ b/ports/mpg123/portfile.cmake @@ -1,5 +1,6 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - message(FATAL_ERROR "Static building not supported yet") + message(STATUS "Warning: Static building not supported yet. Building dynamic.") + set(VCPKG_LIBRARY_LINKAGE dynamic) endif() include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mpg123-1.23.3) diff --git a/ports/mpir/portfile.cmake b/ports/mpir/portfile.cmake index f70ab0ed27..a3a704407a 100644 --- a/ports/mpir/portfile.cmake +++ b/ports/mpir/portfile.cmake @@ -1,5 +1,6 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - message(FATAL_ERROR "Static building not supported yet") + message(STATUS "Warning: Static building not supported yet. Building dynamic.") + set(VCPKG_LIBRARY_LINKAGE dynamic) endif() include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mpir-2.7.2) diff --git a/ports/nanodbc/portfile.cmake b/ports/nanodbc/portfile.cmake index d3139dec91..fc735f03fc 100644 --- a/ports/nanodbc/portfile.cmake +++ b/ports/nanodbc/portfile.cmake @@ -1,5 +1,6 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - message(FATAL_ERROR "Static building not supported yet") + message(STATUS "Warning: Static building not supported yet. Building dynamic.") + set(VCPKG_LIBRARY_LINKAGE dynamic) endif() include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/nanodbc-2.12.4) diff --git a/ports/openal-soft/portfile.cmake b/ports/openal-soft/portfile.cmake index 76272937de..bfb8b4ffb9 100644 --- a/ports/openal-soft/portfile.cmake +++ b/ports/openal-soft/portfile.cmake @@ -1,5 +1,6 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - message(FATAL_ERROR "Static building not supported yet") + message(STATUS "Warning: Static building not supported yet. Building dynamic.") + set(VCPKG_LIBRARY_LINKAGE dynamic) endif() include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openal-soft-1.17.2) diff --git a/ports/opencv/portfile.cmake b/ports/opencv/portfile.cmake index 3559dcb23f..224c99c428 100644 --- a/ports/opencv/portfile.cmake +++ b/ports/opencv/portfile.cmake @@ -1,5 +1,6 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - message(FATAL_ERROR "Static building not supported yet. Portfile not modified and blocked by libjpeg-turbo.") + message(STATUS "Warning: Static building not supported yet. Building dynamic.") + set(VCPKG_LIBRARY_LINKAGE dynamic) endif() include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/opencv-92387b1ef8fad15196dd5f7fb4931444a68bc93a) diff --git a/ports/physfs/portfile.cmake b/ports/physfs/portfile.cmake index b4768cc395..082cc7740d 100644 --- a/ports/physfs/portfile.cmake +++ b/ports/physfs/portfile.cmake @@ -7,7 +7,8 @@ # if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - message(FATAL_ERROR "Static building not supported yet") + message(STATUS "Warning: Static building not supported yet. Building dynamic.") + set(VCPKG_LIBRARY_LINKAGE dynamic) endif() include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/physfs-2.0.3) diff --git a/ports/sdl2/portfile.cmake b/ports/sdl2/portfile.cmake index 3fca789812..9e0957eda0 100644 --- a/ports/sdl2/portfile.cmake +++ b/ports/sdl2/portfile.cmake @@ -1,5 +1,6 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - message(FATAL_ERROR "Static building not supported yet") + message(STATUS "Warning: Static building not supported yet. Building dynamic.") + set(VCPKG_LIBRARY_LINKAGE dynamic) endif() include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/SDL2-2.0.4) diff --git a/ports/sery/portfile.cmake b/ports/sery/portfile.cmake index 86d76b33d2..d6ebad5b69 100644 --- a/ports/sery/portfile.cmake +++ b/ports/sery/portfile.cmake @@ -1,5 +1,6 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - message(FATAL_ERROR "Dynamic building not supported yet") + message(STATUS "Warning: Dynamic building not supported yet. Building static.") + set(VCPKG_LIBRARY_LINKAGE static) endif() include(vcpkg_common_functions) SET(SOURCE_PATH "${CURRENT_BUILDTREES_DIR}/src/Sery-1.0") diff --git a/ports/tbb/portfile.cmake b/ports/tbb/portfile.cmake index 752386282f..fc761f113a 100644 --- a/ports/tbb/portfile.cmake +++ b/ports/tbb/portfile.cmake @@ -7,7 +7,8 @@ # if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - message(FATAL_ERROR "Static building not supported yet") + message(STATUS "Warning: Static building not supported yet. Building dynamic.") + set(VCPKG_LIBRARY_LINKAGE dynamic) endif() include(vcpkg_common_functions)