diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2016-11-08 15:09:56 -0800 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2016-11-08 15:09:56 -0800 |
| commit | dbab03a1a82913ae96bfa3c1613ade20b5ac438d (patch) | |
| tree | 8086e4554c7902d6b0a3a0079425785e4eec5141 | |
| parent | 2e7b260b32454d32fb10cc9d838409f82c7744b8 (diff) | |
| parent | 218cae4503749134f4827b3e71fbf22a956d4dc3 (diff) | |
| download | vcpkg-dbab03a1a82913ae96bfa3c1613ade20b5ac438d.tar.gz vcpkg-dbab03a1a82913ae96bfa3c1613ade20b5ac438d.zip | |
Merge branch 'postbuild'
83 files changed, 197 insertions, 156 deletions
diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake index 4838afc42..8301fb232 100644 --- a/ports/ace/portfile.cmake +++ b/ports/ace/portfile.cmake @@ -1,6 +1,6 @@ -include(${CMAKE_TRIPLET_FILE}) 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) @@ -19,7 +19,7 @@ else () set(MSBUILD_PLATFORM ${TRIPLET_SYSTEM_ARCH}) endif() -# Add ace/config.h file +# Add ace/config.h file # see http://www.dre.vanderbilt.edu/~schmidt/DOC_ROOT/ACE/ACE-INSTALL.html#win32 file(WRITE ${SOURCE_PATH}/config.h "#include \"ace/config-windows.h\"") vcpkg_build_msbuild( @@ -27,16 +27,16 @@ vcpkg_build_msbuild( PLATFORM ${MSBUILD_PLATFORM} ) -# ACE itself does not define an install target, so it is not clear which -# headers are public and which not. For the moment we install everything +# ACE itself does not define an install target, so it is not clear which +# headers are public and which not. For the moment we install everything # that is in the source path and ends in .h, .inl function(install_ace_headers_subdirectory SOURCE_PATH RELATIVE_PATH) file(GLOB HEADER_FILES ${SOURCE_PATH}/${RELATIVE_PATH}/*.h ${SOURCE_PATH}/${RELATIVE_PATH}/*.inl) file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/ace/${RELATIVE_PATH}) endfunction() -# We manually install header found in the ace directory because in that case -# we are supposed to install also *cpp files, see ACE_wrappers\debian\libace-dev.install file +# We manually install header found in the ace directory because in that case +# we are supposed to install also *cpp files, see ACE_wrappers\debian\libace-dev.install file file(GLOB HEADER_FILES ${SOURCE_PATH}/*.h ${SOURCE_PATH}/*.inl ${SOURCE_PATH}/*.cpp) file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/ace/) @@ -65,7 +65,7 @@ function(install_ace_library SOURCE_PATH ACE_LIBRARY) ${LIB_PATH}/${ACE_LIBRARY}.pdb DESTINATION ${CURRENT_PACKAGES_DIR}/bin ) - + file(INSTALL ${LIB_PATH}/${ACE_LIBRARY}d.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib diff --git a/ports/apr/portfile.cmake b/ports/apr/portfile.cmake index df96d4474..f65b44649 100644 --- a/ports/apr/portfile.cmake +++ b/ports/apr/portfile.cmake @@ -6,7 +6,6 @@ # CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} # -include(${CMAKE_TRIPLET_FILE}) include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/apr-1.5.2) vcpkg_download_distfile(ARCHIVE diff --git a/ports/assimp/portfile.cmake b/ports/assimp/portfile.cmake index e53384ff1..04d19cdd3 100644 --- a/ports/assimp/portfile.cmake +++ b/ports/assimp/portfile.cmake @@ -6,7 +6,6 @@ # CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} # -include(${CMAKE_TRIPLET_FILE}) include(vcpkg_common_functions) vcpkg_download_distfile(ARCHIVE URLS "https://github.com/assimp/assimp/archive/v3.3.1.zip" diff --git a/ports/bond/portfile.cmake b/ports/bond/portfile.cmake index 7e28270f2..8dbf7cf53 100644 --- a/ports/bond/portfile.cmake +++ b/ports/bond/portfile.cmake @@ -1,6 +1,6 @@ -include(${CMAKE_TRIPLET_FILE}) 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/boost/portfile.cmake b/ports/boost/portfile.cmake index 71fc8ba99..586f6dfcf 100644 --- a/ports/boost/portfile.cmake +++ b/ports/boost/portfile.cmake @@ -1,4 +1,3 @@ -include(${CMAKE_TRIPLET_FILE}) include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/boost_1_62_0) diff --git a/ports/box2d/portfile.cmake b/ports/box2d/portfile.cmake index e35242bb7..c0ed6c6c3 100644 --- a/ports/box2d/portfile.cmake +++ b/ports/box2d/portfile.cmake @@ -1,4 +1,3 @@ -include(${CMAKE_TRIPLET_FILE}) # Get output directory set(PROJECT_ARCH_BITS "x64") diff --git a/ports/bullet3/portfile.cmake b/ports/bullet3/portfile.cmake index 7b530ec07..2cd60a45f 100644 --- a/ports/bullet3/portfile.cmake +++ b/ports/bullet3/portfile.cmake @@ -1,4 +1,3 @@ -include(${CMAKE_TRIPLET_FILE}) include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/bullet3-98d47809b4273d97ea06c9b2137ada10af581bb9) vcpkg_download_distfile(ARCHIVE diff --git a/ports/chakracore/portfile.cmake b/ports/chakracore/portfile.cmake index 989c76c60..ea4a3d7ff 100644 --- a/ports/chakracore/portfile.cmake +++ b/ports/chakracore/portfile.cmake @@ -1,6 +1,6 @@ -include(${CMAKE_TRIPLET_FILE}) -if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - message(FATAL_ERROR "Static building not supported yet") +if (VCPKG_LIBRARY_LINKAGE STREQUAL static) + 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/cpprestsdk/portfile.cmake b/ports/cpprestsdk/portfile.cmake index ed0a2176b..d1b5fa7f6 100644 --- a/ports/cpprestsdk/portfile.cmake +++ b/ports/cpprestsdk/portfile.cmake @@ -1,4 +1,3 @@ -include(${CMAKE_TRIPLET_FILE}) include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/cpprestsdk-2.9.0) @@ -12,7 +11,7 @@ vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_apply_patches( SOURCE_PATH ${SOURCE_PATH} - PATCHES + PATCHES ${CMAKE_CURRENT_LIST_DIR}/0001_cmake.patch ) diff --git a/ports/cryptopp/portfile.cmake b/ports/cryptopp/portfile.cmake index 1fc1e4ebd..4847c208b 100644 --- a/ports/cryptopp/portfile.cmake +++ b/ports/cryptopp/portfile.cmake @@ -1,6 +1,6 @@ -include(${CMAKE_TRIPLET_FILE}) 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) @@ -37,8 +37,8 @@ file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/cryptest.exe) file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/cryptest.exe) # Remove other files not required in package -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake) # Handle copyright file(COPY ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/cryptopp) diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index 17063f382..8ad5ed7f7 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -1,6 +1,6 @@ -include(${CMAKE_TRIPLET_FILE}) 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/double-conversion/portfile.cmake b/ports/double-conversion/portfile.cmake index 670cb4310..05365d777 100644 --- a/ports/double-conversion/portfile.cmake +++ b/ports/double-conversion/portfile.cmake @@ -14,7 +14,6 @@ # CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} # -include(${CMAKE_TRIPLET_FILE}) include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/double-conversion-d4d68e4e788bec89d55a6a3e33af674087837c82) vcpkg_download_distfile(ARCHIVE diff --git a/ports/dxut/portfile.cmake b/ports/dxut/portfile.cmake index 8a13e9a2b..774ef4d5f 100644 --- a/ports/dxut/portfile.cmake +++ b/ports/dxut/portfile.cmake @@ -1,6 +1,6 @@ -include(${CMAKE_TRIPLET_FILE}) 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/expat/portfile.cmake b/ports/expat/portfile.cmake index 883d6cffb..37180d97b 100644 --- a/ports/expat/portfile.cmake +++ b/ports/expat/portfile.cmake @@ -1,4 +1,3 @@ -include(${CMAKE_TRIPLET_FILE}) include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/expat-2.1.1) vcpkg_download_distfile(ARCHIVE_FILE diff --git a/ports/fastlz/portfile.cmake b/ports/fastlz/portfile.cmake index 33161b56a..5b28df291 100644 --- a/ports/fastlz/portfile.cmake +++ b/ports/fastlz/portfile.cmake @@ -1,4 +1,3 @@ -include(${CMAKE_TRIPLET_FILE}) include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/FastLZ-master) vcpkg_download_distfile(ARCHIVE diff --git a/ports/fmt/portfile.cmake b/ports/fmt/portfile.cmake index 26465b6b2..6f9f42231 100644 --- a/ports/fmt/portfile.cmake +++ b/ports/fmt/portfile.cmake @@ -1,6 +1,6 @@ -include(${CMAKE_TRIPLET_FILE}) 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 3ef5be1fd..8ea89d780 100644 --- a/ports/freeglut/portfile.cmake +++ b/ports/freeglut/portfile.cmake @@ -1,6 +1,6 @@ -include(${CMAKE_TRIPLET_FILE}) 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/freetype/portfile.cmake b/ports/freetype/portfile.cmake index 621caea18..8d7bf158f 100644 --- a/ports/freetype/portfile.cmake +++ b/ports/freetype/portfile.cmake @@ -1,4 +1,3 @@ -include(${CMAKE_TRIPLET_FILE}) include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/freetype-2.6.3) vcpkg_download_distfile(ARCHIVE diff --git a/ports/geos/portfile.cmake b/ports/geos/portfile.cmake index b539b3f6f..60d907acd 100644 --- a/ports/geos/portfile.cmake +++ b/ports/geos/portfile.cmake @@ -6,7 +6,6 @@ # CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} # -include(${CMAKE_TRIPLET_FILE}) include(vcpkg_common_functions) #downloading 3.5 from their SVN repo and not the release tarball #because the 3.5 release did not build on windows, and fixes were backported diff --git a/ports/gettext/portfile.cmake b/ports/gettext/portfile.cmake index 1da88b0e9..f14f7a707 100644 --- a/ports/gettext/portfile.cmake +++ b/ports/gettext/portfile.cmake @@ -8,7 +8,6 @@ #Based on https://github.com/winlibs/gettext -include(${CMAKE_TRIPLET_FILE}) include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/gettext-0.19) vcpkg_download_distfile(ARCHIVE diff --git a/ports/gflags/portfile.cmake b/ports/gflags/portfile.cmake index 7ca94d9fd..b600d8832 100644 --- a/ports/gflags/portfile.cmake +++ b/ports/gflags/portfile.cmake @@ -1,4 +1,3 @@ -include(${CMAKE_TRIPLET_FILE}) include(vcpkg_common_functions) find_program(GIT git) @@ -64,8 +63,8 @@ file(WRITE ${CURRENT_PACKAGES_DIR}/share/gflags/gflags-export-release.cmake "${G file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/cmake) file(READ ${CURRENT_PACKAGES_DIR}/share/gflags/gflags-export.cmake GFLAGS_CONFIG_MODULE) -string(REPLACE "get_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)" - "get_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)\nget_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)" +string(REPLACE "get_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)" + "get_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)\nget_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)" GFLAGS_CONFIG_MODULE "${GFLAGS_CONFIG_MODULE}") file(WRITE ${CURRENT_PACKAGES_DIR}/share/gflags/gflags-export.cmake ${GFLAGS_CONFIG_MODULE}) diff --git a/ports/glbinding/portfile.cmake b/ports/glbinding/portfile.cmake index 38cc21542..cf578c0a5 100644 --- a/ports/glbinding/portfile.cmake +++ b/ports/glbinding/portfile.cmake @@ -6,7 +6,6 @@ # CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} # -include(${CMAKE_TRIPLET_FILE}) include(vcpkg_common_functions) vcpkg_download_distfile(ARCHIVE diff --git a/ports/glew/portfile.cmake b/ports/glew/portfile.cmake index f048e8c41..fd3c5ef9a 100644 --- a/ports/glew/portfile.cmake +++ b/ports/glew/portfile.cmake @@ -1,6 +1,6 @@ -include(${CMAKE_TRIPLET_FILE}) 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/glfw3/portfile.cmake b/ports/glfw3/portfile.cmake index b947142d8..3f834f9b6 100644 --- a/ports/glfw3/portfile.cmake +++ b/ports/glfw3/portfile.cmake @@ -1,4 +1,3 @@ -include(${CMAKE_TRIPLET_FILE}) include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/glfw-3.2.1) vcpkg_download_distfile(ARCHIVE diff --git a/ports/glog/portfile.cmake b/ports/glog/portfile.cmake index 7811f185d..4895be694 100644 --- a/ports/glog/portfile.cmake +++ b/ports/glog/portfile.cmake @@ -6,9 +6,9 @@ # CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} # -include(${CMAKE_TRIPLET_FILE}) 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 89cf892a0..a54af6e55 100644 --- a/ports/grpc/portfile.cmake +++ b/ports/grpc/portfile.cmake @@ -1,6 +1,6 @@ -include(${CMAKE_TRIPLET_FILE}) 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 f798310ad..e1d601d7b 100644 --- a/ports/gtest/portfile.cmake +++ b/ports/gtest/portfile.cmake @@ -1,6 +1,6 @@ -include(${CMAKE_TRIPLET_FILE}) 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 1bb64f3e4..2603fdf0a 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -6,9 +6,9 @@ # CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} # -include(${CMAKE_TRIPLET_FILE}) 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/jxrlib/portfile.cmake b/ports/jxrlib/portfile.cmake index 53bf30bb5..914adf14e 100644 --- a/ports/jxrlib/portfile.cmake +++ b/ports/jxrlib/portfile.cmake @@ -1,4 +1,3 @@ -include(${CMAKE_TRIPLET_FILE}) include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) vcpkg_download_distfile(ARCHIVE diff --git a/ports/libbson/portfile.cmake b/ports/libbson/portfile.cmake index a7d347cae..71846b643 100644 --- a/ports/libbson/portfile.cmake +++ b/ports/libbson/portfile.cmake @@ -1,6 +1,6 @@ -include(${CMAKE_TRIPLET_FILE}) 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/libccd/portfile.cmake b/ports/libccd/portfile.cmake index 67eda1ccb..963000ec5 100644 --- a/ports/libccd/portfile.cmake +++ b/ports/libccd/portfile.cmake @@ -6,7 +6,6 @@ # CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} # -include(${CMAKE_TRIPLET_FILE}) include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libccd-16b9379fb6e8610566fe5e1396166daf7106f165) vcpkg_download_distfile(ARCHIVE diff --git a/ports/libiconv/portfile.cmake b/ports/libiconv/portfile.cmake index 15d324d23..cfb96391b 100644 --- a/ports/libiconv/portfile.cmake +++ b/ports/libiconv/portfile.cmake @@ -1,4 +1,3 @@ -include(${CMAKE_TRIPLET_FILE}) include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libiconv-1.14) vcpkg_download_distfile(ARCHIVE diff --git a/ports/libjpeg-turbo/portfile.cmake b/ports/libjpeg-turbo/portfile.cmake index 0ec4a0c9c..c9672332e 100644 --- a/ports/libjpeg-turbo/portfile.cmake +++ b/ports/libjpeg-turbo/portfile.cmake @@ -1,4 +1,3 @@ -include(${CMAKE_TRIPLET_FILE}) include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libjpeg-turbo-1.4.90) diff --git a/ports/libmariadb/portfile.cmake b/ports/libmariadb/portfile.cmake index ab40ab5c9..e6ccfa508 100644 --- a/ports/libmariadb/portfile.cmake +++ b/ports/libmariadb/portfile.cmake @@ -1,6 +1,6 @@ -include(${CMAKE_TRIPLET_FILE}) 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) @@ -26,27 +26,27 @@ vcpkg_install_cmake() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # fix libmariadb lib & dll directory. -file(MAKE_DIRECTORY +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) -file(RENAME - ${CURRENT_PACKAGES_DIR}/lib/mariadb/libmariadb.dll +file(RENAME + ${CURRENT_PACKAGES_DIR}/lib/mariadb/libmariadb.dll ${CURRENT_PACKAGES_DIR}/bin/libmariadb.dll) -file(RENAME - ${CURRENT_PACKAGES_DIR}/debug/lib/mariadb/libmariadb.dll +file(RENAME + ${CURRENT_PACKAGES_DIR}/debug/lib/mariadb/libmariadb.dll ${CURRENT_PACKAGES_DIR}/debug/bin/libmariadb.dll) -file(RENAME - ${CURRENT_PACKAGES_DIR}/lib/mariadb/libmariadb.lib +file(RENAME + ${CURRENT_PACKAGES_DIR}/lib/mariadb/libmariadb.lib ${CURRENT_PACKAGES_DIR}/lib/libmariadb.lib) -file(RENAME - ${CURRENT_PACKAGES_DIR}/debug/lib/mariadb/libmariadb.lib +file(RENAME + ${CURRENT_PACKAGES_DIR}/debug/lib/mariadb/libmariadb.lib ${CURRENT_PACKAGES_DIR}/debug/lib/libmariadb.lib) -file(REMOVE +file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/mariadb/mariadbclient.lib ${CURRENT_PACKAGES_DIR}/debug/lib/mariadb/mariadbclient.lib) # remove plugin folder -file(REMOVE_RECURSE +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/plugin ${CURRENT_PACKAGES_DIR}/debug/lib/plugin ${CURRENT_PACKAGES_DIR}/lib/mariadb diff --git a/ports/libmysql/portfile.cmake b/ports/libmysql/portfile.cmake index 9c2aafdc1..48412ccc7 100644 --- a/ports/libmysql/portfile.cmake +++ b/ports/libmysql/portfile.cmake @@ -1,6 +1,6 @@ -include(${CMAKE_TRIPLET_FILE}) 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) @@ -18,7 +18,7 @@ vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_apply_patches( SOURCE_PATH ${SOURCE_PATH} - PATCHES + PATCHES ${CMAKE_CURRENT_LIST_DIR}/0001_cmake.patch ) @@ -29,11 +29,11 @@ vcpkg_configure_cmake( vcpkg_install_cmake() # delete debug headers -file(REMOVE_RECURSE +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # delete useless vcruntime/scripts/bin/msg file -file(REMOVE_RECURSE +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share ${CURRENT_PACKAGES_DIR}/debug/share ${CURRENT_PACKAGES_DIR}/bin diff --git a/ports/libodb-sqlite/portfile.cmake b/ports/libodb-sqlite/portfile.cmake index 27d157bf5..a1228f4ed 100644 --- a/ports/libodb-sqlite/portfile.cmake +++ b/ports/libodb-sqlite/portfile.cmake @@ -6,7 +6,6 @@ # CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} # -include(${CMAKE_TRIPLET_FILE}) include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libodb-sqlite-2.4.0) vcpkg_download_distfile(ARCHIVE diff --git a/ports/libodb/portfile.cmake b/ports/libodb/portfile.cmake index 770cc0948..21d715499 100644 --- a/ports/libodb/portfile.cmake +++ b/ports/libodb/portfile.cmake @@ -6,7 +6,6 @@ # CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} # -include(${CMAKE_TRIPLET_FILE}) include(vcpkg_common_functions) include(CMakePackageConfigHelpers) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libodb-2.4.0) diff --git a/ports/libogg/portfile.cmake b/ports/libogg/portfile.cmake index d19bee8f7..4127a6aef 100644 --- a/ports/libogg/portfile.cmake +++ b/ports/libogg/portfile.cmake @@ -6,7 +6,6 @@ # CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} # -include(${CMAKE_TRIPLET_FILE}) include(vcpkg_common_functions) find_program(GIT git) diff --git a/ports/libpng/portfile.cmake b/ports/libpng/portfile.cmake index 61500e680..f7be6cca1 100644 --- a/ports/libpng/portfile.cmake +++ b/ports/libpng/portfile.cmake @@ -1,4 +1,3 @@ -include(${CMAKE_TRIPLET_FILE}) include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libpng-1.6.24) diff --git a/ports/libraw/portfile.cmake b/ports/libraw/portfile.cmake index 284b440e6..69c168a07 100644 --- a/ports/libraw/portfile.cmake +++ b/ports/libraw/portfile.cmake @@ -1,4 +1,3 @@ -include(${CMAKE_TRIPLET_FILE}) include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/LibRaw-0.17.2) vcpkg_download_distfile(ARCHIVE diff --git a/ports/libtheora/portfile.cmake b/ports/libtheora/portfile.cmake index fcaabf44f..0d63621e5 100644 --- a/ports/libtheora/portfile.cmake +++ b/ports/libtheora/portfile.cmake @@ -6,7 +6,6 @@ # CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} # -include(${CMAKE_TRIPLET_FILE}) include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libtheora-1.1.1) vcpkg_download_distfile(ARCHIVE diff --git a/ports/libuv/portfile.cmake b/ports/libuv/portfile.cmake index e8fdb1eaa..5f5cd0474 100644 --- a/ports/libuv/portfile.cmake +++ b/ports/libuv/portfile.cmake @@ -1,6 +1,6 @@ -include(${CMAKE_TRIPLET_FILE}) 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 cff89d653..66bfca07c 100644 --- a/ports/libvorbis/portfile.cmake +++ b/ports/libvorbis/portfile.cmake @@ -6,9 +6,9 @@ # CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} # -include(${CMAKE_TRIPLET_FILE}) 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/libwebp/portfile.cmake b/ports/libwebp/portfile.cmake index b9d77c6f6..d85e4fdaf 100644 --- a/ports/libwebp/portfile.cmake +++ b/ports/libwebp/portfile.cmake @@ -1,4 +1,3 @@ -include(${CMAKE_TRIPLET_FILE}) include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libwebp-0.5.1) vcpkg_download_distfile(ARCHIVE diff --git a/ports/libwebsockets/portfile.cmake b/ports/libwebsockets/portfile.cmake index 9622f0e01..27088bf87 100644 --- a/ports/libwebsockets/portfile.cmake +++ b/ports/libwebsockets/portfile.cmake @@ -1,6 +1,6 @@ -include(${CMAKE_TRIPLET_FILE}) 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/libxml2/portfile.cmake b/ports/libxml2/portfile.cmake index 26a604897..f7e17e21b 100644 --- a/ports/libxml2/portfile.cmake +++ b/ports/libxml2/portfile.cmake @@ -6,7 +6,6 @@ # CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} # -include(${CMAKE_TRIPLET_FILE}) include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libxml2-2.9.4) vcpkg_download_distfile(ARCHIVE diff --git a/ports/log4cplus/portfile.cmake b/ports/log4cplus/portfile.cmake index 78620597a..1eb1a7a59 100644 --- a/ports/log4cplus/portfile.cmake +++ b/ports/log4cplus/portfile.cmake @@ -1,4 +1,3 @@ -include(${CMAKE_TRIPLET_FILE}) include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/log4cplus-REL_1_1_3-RC7) vcpkg_download_distfile(ARCHIVE diff --git a/ports/lua/portfile.cmake b/ports/lua/portfile.cmake index f8c1071f7..598b15c94 100644 --- a/ports/lua/portfile.cmake +++ b/ports/lua/portfile.cmake @@ -6,7 +6,6 @@ # CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} # -include(${CMAKE_TRIPLET_FILE}) include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/lua-5.3.3) vcpkg_download_distfile(ARCHIVE diff --git a/ports/mongo-c-driver/portfile.cmake b/ports/mongo-c-driver/portfile.cmake index 27b70b7f7..1aa83f6bb 100644 --- a/ports/mongo-c-driver/portfile.cmake +++ b/ports/mongo-c-driver/portfile.cmake @@ -1,6 +1,6 @@ -include(${CMAKE_TRIPLET_FILE}) 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 867275aea..2972f1c5b 100644 --- a/ports/mongo-cxx-driver/portfile.cmake +++ b/ports/mongo-cxx-driver/portfile.cmake @@ -1,6 +1,6 @@ -include(${CMAKE_TRIPLET_FILE}) 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) @@ -24,7 +24,7 @@ vcpkg_configure_cmake( -DLIBMONGOC_DIR=${CURRENT_INSTALLED_DIR} ) -vcpkg_install_cmake() +vcpkg_install_cmake() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake) diff --git a/ports/mpg123/portfile.cmake b/ports/mpg123/portfile.cmake index de04b9c88..0308bb17e 100644 --- a/ports/mpg123/portfile.cmake +++ b/ports/mpg123/portfile.cmake @@ -1,6 +1,6 @@ -include(${CMAKE_TRIPLET_FILE}) 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 92cec4b23..a3a704407 100644 --- a/ports/mpir/portfile.cmake +++ b/ports/mpir/portfile.cmake @@ -1,6 +1,6 @@ -include(${CMAKE_TRIPLET_FILE}) 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 9a949e7ac..fc735f03f 100644 --- a/ports/nanodbc/portfile.cmake +++ b/ports/nanodbc/portfile.cmake @@ -1,6 +1,6 @@ -include(${CMAKE_TRIPLET_FILE}) 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) @@ -14,7 +14,7 @@ vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_apply_patches( SOURCE_PATH ${SOURCE_PATH} - PATCHES + PATCHES ${CMAKE_CURRENT_LIST_DIR}/0001_cmake.patch ${CMAKE_CURRENT_LIST_DIR}/0002_msvc14_codecvt.patch ${CMAKE_CURRENT_LIST_DIR}/0003_export_def.patch @@ -29,7 +29,7 @@ vcpkg_configure_cmake( -DNANODBC_USE_UNICODE=ON ) -vcpkg_install_cmake() +vcpkg_install_cmake() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/ports/openal-soft/portfile.cmake b/ports/openal-soft/portfile.cmake index 397726cee..bfb8b4ffb 100644 --- a/ports/openal-soft/portfile.cmake +++ b/ports/openal-soft/portfile.cmake @@ -1,6 +1,6 @@ -include(${CMAKE_TRIPLET_FILE}) 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 b6665eedc..224c99c42 100644 --- a/ports/opencv/portfile.cmake +++ b/ports/opencv/portfile.cmake @@ -1,6 +1,6 @@ -include(${CMAKE_TRIPLET_FILE}) 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/openjpeg/portfile.cmake b/ports/openjpeg/portfile.cmake index 9ce215bbc..dfa25881d 100644 --- a/ports/openjpeg/portfile.cmake +++ b/ports/openjpeg/portfile.cmake @@ -1,4 +1,3 @@ -include(${CMAKE_TRIPLET_FILE}) include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openjpeg-2.1.2) vcpkg_download_distfile(ARCHIVE diff --git a/ports/openssl/portfile.cmake b/ports/openssl/portfile.cmake index 3b5abb475..9b84b7475 100644 --- a/ports/openssl/portfile.cmake +++ b/ports/openssl/portfile.cmake @@ -1,5 +1,3 @@ -include(${CMAKE_TRIPLET_FILE}) - if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") include(${CMAKE_CURRENT_LIST_DIR}/portfile-uwp.cmake) return() diff --git a/ports/pcre/portfile.cmake b/ports/pcre/portfile.cmake index 2a9c1ee76..0dcc8a97c 100644 --- a/ports/pcre/portfile.cmake +++ b/ports/pcre/portfile.cmake @@ -6,7 +6,6 @@ # CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} # -include(${CMAKE_TRIPLET_FILE}) include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/pcre-8.38) vcpkg_download_distfile(ARCHIVE diff --git a/ports/pdcurses/portfile.cmake b/ports/pdcurses/portfile.cmake index 2f3429d68..8ba0f99ba 100644 --- a/ports/pdcurses/portfile.cmake +++ b/ports/pdcurses/portfile.cmake @@ -1,4 +1,3 @@ -include(${CMAKE_TRIPLET_FILE}) if(VCPKG_TARGET_ARCHITECTURE STREQUAL x64) message(FATAL_ERROR "64-bit builds are not supported for PDCurses.") diff --git a/ports/physfs/portfile.cmake b/ports/physfs/portfile.cmake index 80ed17d0f..082cc7740 100644 --- a/ports/physfs/portfile.cmake +++ b/ports/physfs/portfile.cmake @@ -6,9 +6,9 @@ # CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} # -include(${CMAKE_TRIPLET_FILE}) 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/ragel/portfile.cmake b/ports/ragel/portfile.cmake index c5f91b5ca..8568f6bac 100644 --- a/ports/ragel/portfile.cmake +++ b/ports/ragel/portfile.cmake @@ -6,7 +6,6 @@ # CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} # -include(${CMAKE_TRIPLET_FILE}) include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ragel-6.9) vcpkg_download_distfile(ARCHIVE diff --git a/ports/sdl2/portfile.cmake b/ports/sdl2/portfile.cmake index d6e53b491..9e0957eda 100644 --- a/ports/sdl2/portfile.cmake +++ b/ports/sdl2/portfile.cmake @@ -1,6 +1,6 @@ -include(${CMAKE_TRIPLET_FILE}) 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 9d7e5b770..d6ebad5b6 100644 --- a/ports/sery/portfile.cmake +++ b/ports/sery/portfile.cmake @@ -1,6 +1,6 @@ -include(${CMAKE_TRIPLET_FILE}) 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/sqlite3/portfile.cmake b/ports/sqlite3/portfile.cmake index a7999b68c..8302e9d3e 100644 --- a/ports/sqlite3/portfile.cmake +++ b/ports/sqlite3/portfile.cmake @@ -1,4 +1,3 @@ -include(${CMAKE_TRIPLET_FILE}) include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/sqlite-amalgamation-3150000) vcpkg_download_distfile(ARCHIVE diff --git a/ports/tbb/portfile.cmake b/ports/tbb/portfile.cmake index 06349b35c..fc761f113 100644 --- a/ports/tbb/portfile.cmake +++ b/ports/tbb/portfile.cmake @@ -6,9 +6,9 @@ # CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} # -include(${CMAKE_TRIPLET_FILE}) 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/tiff/portfile.cmake b/ports/tiff/portfile.cmake index 2266cfe35..6a6701caa 100644 --- a/ports/tiff/portfile.cmake +++ b/ports/tiff/portfile.cmake @@ -1,4 +1,3 @@ -include(${CMAKE_TRIPLET_FILE}) include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/tiff-4.0.6) vcpkg_download_distfile(ARCHIVE diff --git a/ports/tinyxml2/portfile.cmake b/ports/tinyxml2/portfile.cmake index a754b34e5..656f4783f 100644 --- a/ports/tinyxml2/portfile.cmake +++ b/ports/tinyxml2/portfile.cmake @@ -1,4 +1,3 @@ -include(${CMAKE_TRIPLET_FILE}) include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/tinyxml2-3.0.0) vcpkg_download_distfile(ARCHIVE diff --git a/ports/wt/portfile.cmake b/ports/wt/portfile.cmake index bacb09dda..66b1d5a33 100644 --- a/ports/wt/portfile.cmake +++ b/ports/wt/portfile.cmake @@ -1,4 +1,3 @@ -include(${CMAKE_TRIPLET_FILE}) include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/wt-3.3.6) diff --git a/ports/zeromq/portfile.cmake b/ports/zeromq/portfile.cmake index 3679a6b35..f27738488 100644 --- a/ports/zeromq/portfile.cmake +++ b/ports/zeromq/portfile.cmake @@ -1,4 +1,3 @@ -include(${CMAKE_TRIPLET_FILE}) include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libzmq-1a02b1b3f2fde6288579cbb0ff9a0b1f195e1812) vcpkg_download_distfile(ARCHIVE diff --git a/ports/zlib/portfile.cmake b/ports/zlib/portfile.cmake index 1d6d807d4..ef891f685 100644 --- a/ports/zlib/portfile.cmake +++ b/ports/zlib/portfile.cmake @@ -1,4 +1,3 @@ -include(${CMAKE_TRIPLET_FILE}) include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/zlib-1.2.8) vcpkg_download_distfile(ARCHIVE_FILE diff --git a/ports/zziplib/portfile.cmake b/ports/zziplib/portfile.cmake index 3e21be80b..2a7e18e56 100644 --- a/ports/zziplib/portfile.cmake +++ b/ports/zziplib/portfile.cmake @@ -1,4 +1,3 @@ -include(${CMAKE_TRIPLET_FILE}) include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/zziplib-0.13.62) vcpkg_download_distfile(ARCHIVE diff --git a/scripts/ports.cmake b/scripts/ports.cmake index 44cb386be..762997491 100644 --- a/scripts/ports.cmake +++ b/scripts/ports.cmake @@ -70,7 +70,12 @@ if(CMD MATCHES "^BUILD$") endif() file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR} ${CURRENT_PACKAGES_DIR}) + include(${CMAKE_TRIPLET_FILE}) include(${CURRENT_PORT_DIR}/portfile.cmake) + + set(BUILD_INFO_FILE_PATH ${CURRENT_PACKAGES_DIR}/BUILD_INFO) + file(WRITE ${BUILD_INFO_FILE_PATH} "CRTLinkage: ${VCPKG_CRT_LINKAGE}\n") + file(APPEND ${BUILD_INFO_FILE_PATH} "LibraryLinkage: ${VCPKG_LIBRARY_LINKAGE}") elseif(CMD MATCHES "^CREATE$") file(TO_NATIVE_PATH ${VCPKG_ROOT_DIR} NATIVE_VCPKG_ROOT_DIR) file(TO_NATIVE_PATH ${DOWNLOADS} NATIVE_DOWNLOADS) diff --git a/scripts/templates/portfile.in.cmake b/scripts/templates/portfile.in.cmake index 804d8d216..c848b6445 100644 --- a/scripts/templates/portfile.in.cmake +++ b/scripts/templates/portfile.in.cmake @@ -6,7 +6,6 @@ # CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} # -include(${CMAKE_TRIPLET_FILE}) include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/@ROOT_NAME@) vcpkg_download_distfile(ARCHIVE diff --git a/toolsrc/include/BuildInfo.h b/toolsrc/include/BuildInfo.h new file mode 100644 index 000000000..2801cf49d --- /dev/null +++ b/toolsrc/include/BuildInfo.h @@ -0,0 +1,28 @@ +#pragma once + +#include <unordered_map> +#include "Paragraphs.h" + +namespace fs = std::tr2::sys; + +namespace vcpkg +{ + enum class LinkageType + { + DYNAMIC, + STATIC, + UNKNOWN + }; + + LinkageType linkage_type_value_of(const std::string& as_string); + + struct BuildInfo + { + static BuildInfo create(const std::unordered_map<std::string, std::string>& pgh); + + std::string crt_linkage; + std::string library_linkage; + }; + + BuildInfo read_build_info(const fs::path& filepath); +} diff --git a/toolsrc/include/triplet.h b/toolsrc/include/triplet.h index bc99a17df..32ea2e711 100644 --- a/toolsrc/include/triplet.h +++ b/toolsrc/include/triplet.h @@ -8,20 +8,12 @@ namespace vcpkg { static triplet from_canonical_name(const std::string& triplet_as_string); - enum class BuildType - { - DYNAMIC, - STATIC - }; - static const triplet X86_WINDOWS; static const triplet X64_WINDOWS; static const triplet X86_UWP; static const triplet X64_UWP; static const triplet ARM_UWP; - BuildType build_type() const; - const std::string& canonical_name() const; std::string architecture() const; diff --git a/toolsrc/include/vcpkg_paths.h b/toolsrc/include/vcpkg_paths.h index 8276242e9..2dc9c7636 100644 --- a/toolsrc/include/vcpkg_paths.h +++ b/toolsrc/include/vcpkg_paths.h @@ -14,7 +14,9 @@ namespace vcpkg fs::path package_dir(const package_spec& spec) const; fs::path port_dir(const package_spec& spec) const; + fs::path build_info_file_path(const package_spec& spec) const; fs::path listfile_path(const BinaryParagraph& pgh) const; + bool is_valid_triplet(const triplet& t) const; fs::path root; diff --git a/toolsrc/src/BuildInfo.cpp b/toolsrc/src/BuildInfo.cpp new file mode 100644 index 000000000..dc8d90e2e --- /dev/null +++ b/toolsrc/src/BuildInfo.cpp @@ -0,0 +1,46 @@ +#include "BuildInfo.h" +#include "vcpkg_Checks.h" +#include "vcpkglib_helpers.h" + +namespace vcpkg +{ + // + namespace BuildInfoRequiredField + { + static const std::string CRT_LINKAGE = "CRTLinkage"; + static const std::string LIBRARY_LINKAGE = "LibraryLinkage"; + } + + BuildInfo BuildInfo::create(const std::unordered_map<std::string, std::string>& pgh) + { + BuildInfo build_info; + build_info.crt_linkage = details::required_field(pgh, BuildInfoRequiredField::CRT_LINKAGE); + build_info.library_linkage = details::required_field(pgh, BuildInfoRequiredField::LIBRARY_LINKAGE); + + return build_info; + } + + LinkageType linkage_type_value_of(const std::string& as_string) + + { + if (as_string == "dynamic") + { + return LinkageType::DYNAMIC; + } + + if (as_string == "static") + { + return LinkageType::STATIC; + } + + return LinkageType::UNKNOWN; + } + + BuildInfo read_build_info(const fs::path& filepath) + { + const std::vector<std::unordered_map<std::string, std::string>> pghs = Paragraphs::get_paragraphs(filepath); + Checks::check_throw(pghs.size() == 1, "Invalid BUILD_INFO file for package"); + + return BuildInfo::create(pghs[0]); + } +} diff --git a/toolsrc/src/post_build_lint.cpp b/toolsrc/src/post_build_lint.cpp index 8301e74cc..4b784952a 100644 --- a/toolsrc/src/post_build_lint.cpp +++ b/toolsrc/src/post_build_lint.cpp @@ -5,6 +5,7 @@ #include <functional> #include "vcpkg_System.h" #include "coff_file_reader.h" +#include "BuildInfo.h" namespace fs = std::tr2::sys; @@ -495,6 +496,9 @@ namespace vcpkg void perform_all_checks(const package_spec& spec, const vcpkg_paths& paths) { System::println("-- Performing post-build validation"); + + BuildInfo build_info = read_build_info(paths.build_info_file_path(spec)); + size_t error_count = 0; error_count += check_for_files_in_include_directory(spec, paths); error_count += check_for_files_in_debug_include_directory(spec, paths); @@ -506,10 +510,9 @@ namespace vcpkg error_count += check_for_copyright_file(spec, paths); error_count += check_for_exes(spec, paths); - triplet::BuildType build_type = spec.target_triplet().build_type(); - switch (build_type) + switch (linkage_type_value_of(build_info.library_linkage)) { - case triplet::BuildType::DYNAMIC: + case LinkageType::DYNAMIC: { const std::vector<fs::path> debug_dlls = recursive_find_files_with_extension_in_dir(paths.packages / spec.dir() / "debug" / "bin", ".dll"); const std::vector<fs::path> release_dlls = recursive_find_files_with_extension_in_dir(paths.packages / spec.dir() / "bin", ".dll"); @@ -525,7 +528,7 @@ namespace vcpkg error_count += check_dll_architecture(spec.target_triplet().architecture(), dlls); break; } - case triplet::BuildType::STATIC: + case LinkageType::STATIC: { std::vector<fs::path> dlls; recursive_find_files_with_extension_in_dir(paths.packages / spec.dir(), ".dll", &dlls); @@ -534,7 +537,12 @@ namespace vcpkg error_count += check_bin_folders_are_not_present_in_static_build(spec, paths); break; } - + case LinkageType::UNKNOWN: + { + error_count += 1; + System::println(System::color::warning, "Unknown library_linkage architecture: [ %s ]", build_info.library_linkage); + break; + } default: Checks::unreachable(); } diff --git a/toolsrc/src/triplet.cpp b/toolsrc/src/triplet.cpp index af2ca2a72..a6816b445 100644 --- a/toolsrc/src/triplet.cpp +++ b/toolsrc/src/triplet.cpp @@ -64,14 +64,4 @@ namespace vcpkg auto it = std::find(this->m_canonical_name.cbegin(), this->m_canonical_name.cend(), '-'); return std::string(it + 1, this->m_canonical_name.cend()); } - - triplet::BuildType triplet::build_type() const - { - if (this->m_canonical_name.find("static") != std::string::npos) - { - return BuildType::STATIC; - } - - return BuildType::DYNAMIC; - } } diff --git a/toolsrc/src/vcpkg.cpp b/toolsrc/src/vcpkg.cpp index 00aea1e2e..6e47df2c8 100644 --- a/toolsrc/src/vcpkg.cpp +++ b/toolsrc/src/vcpkg.cpp @@ -158,7 +158,7 @@ static void install_and_write_listfile(const vcpkg_paths& paths, const BinaryPar for (auto it = fs::recursive_directory_iterator(package_prefix_path); it != fs::recursive_directory_iterator(); ++it) { const auto& filename = it->path().filename(); - if (fs::is_regular_file(it->status()) && (filename == "CONTROL" || filename == "control")) + if (fs::is_regular_file(it->status()) && (_stricmp(filename.generic_string().c_str(), "CONTROL") == 0 || _stricmp(filename.generic_string().c_str(), "BUILD_INFO") == 0)) { // Do not copy the control file continue; diff --git a/toolsrc/src/vcpkg_paths.cpp b/toolsrc/src/vcpkg_paths.cpp index 28ab22ec3..5347b79d8 100644 --- a/toolsrc/src/vcpkg_paths.cpp +++ b/toolsrc/src/vcpkg_paths.cpp @@ -55,6 +55,11 @@ namespace vcpkg return this->ports / spec.name(); } + fs::path vcpkg_paths::build_info_file_path(const package_spec& spec) const + { + return this->package_dir(spec) / "BUILD_INFO"; + } + fs::path vcpkg_paths::listfile_path(const BinaryParagraph& pgh) const { return this->vcpkg_dir_info / (pgh.fullstem() + ".list"); diff --git a/toolsrc/vcpkglib/vcpkglib.vcxproj b/toolsrc/vcpkglib/vcpkglib.vcxproj index 766cdf6a8..10cc32935 100644 --- a/toolsrc/vcpkglib/vcpkglib.vcxproj +++ b/toolsrc/vcpkglib/vcpkglib.vcxproj @@ -123,6 +123,7 @@ </ItemDefinitionGroup> <ItemGroup> <ClInclude Include="..\include\BinaryParagraph.h" /> + <ClInclude Include="..\include\BuildInfo.h" /> <ClInclude Include="..\include\package_spec.h" /> <ClInclude Include="..\include\package_spec_parse_result.h" /> <ClInclude Include="..\include\Paragraphs.h" /> @@ -137,6 +138,7 @@ </ItemGroup> <ItemGroup> <ClCompile Include="..\src\BinaryParagraph.cpp" /> + <ClCompile Include="..\src\BuildInfo.cpp" /> <ClCompile Include="..\src\vcpkg.cpp" /> <ClCompile Include="..\src\package_spec.cpp" /> <ClCompile Include="..\src\package_spec_parse_result.cpp" /> diff --git a/toolsrc/vcpkglib/vcpkglib.vcxproj.filters b/toolsrc/vcpkglib/vcpkglib.vcxproj.filters index 705a65a33..e8856235c 100644 --- a/toolsrc/vcpkglib/vcpkglib.vcxproj.filters +++ b/toolsrc/vcpkglib/vcpkglib.vcxproj.filters @@ -51,6 +51,9 @@ <ClCompile Include="..\src\vcpkg_info.cpp"> <Filter>Source Files</Filter> </ClCompile> + <ClCompile Include="..\src\BuildInfo.cpp"> + <Filter>Source Files</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\include\vcpkg.h"> @@ -89,5 +92,8 @@ <ClInclude Include="..\include\vcpkg_info.h"> <Filter>Header Files</Filter> </ClInclude> + <ClInclude Include="..\include\BuildInfo.h"> + <Filter>Header Files</Filter> + </ClInclude> </ItemGroup> </Project>
\ No newline at end of file |