diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2016-11-08 14:25:47 -0800 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2016-11-08 14:25:47 -0800 |
| commit | 1808d461b0e8793445b87eb8ceed71d5ac7aca6e (patch) | |
| tree | 457ed603532038436d92a996afe7b4bdaef78daf | |
| parent | 6e9d17f73c01c3ad07875ca79196ed2f5e2d3896 (diff) | |
| download | vcpkg-1808d461b0e8793445b87eb8ceed71d5ac7aca6e.tar.gz vcpkg-1808d461b0e8793445b87eb8ceed71d5ac7aca6e.zip | |
triplet is now automatically included before portfiles.
Also remove trailing whitespaces from portfiles
72 files changed, 30 insertions, 100 deletions
diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake index 4838afc42..4642f9944 100644 --- a/ports/ace/portfile.cmake +++ b/ports/ace/portfile.cmake @@ -1,4 +1,3 @@ -include(${CMAKE_TRIPLET_FILE}) if (VCPKG_LIBRARY_LINKAGE STREQUAL static) message(FATAL_ERROR "Static building not supported yet") endif() @@ -19,7 +18,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 +26,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 +64,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..3b1ed7116 100644 --- a/ports/bond/portfile.cmake +++ b/ports/bond/portfile.cmake @@ -1,4 +1,3 @@ -include(${CMAKE_TRIPLET_FILE}) if (VCPKG_LIBRARY_LINKAGE STREQUAL static) message(FATAL_ERROR "Static building not supported yet") endif() 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..43710e53c 100644 --- a/ports/chakracore/portfile.cmake +++ b/ports/chakracore/portfile.cmake @@ -1,5 +1,4 @@ -include(${CMAKE_TRIPLET_FILE}) -if (VCPKG_LIBRARY_LINKAGE STREQUAL static) +if (VCPKG_LIBRARY_LINKAGE STREQUAL static) message(FATAL_ERROR "Static building not supported yet") endif() include(vcpkg_common_functions) 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..bdd4f9a12 100644 --- a/ports/cryptopp/portfile.cmake +++ b/ports/cryptopp/portfile.cmake @@ -1,4 +1,3 @@ -include(${CMAKE_TRIPLET_FILE}) if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) message(FATAL_ERROR "Dynamic building not supported") # See note below endif() @@ -37,8 +36,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..54fa7922b 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -1,4 +1,3 @@ -include(${CMAKE_TRIPLET_FILE}) if (VCPKG_LIBRARY_LINKAGE STREQUAL static) message(FATAL_ERROR "Static building not supported yet") endif() 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..849ae133a 100644 --- a/ports/dxut/portfile.cmake +++ b/ports/dxut/portfile.cmake @@ -1,4 +1,3 @@ -include(${CMAKE_TRIPLET_FILE}) if (VCPKG_LIBRARY_LINKAGE STREQUAL static) message(FATAL_ERROR "Static building not supported yet") endif() 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..fab282959 100644 --- a/ports/fmt/portfile.cmake +++ b/ports/fmt/portfile.cmake @@ -1,4 +1,3 @@ -include(${CMAKE_TRIPLET_FILE}) if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) message(FATAL_ERROR "Dynamic building not supported yet") endif() diff --git a/ports/freeglut/portfile.cmake b/ports/freeglut/portfile.cmake index 3ef5be1fd..34413eb57 100644 --- a/ports/freeglut/portfile.cmake +++ b/ports/freeglut/portfile.cmake @@ -1,4 +1,3 @@ -include(${CMAKE_TRIPLET_FILE}) if (VCPKG_LIBRARY_LINKAGE STREQUAL static) message(FATAL_ERROR "Static building not supported yet") endif() 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..8748f4a76 100644 --- a/ports/glew/portfile.cmake +++ b/ports/glew/portfile.cmake @@ -1,4 +1,3 @@ -include(${CMAKE_TRIPLET_FILE}) if (VCPKG_LIBRARY_LINKAGE STREQUAL static) message(FATAL_ERROR "Static building not supported yet") endif() 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..c9f6bfa43 100644 --- a/ports/glog/portfile.cmake +++ b/ports/glog/portfile.cmake @@ -6,7 +6,6 @@ # 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") endif() diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake index 89cf892a0..b8718ea10 100644 --- a/ports/grpc/portfile.cmake +++ b/ports/grpc/portfile.cmake @@ -1,4 +1,3 @@ -include(${CMAKE_TRIPLET_FILE}) if (VCPKG_LIBRARY_LINKAGE STREQUAL static) message(FATAL_ERROR "Static building not supported yet") endif() diff --git a/ports/gtest/portfile.cmake b/ports/gtest/portfile.cmake index f798310ad..b7bfd4b39 100644 --- a/ports/gtest/portfile.cmake +++ b/ports/gtest/portfile.cmake @@ -1,4 +1,3 @@ -include(${CMAKE_TRIPLET_FILE}) if (VCPKG_LIBRARY_LINKAGE STREQUAL static) message(FATAL_ERROR "Static building not supported yet") endif() diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index 1bb64f3e4..84aaed2a7 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -6,7 +6,6 @@ # 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.") endif() 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..50ebf5eca 100644 --- a/ports/libbson/portfile.cmake +++ b/ports/libbson/portfile.cmake @@ -1,4 +1,3 @@ -include(${CMAKE_TRIPLET_FILE}) if (VCPKG_LIBRARY_LINKAGE STREQUAL static) message(FATAL_ERROR "Static building not supported yet") endif() 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..61e2ccee5 100644 --- a/ports/libmariadb/portfile.cmake +++ b/ports/libmariadb/portfile.cmake @@ -1,4 +1,3 @@ -include(${CMAKE_TRIPLET_FILE}) if (VCPKG_LIBRARY_LINKAGE STREQUAL static) message(FATAL_ERROR "Static building not supported yet") endif() @@ -26,27 +25,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..5f4f11a0c 100644 --- a/ports/libmysql/portfile.cmake +++ b/ports/libmysql/portfile.cmake @@ -1,4 +1,3 @@ -include(${CMAKE_TRIPLET_FILE}) if (VCPKG_LIBRARY_LINKAGE STREQUAL static) message(FATAL_ERROR "Static building not supported yet") endif() @@ -18,7 +17,7 @@ vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_apply_patches( SOURCE_PATH ${SOURCE_PATH} - PATCHES + PATCHES ${CMAKE_CURRENT_LIST_DIR}/0001_cmake.patch ) @@ -29,11 +28,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..bf7e10b55 100644 --- a/ports/libuv/portfile.cmake +++ b/ports/libuv/portfile.cmake @@ -1,4 +1,3 @@ -include(${CMAKE_TRIPLET_FILE}) if (VCPKG_LIBRARY_LINKAGE STREQUAL static) message(FATAL_ERROR "Static building not supported yet") endif() diff --git a/ports/libvorbis/portfile.cmake b/ports/libvorbis/portfile.cmake index cff89d653..15cf48857 100644 --- a/ports/libvorbis/portfile.cmake +++ b/ports/libvorbis/portfile.cmake @@ -6,7 +6,6 @@ # 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") endif() 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..f775692cf 100644 --- a/ports/libwebsockets/portfile.cmake +++ b/ports/libwebsockets/portfile.cmake @@ -1,4 +1,3 @@ -include(${CMAKE_TRIPLET_FILE}) if (VCPKG_LIBRARY_LINKAGE STREQUAL static) message(FATAL_ERROR "Static building not supported yet") endif() 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..7fbd73be1 100644 --- a/ports/mongo-c-driver/portfile.cmake +++ b/ports/mongo-c-driver/portfile.cmake @@ -1,4 +1,3 @@ -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.") endif() diff --git a/ports/mongo-cxx-driver/portfile.cmake b/ports/mongo-cxx-driver/portfile.cmake index 867275aea..16a3eb56a 100644 --- a/ports/mongo-cxx-driver/portfile.cmake +++ b/ports/mongo-cxx-driver/portfile.cmake @@ -1,4 +1,3 @@ -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.") endif() @@ -24,7 +23,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..8cf90bc29 100644 --- a/ports/mpg123/portfile.cmake +++ b/ports/mpg123/portfile.cmake @@ -1,4 +1,3 @@ -include(${CMAKE_TRIPLET_FILE}) if (VCPKG_LIBRARY_LINKAGE STREQUAL static) message(FATAL_ERROR "Static building not supported yet") endif() diff --git a/ports/mpir/portfile.cmake b/ports/mpir/portfile.cmake index 92cec4b23..f70ab0ed2 100644 --- a/ports/mpir/portfile.cmake +++ b/ports/mpir/portfile.cmake @@ -1,4 +1,3 @@ -include(${CMAKE_TRIPLET_FILE}) if (VCPKG_LIBRARY_LINKAGE STREQUAL static) message(FATAL_ERROR "Static building not supported yet") endif() diff --git a/ports/nanodbc/portfile.cmake b/ports/nanodbc/portfile.cmake index 9a949e7ac..d3139dec9 100644 --- a/ports/nanodbc/portfile.cmake +++ b/ports/nanodbc/portfile.cmake @@ -1,4 +1,3 @@ -include(${CMAKE_TRIPLET_FILE}) if (VCPKG_LIBRARY_LINKAGE STREQUAL static) message(FATAL_ERROR "Static building not supported yet") endif() @@ -14,7 +13,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 +28,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..76272937d 100644 --- a/ports/openal-soft/portfile.cmake +++ b/ports/openal-soft/portfile.cmake @@ -1,4 +1,3 @@ -include(${CMAKE_TRIPLET_FILE}) if (VCPKG_LIBRARY_LINKAGE STREQUAL static) message(FATAL_ERROR "Static building not supported yet") endif() diff --git a/ports/opencv/portfile.cmake b/ports/opencv/portfile.cmake index b6665eedc..3559dcb23 100644 --- a/ports/opencv/portfile.cmake +++ b/ports/opencv/portfile.cmake @@ -1,4 +1,3 @@ -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.") endif() 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 1d3d40b78..6ae754d6f 100644 --- a/ports/openssl/portfile.cmake +++ b/ports/openssl/portfile.cmake @@ -1,4 +1,3 @@ -include(${CMAKE_TRIPLET_FILE}) include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openssl-1.0.2j) vcpkg_find_acquire_program(PERL) 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..b4768cc39 100644 --- a/ports/physfs/portfile.cmake +++ b/ports/physfs/portfile.cmake @@ -6,7 +6,6 @@ # 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") endif() 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..3fca78981 100644 --- a/ports/sdl2/portfile.cmake +++ b/ports/sdl2/portfile.cmake @@ -1,4 +1,3 @@ -include(${CMAKE_TRIPLET_FILE}) if (VCPKG_LIBRARY_LINKAGE STREQUAL static) message(FATAL_ERROR "Static building not supported yet") endif() diff --git a/ports/sery/portfile.cmake b/ports/sery/portfile.cmake index 9d7e5b770..86d76b33d 100644 --- a/ports/sery/portfile.cmake +++ b/ports/sery/portfile.cmake @@ -1,4 +1,3 @@ -include(${CMAKE_TRIPLET_FILE}) if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) message(FATAL_ERROR "Dynamic building not supported yet") endif() 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..752386282 100644 --- a/ports/tbb/portfile.cmake +++ b/ports/tbb/portfile.cmake @@ -6,7 +6,6 @@ # 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") endif() 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 8d86fa6fa..762997491 100644 --- a/scripts/ports.cmake +++ b/scripts/ports.cmake @@ -70,6 +70,7 @@ 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) |