diff --git a/ports/cocos2d/portfile.cmake b/ports/cocos2d/portfile.cmake index 6359055f1..46f1ee3ab 100644 --- a/ports/cocos2d/portfile.cmake +++ b/ports/cocos2d/portfile.cmake @@ -1,4 +1,5 @@ include(vcpkg_common_functions) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/cocos2d-x-cocos2d-x-3.10) vcpkg_download_distfile(ARCHIVE_FILE URLS "https://github.com/cocos2d/cocos2d-x/archive/cocos2d-x-3.10.tar.gz" FILENAME "cocos2d-x-3.10.tar.gz" @@ -12,7 +13,7 @@ vcpkg_download_distfile(DEPS_ARCHIVE_FILE vcpkg_extract_source_archive(${ARCHIVE_FILE}) -if(NOT EXISTS ${CURRENT_BUILDTREES_DIR}/src/cocos2d-x-cocos2d-x-3.10/external/unzip) +if(NOT EXISTS ${SOURCE_PATH}/external/unzip) message(STATUS "Extracting dependencies ${DEPS_ARCHIVE_FILE}") file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/deps) vcpkg_execute_required_process( @@ -20,15 +21,15 @@ if(NOT EXISTS ${CURRENT_BUILDTREES_DIR}/src/cocos2d-x-cocos2d-x-3.10/external/un WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/deps LOGNAME extract-deps ) - file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/src/cocos2d-x-cocos2d-x-3.10/external) - file(RENAME ${CURRENT_BUILDTREES_DIR}/deps/cocos2d-x-3rd-party-libs-bin-3-deps-79 ${CURRENT_BUILDTREES_DIR}/src/cocos2d-x-cocos2d-x-3.10/external) + file(REMOVE_RECURSE ${SOURCE_PATH}/external) + file(RENAME ${CURRENT_BUILDTREES_DIR}/deps/cocos2d-x-3rd-party-libs-bin-3-deps-79 ${SOURCE_PATH}/external) endif() message(STATUS "Extracting dependencies done") -file(REMOVE ${CURRENT_BUILDTREES_DIR}/src/cocos2d-x-cocos2d-x-3.10/cmake/Modules/FindGLFW3.cmake) +file(REMOVE ${SOURCE_PATH}/cmake/Modules/FindGLFW3.cmake) vcpkg_configure_cmake( - SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/cocos2d-x-cocos2d-x-3.10 + SOURCE_PATH ${SOURCE_PATH} OPTIONS -DUSE_CHIPMUNK=OFF -DUSE_BOX2D=OFF @@ -42,6 +43,6 @@ vcpkg_configure_cmake( vcpkg_build_cmake() vcpkg_install_cmake() -file(INSTALL ${CURRENT_BUILDTREES_DIR}/src/cocos2d-x-cocos2d-x-3.10/licenses/LICENSE_cocos2d-x.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/cocos2d-x RENAME copyright) +file(INSTALL ${SOURCE_PATH}/licenses/LICENSE_cocos2d-x.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/cocos2d-x RENAME copyright) vcpkg_copy_pdbs() diff --git a/ports/constexpr/portfile.cmake b/ports/constexpr/portfile.cmake index 592e67094..137bf0e60 100644 --- a/ports/constexpr/portfile.cmake +++ b/ports/constexpr/portfile.cmake @@ -1,4 +1,5 @@ include(vcpkg_common_functions) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/constexpr-a98b1db39c909e0130d21d3910d4faf97035a625) vcpkg_download_distfile(ARCHIVE URLS "https://github.com/elbeno/constexpr/archive/a98b1db39c909e0130d21d3910d4faf97035a625.zip" FILENAME "constexpr-a98b1db39c909e0130d21d3910d4faf97035a625.zip" @@ -7,10 +8,9 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive(${ARCHIVE}) # Put the licence file where vcpkg expects it -set(SOURCE_DIR ${CURRENT_BUILDTREES_DIR}/src/constexpr-a98b1db39c909e0130d21d3910d4faf97035a625) -file(COPY ${SOURCE_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/constexpr/LICENSE) +file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/constexpr/LICENSE) file(RENAME ${CURRENT_PACKAGES_DIR}/share/constexpr/LICENSE ${CURRENT_PACKAGES_DIR}/share/constexpr/copyright) # Copy the constexpr header files -file(GLOB HEADER_FILES ${SOURCE_DIR}/src/include/*.h) +file(GLOB HEADER_FILES ${SOURCE_PATH}/src/include/*.h) file(COPY ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include) diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index 168d5f0ff..1369627d8 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -1,4 +1,5 @@ include(vcpkg_common_functions) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/curl-7.48.0) vcpkg_download_distfile(ARCHIVE_FILE URLS "https://curl.haxx.se/download/curl-7.48.0.tar.bz2" FILENAME "curl-7.48.0.tar.bz2" @@ -7,7 +8,7 @@ vcpkg_download_distfile(ARCHIVE_FILE vcpkg_extract_source_archive(${ARCHIVE_FILE}) vcpkg_configure_cmake( - SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/curl-7.48.0 + SOURCE_PATH ${SOURCE_PATH} OPTIONS -DBUILD_CURL_TESTS=OFF -DBUILD_CURL_EXE=OFF @@ -19,6 +20,6 @@ vcpkg_configure_cmake( vcpkg_build_cmake() vcpkg_install_cmake() -file(INSTALL ${CURRENT_BUILDTREES_DIR}/src/curl-7.48.0/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/curl RENAME copyright) +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/curl RENAME copyright) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) vcpkg_copy_pdbs() \ No newline at end of file diff --git a/ports/doctest/portfile.cmake b/ports/doctest/portfile.cmake index 54228c716..c392b2467 100644 --- a/ports/doctest/portfile.cmake +++ b/ports/doctest/portfile.cmake @@ -1,4 +1,5 @@ include(vcpkg_common_functions) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/doctest-1.1.0) vcpkg_download_distfile(ARCHIVE URLS "https://github.com/onqtam/doctest/archive/1.1.0.zip" FILENAME "doctest-1.1.0.zip" @@ -7,7 +8,7 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive(${ARCHIVE}) # Handle copyright -file(INSTALL ${CURRENT_BUILDTREES_DIR}/src/doctest-1.1.0/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/doctest RENAME copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/doctest RENAME copyright) # Copy header file -file(INSTALL ${CURRENT_BUILDTREES_DIR}/src/doctest-1.1.0/doctest/doctest.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/doctest) +file(INSTALL ${SOURCE_PATH}/doctest/doctest.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/doctest) diff --git a/ports/eigen3/portfile.cmake b/ports/eigen3/portfile.cmake index 763143a05..416a4c9a9 100644 --- a/ports/eigen3/portfile.cmake +++ b/ports/eigen3/portfile.cmake @@ -1,4 +1,5 @@ include(vcpkg_common_functions) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/eigen-eigen-dc6cfdf9bcec) vcpkg_download_distfile(ARCHIVE URLS "http://bitbucket.org/eigen/eigen/get/3.2.9.tar.bz2" FILENAME "eigen-3.2.9.tar.bz2" @@ -7,13 +8,12 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive(${ARCHIVE}) # Put the licence file where vcpkg expects it -file(RENAME ${CURRENT_BUILDTREES_DIR}/src/eigen-eigen-dc6cfdf9bcec ${CURRENT_BUILDTREES_DIR}/src/eigen) -file(COPY ${CURRENT_BUILDTREES_DIR}/src/eigen/COPYING.README DESTINATION ${CURRENT_PACKAGES_DIR}/share/eigen3/COPYING.README) +file(COPY ${SOURCE_PATH}/COPYING.README DESTINATION ${CURRENT_PACKAGES_DIR}/share/eigen3/COPYING.README) file(RENAME ${CURRENT_PACKAGES_DIR}/share/eigen3/COPYING.README ${CURRENT_PACKAGES_DIR}/share/eigen3/copyright) -file(GLOB_RECURSE GARBAGE ${CURRENT_BUILDTREES_DIR}/src/eigen/Eigen/CMakeLists.*) +file(GLOB_RECURSE GARBAGE ${SOURCE_PATH}/Eigen/CMakeLists.*) file(REMOVE ${GARBAGE}) # Copy the eigen header files -file(COPY ${CURRENT_BUILDTREES_DIR}/src/eigen/Eigen/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/Eigen/) +file(COPY ${SOURCE_PATH}/Eigen/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/Eigen/) vcpkg_copy_pdbs() diff --git a/ports/expat/portfile.cmake b/ports/expat/portfile.cmake index ea0f0f723..2945a0c8f 100644 --- a/ports/expat/portfile.cmake +++ b/ports/expat/portfile.cmake @@ -1,4 +1,5 @@ include(vcpkg_common_functions) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/expat-2.1.1) vcpkg_download_distfile(ARCHIVE_FILE URLS "http://downloads.sourceforge.net/project/expat/expat/2.1.1/expat-2.1.1.tar.bz2" FILENAME "expat-2.1.1.tar.bz2" @@ -7,7 +8,7 @@ vcpkg_download_distfile(ARCHIVE_FILE vcpkg_extract_source_archive(${ARCHIVE_FILE}) vcpkg_configure_cmake( - SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/expat-2.1.1 + SOURCE_PATH ${SOURCE_PATH} OPTIONS -DBUILD_examples=OFF -DBUILD_tests=OFF @@ -18,5 +19,5 @@ vcpkg_build_cmake() vcpkg_install_cmake() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig ${CURRENT_PACKAGES_DIR}/lib/pkgconfig) -file(INSTALL ${CURRENT_BUILDTREES_DIR}/src/expat-2.1.1/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/expat RENAME copyright) +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/expat RENAME copyright) vcpkg_copy_pdbs() \ No newline at end of file diff --git a/ports/fmt/portfile.cmake b/ports/fmt/portfile.cmake index 49a0f3ef5..cf3b0df88 100644 --- a/ports/fmt/portfile.cmake +++ b/ports/fmt/portfile.cmake @@ -1,5 +1,5 @@ include(vcpkg_common_functions) - +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/fmt-3.0.0) vcpkg_download_distfile(ARCHIVE_FILE URLS "https://github.com/fmtlib/fmt/archive/3.0.0.tar.gz" FILENAME "fmt-3.0.0.tar.gz" @@ -8,7 +8,7 @@ vcpkg_download_distfile(ARCHIVE_FILE vcpkg_extract_source_archive(${ARCHIVE_FILE}) vcpkg_configure_cmake( - SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/fmt-3.0.0 + SOURCE_PATH ${SOURCE_PATH} OPTIONS -DFMT_TEST=OFF ) @@ -16,7 +16,7 @@ vcpkg_configure_cmake( vcpkg_build_cmake() vcpkg_install_cmake() -file(INSTALL ${CURRENT_BUILDTREES_DIR}/src/fmt-3.0.0/LICENSE.rst DESTINATION ${CURRENT_PACKAGES_DIR}/share/fmt RENAME copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE.rst DESTINATION ${CURRENT_PACKAGES_DIR}/share/fmt RENAME copyright) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE ${CURRENT_PACKAGES_DIR}/include/fmt/format.cc) file(REMOVE ${CURRENT_PACKAGES_DIR}/include/fmt/ostream.cc) diff --git a/ports/freetype/portfile.cmake b/ports/freetype/portfile.cmake index c618cb23a..a98bb731c 100644 --- a/ports/freetype/portfile.cmake +++ b/ports/freetype/portfile.cmake @@ -1,4 +1,5 @@ include(vcpkg_common_functions) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/freetype-2.6.3) vcpkg_download_distfile(ARCHIVE URLS "http://download.savannah.gnu.org/releases/freetype/freetype-2.6.3.tar.bz2" FILENAME "freetype-2.6.3.tar.bz2" @@ -7,12 +8,12 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_apply_patches( - SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/freetype-2.6.3 + SOURCE_PATH ${SOURCE_PATH} PATCHES ${CMAKE_CURRENT_LIST_DIR}/0001-Support-Windows-DLLs-via-CMAKE_WINDOWS_EXPORT_ALL_SY.patch ) vcpkg_configure_cmake( - SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/freetype-2.6.3 + SOURCE_PATH ${SOURCE_PATH} OPTIONS -DBUILD_SHARED_LIBS=ON ) @@ -31,9 +32,9 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(COPY - ${CURRENT_BUILDTREES_DIR}/src/freetype-2.6.3/docs/LICENSE.TXT - ${CURRENT_BUILDTREES_DIR}/src/freetype-2.6.3/docs/FTL.TXT - ${CURRENT_BUILDTREES_DIR}/src/freetype-2.6.3/docs/GPLv2.TXT + ${SOURCE_PATH}/docs/LICENSE.TXT + ${SOURCE_PATH}/docs/FTL.TXT + ${SOURCE_PATH}/docs/GPLv2.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/freetype ) file(RENAME ${CURRENT_PACKAGES_DIR}/share/freetype/LICENSE.TXT ${CURRENT_PACKAGES_DIR}/share/freetype/copyright) diff --git a/ports/glew/portfile.cmake b/ports/glew/portfile.cmake index cd7bbdf9d..3b35830f6 100644 --- a/ports/glew/portfile.cmake +++ b/ports/glew/portfile.cmake @@ -1,4 +1,5 @@ include(vcpkg_common_functions) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/glew-1.13.0) vcpkg_download_distfile(ARCHIVE_FILE URLS "http://downloads.sourceforge.net/project/glew/glew/1.13.0/glew-1.13.0.tgz" FILENAME "glew-1.13.0.tgz" @@ -15,9 +16,9 @@ ELSE() SET(BUILD_ARCH ${TRIPLET_SYSTEM_ARCH}) ENDIF() -if(NOT EXISTS ${CURRENT_BUILDTREES_DIR}/src/glew-1.13.0/build/vc12/glew_shared14.vcxproj) +if(NOT EXISTS ${SOURCE_PATH}/build/vc12/glew_shared14.vcxproj) message(STATUS "Upgrading projects") - file(READ ${CURRENT_BUILDTREES_DIR}/src/glew-1.13.0/build/vc12/glew_shared.vcxproj PROJ) + file(READ ${SOURCE_PATH}/build/vc12/glew_shared.vcxproj PROJ) string(REPLACE "v120" "v140" @@ -26,38 +27,38 @@ if(NOT EXISTS ${CURRENT_BUILDTREES_DIR}/src/glew-1.13.0/build/vc12/glew_shared14 "opengl32.lib%" "opengl32.lib\;%" PROJ ${PROJ}) - file(WRITE ${CURRENT_BUILDTREES_DIR}/src/glew-1.13.0/build/vc12/glew_shared14.vcxproj ${PROJ}) + file(WRITE ${SOURCE_PATH}/build/vc12/glew_shared14.vcxproj ${PROJ}) endif() message(STATUS "Upgrading projects done") vcpkg_build_msbuild( - PROJECT_PATH ${CURRENT_BUILDTREES_DIR}/src/glew-1.13.0/build/vc12/glew_shared14.vcxproj + PROJECT_PATH ${SOURCE_PATH}/build/vc12/glew_shared14.vcxproj ) message(STATUS "Installing") file(INSTALL - ${CURRENT_BUILDTREES_DIR}/src/glew-1.13.0/bin/Debug/${BUILD_ARCH}/glew32d.dll - ${CURRENT_BUILDTREES_DIR}/src/glew-1.13.0/bin/Debug/${BUILD_ARCH}/glew32d.pdb + ${SOURCE_PATH}/bin/Debug/${BUILD_ARCH}/glew32d.dll + ${SOURCE_PATH}/bin/Debug/${BUILD_ARCH}/glew32d.pdb DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin ) file(INSTALL - ${CURRENT_BUILDTREES_DIR}/src/glew-1.13.0/bin/Release/${BUILD_ARCH}/glew32.dll - ${CURRENT_BUILDTREES_DIR}/src/glew-1.13.0/bin/Release/${BUILD_ARCH}/glew32.pdb + ${SOURCE_PATH}/bin/Release/${BUILD_ARCH}/glew32.dll + ${SOURCE_PATH}/bin/Release/${BUILD_ARCH}/glew32.pdb DESTINATION ${CURRENT_PACKAGES_DIR}/bin ) file(INSTALL - ${CURRENT_BUILDTREES_DIR}/src/glew-1.13.0/lib/Debug/${BUILD_ARCH}/glew32d.lib + ${SOURCE_PATH}/lib/Debug/${BUILD_ARCH}/glew32d.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib ) file(INSTALL - ${CURRENT_BUILDTREES_DIR}/src/glew-1.13.0/lib/Release/${BUILD_ARCH}/glew32.lib + ${SOURCE_PATH}/lib/Release/${BUILD_ARCH}/glew32.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib ) file(INSTALL - ${CURRENT_BUILDTREES_DIR}/src/glew-1.13.0/include/GL + ${SOURCE_PATH}/include/GL DESTINATION ${CURRENT_PACKAGES_DIR}/include ) -file(INSTALL ${CURRENT_BUILDTREES_DIR}/src/glew-1.13.0/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/glew RENAME copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/glew RENAME copyright) vcpkg_copy_pdbs() message(STATUS "Installing done") diff --git a/ports/glfw3/portfile.cmake b/ports/glfw3/portfile.cmake index 6d14c34fe..5828122ec 100644 --- a/ports/glfw3/portfile.cmake +++ b/ports/glfw3/portfile.cmake @@ -1,4 +1,5 @@ include(vcpkg_common_functions) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/glfw-3.1.2) vcpkg_download_distfile(ARCHIVE URLS "https://github.com/glfw/glfw/releases/download/3.1.2/glfw-3.1.2.zip" FILENAME "glfw-3.1.2.zip" @@ -7,20 +8,20 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive(${ARCHIVE}) if(NOT EXISTS ${CURRENT_BUILDTREES_DIR}/patch.stamp) - file(READ ${CURRENT_BUILDTREES_DIR}/src/glfw-3.1.2/src/glfw3Config.cmake.in CONFIG) + file(READ ${SOURCE_PATH}/src/glfw3Config.cmake.in CONFIG) string(REPLACE "\"@GLFW_LIB_NAME@\"" "NAMES @GLFW_LIB_NAME@ @GLFW_LIB_NAME@dll" CONFIG ${CONFIG} ) string(REPLACE "@PACKAGE_CMAKE_INSTALL_PREFIX@" "@PACKAGE_CMAKE_INSTALL_PREFIX@/../.." CONFIG ${CONFIG} ) - file(WRITE ${CURRENT_BUILDTREES_DIR}/src/glfw-3.1.2/src/glfw3Config.cmake.in ${CONFIG}) - file(APPEND ${CURRENT_BUILDTREES_DIR}/src/glfw-3.1.2/src/glfw3Config.cmake.in "set(GLFW3_LIBRARIES \${GLFW3_LIBRARY})\n") + file(WRITE ${SOURCE_PATH}/src/glfw3Config.cmake.in ${CONFIG}) + file(APPEND ${SOURCE_PATH}/src/glfw3Config.cmake.in "set(GLFW3_LIBRARIES \${GLFW3_LIBRARY})\n") file(WRITE ${CURRENT_BUILDTREES_DIR}/patch.stamp) endif() vcpkg_configure_cmake( - SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/glfw-3.1.2 + SOURCE_PATH ${SOURCE_PATH} OPTIONS -DBUILD_SHARED_LIBS=ON -DGLFW_BUILD_EXAMPLES=OFF @@ -52,7 +53,7 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/glfw3.lib) file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/glfw3.lib) -file(COPY ${CURRENT_BUILDTREES_DIR}/src/glfw-3.1.2/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/glfw3) +file(COPY ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/glfw3) file(RENAME ${CURRENT_PACKAGES_DIR}/share/glfw3/COPYING.txt ${CURRENT_PACKAGES_DIR}/share/glfw3/copyright) vcpkg_copy_pdbs() diff --git a/ports/glm/portfile.cmake b/ports/glm/portfile.cmake index 715310149..33a16f9b8 100644 --- a/ports/glm/portfile.cmake +++ b/ports/glm/portfile.cmake @@ -1,4 +1,5 @@ include(vcpkg_common_functions) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/glm) vcpkg_download_distfile(ARCHIVE URLS "https://github.com/g-truc/glm/releases/download/0.9.8.0/glm-0.9.8.0.zip" FILENAME "glm-0.9.8.0.zip" @@ -7,12 +8,12 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive(${ARCHIVE}) # Remove glm/CMakeLists.txt -file(REMOVE ${CURRENT_BUILDTREES_DIR}/src/glm/glm/CMakeLists.txt) +file(REMOVE ${SOURCE_PATH}/glm/CMakeLists.txt) # Put the license file where vcpkg expects it -file(COPY ${CURRENT_BUILDTREES_DIR}/src/glm/copying.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/glm/) +file(COPY ${SOURCE_PATH}/copying.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/glm/) file(RENAME ${CURRENT_PACKAGES_DIR}/share/glm/copying.txt ${CURRENT_PACKAGES_DIR}/share/glm/copyright) # Copy the glm header files -file(GLOB HEADER_FILES ${CURRENT_BUILDTREES_DIR}/src/glm/glm/*) +file(GLOB HEADER_FILES ${SOURCE_PATH}/glm/*) file(COPY ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/glm) diff --git a/ports/gsl/portfile.cmake b/ports/gsl/portfile.cmake index 4c7e9f051..e674cf2e4 100644 --- a/ports/gsl/portfile.cmake +++ b/ports/gsl/portfile.cmake @@ -1,4 +1,5 @@ include(vcpkg_common_functions) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/gsl-fd5ad87bf25cb5e87104ee58106dee9bc809cd93) vcpkg_download_distfile(ARCHIVE URLS "https://github.com/Microsoft/GSL/archive/fd5ad87bf25cb5e87104ee58106dee9bc809cd93.zip" FILENAME "gsl-fd5ad87bf.zip" @@ -6,8 +7,8 @@ vcpkg_download_distfile(ARCHIVE ) vcpkg_extract_source_archive(${ARCHIVE}) -file(INSTALL ${CURRENT_BUILDTREES_DIR}/src/gsl-fd5ad87bf25cb5e87104ee58106dee9bc809cd93/gsl DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN "*") +file(INSTALL ${SOURCE_PATH}/gsl DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN "*") # Handle copyright -file(COPY ${CURRENT_BUILDTREES_DIR}/src/gsl-fd5ad87bf25cb5e87104ee58106dee9bc809cd93/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/gsl) +file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/gsl) file(RENAME ${CURRENT_PACKAGES_DIR}/share/gsl/LICENSE ${CURRENT_PACKAGES_DIR}/share/gsl/copyright) diff --git a/ports/libuv/portfile.cmake b/ports/libuv/portfile.cmake index 2e0002b4e..d5aafdb21 100644 --- a/ports/libuv/portfile.cmake +++ b/ports/libuv/portfile.cmake @@ -1,4 +1,5 @@ include(vcpkg_common_functions) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-src/libuv-1.9.1) vcpkg_download_distfile(ARCHIVE URLS "https://github.com/libuv/libuv/archive/v1.9.1.zip" FILENAME "libuv-v1.9.1.zip" @@ -52,13 +53,13 @@ if(TRIPLET_SYSTEM_ARCH MATCHES "x86|x64") message(STATUS "Building Release") vcpkg_execute_required_process( COMMAND cmd /c vcbuild.bat release ${TRIPLET_SYSTEM_ARCH} shared - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-src/libuv-1.9.1 + WORKING_DIRECTORY ${SOURCE_PATH} LOGNAME ${TARGET_TRIPLET}-build-rel ) message(STATUS "Building Debug") vcpkg_execute_required_process( COMMAND cmd /c vcbuild.bat debug ${TRIPLET_SYSTEM_ARCH} shared - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-src/libuv-1.9.1 + WORKING_DIRECTORY ${SOURCE_PATH} LOGNAME ${TARGET_TRIPLET}-build-dbg ) else() @@ -75,28 +76,28 @@ file(MAKE_DIRECTORY ) file(COPY - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-src/libuv-1.9.1/include/tree.h - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-src/libuv-1.9.1/include/uv.h - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-src/libuv-1.9.1/include/uv-version.h - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-src/libuv-1.9.1/include/uv-errno.h - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-src/libuv-1.9.1/include/uv-threadpool.h - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-src/libuv-1.9.1/include/uv-win.h + ${SOURCE_PATH}/include/tree.h + ${SOURCE_PATH}/include/uv.h + ${SOURCE_PATH}/include/uv-version.h + ${SOURCE_PATH}/include/uv-errno.h + ${SOURCE_PATH}/include/uv-threadpool.h + ${SOURCE_PATH}/include/uv-win.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) file(COPY - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-src/libuv-1.9.1/Debug/libuv.dll + ${SOURCE_PATH}/Debug/libuv.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) file(COPY - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-src/libuv-1.9.1/Debug/libuv.lib + ${SOURCE_PATH}/Debug/libuv.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) file(COPY - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-src/libuv-1.9.1/Release/libuv.dll + ${SOURCE_PATH}/Release/libuv.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) file(COPY - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-src/libuv-1.9.1/Release/libuv.lib + ${SOURCE_PATH}/Release/libuv.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) file(COPY - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-src/libuv-1.9.1/LICENSE + ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libuv) file(RENAME diff --git a/ports/libwebsockets/portfile.cmake b/ports/libwebsockets/portfile.cmake index 7b8a2c918..3c0ee7ae1 100644 --- a/ports/libwebsockets/portfile.cmake +++ b/ports/libwebsockets/portfile.cmake @@ -1,4 +1,5 @@ include(vcpkg_common_functions) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libwebsockets-2.0.0) vcpkg_download_distfile(ARCHIVE URLS "https://github.com/warmcat/libwebsockets/archive/v2.0.0.zip" FILENAME "libwebsockets-v2.0.0.zip" @@ -7,7 +8,7 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_configure_cmake( - SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libwebsockets-2.0.0 + SOURCE_PATH ${SOURCE_PATH} OPTIONS -DLWS_WITH_STATIC=OFF -DLWS_USE_BUNDLED_ZLIB=OFF @@ -30,6 +31,6 @@ file(RENAME file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/cmake) -file(COPY ${CURRENT_BUILDTREES_DIR}/src/libwebsockets-2.0.0/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libwebsockets) +file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libwebsockets) file(RENAME ${CURRENT_PACKAGES_DIR}/share/libwebsockets/LICENSE ${CURRENT_PACKAGES_DIR}/share/libwebsockets/copyright) vcpkg_copy_pdbs() diff --git a/ports/mpg123/portfile.cmake b/ports/mpg123/portfile.cmake index ac2e7e7ca..68d0f7baa 100644 --- a/ports/mpg123/portfile.cmake +++ b/ports/mpg123/portfile.cmake @@ -1,4 +1,5 @@ include(vcpkg_common_functions) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mpg123-1.23.3) vcpkg_download_distfile(ARCHIVE URLS "http://downloads.sourceforge.net/project/mpg123/mpg123/1.23.3/mpg123-1.23.3.tar.bz2" FILENAME "mpg123-1.23.3.tar.bz2" @@ -11,44 +12,44 @@ get_filename_component(YASM_EXE_PATH ${YASM} DIRECTORY) set(ENV{PATH} "${YASM_EXE_PATH};$ENV{PATH}") vcpkg_apply_patches( - SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mpg123-1.23.3 + SOURCE_PATH ${SOURCE_PATH} PATCHES ${CMAKE_CURRENT_LIST_DIR}/0001-Modify-2010-libmpg123.vcxproj-to-use-VS-2015-along-w.patch ) vcpkg_build_msbuild( - PROJECT_PATH ${CURRENT_BUILDTREES_DIR}/src/mpg123-1.23.3/ports/MSVC++/2010/libmpg123/libmpg123.vcxproj + PROJECT_PATH ${SOURCE_PATH}/ports/MSVC++/2010/libmpg123/libmpg123.vcxproj RELEASE_CONFIGURATION Release_x86_Dll DEBUG_CONFIGURATION Debug_x86_Dll ) message(STATUS "Installing") file(INSTALL - ${CURRENT_BUILDTREES_DIR}/src/mpg123-1.23.3/ports/MSVC++/2010/libmpg123/Debug/libmpg123.dll - ${CURRENT_BUILDTREES_DIR}/src/mpg123-1.23.3/ports/MSVC++/2010/libmpg123/Debug/libmpg123.pdb + ${SOURCE_PATH}/ports/MSVC++/2010/libmpg123/Debug/libmpg123.dll + ${SOURCE_PATH}/ports/MSVC++/2010/libmpg123/Debug/libmpg123.pdb DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin ) file(INSTALL - ${CURRENT_BUILDTREES_DIR}/src/mpg123-1.23.3/ports/MSVC++/2010/libmpg123/Release/libmpg123.dll - ${CURRENT_BUILDTREES_DIR}/src/mpg123-1.23.3/ports/MSVC++/2010/libmpg123/Release/libmpg123.pdb + ${SOURCE_PATH}/ports/MSVC++/2010/libmpg123/Release/libmpg123.dll + ${SOURCE_PATH}/ports/MSVC++/2010/libmpg123/Release/libmpg123.pdb DESTINATION ${CURRENT_PACKAGES_DIR}/bin ) file(INSTALL - ${CURRENT_BUILDTREES_DIR}/src/mpg123-1.23.3/ports/MSVC++/2010/libmpg123/Debug/libmpg123.lib + ${SOURCE_PATH}/ports/MSVC++/2010/libmpg123/Debug/libmpg123.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib ) file(INSTALL - ${CURRENT_BUILDTREES_DIR}/src/mpg123-1.23.3/ports/MSVC++/2010/libmpg123/Release/libmpg123.lib + ${SOURCE_PATH}/ports/MSVC++/2010/libmpg123/Release/libmpg123.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib ) file(INSTALL - ${CURRENT_BUILDTREES_DIR}/src/mpg123-1.23.3/ports/MSVC++/mpg123.h + ${SOURCE_PATH}/ports/MSVC++/mpg123.h DESTINATION ${CURRENT_PACKAGES_DIR}/include ) file(INSTALL - ${CURRENT_BUILDTREES_DIR}/src/mpg123-1.23.3/src/libmpg123/mpg123.h.in + ${SOURCE_PATH}/src/libmpg123/mpg123.h.in DESTINATION ${CURRENT_PACKAGES_DIR}/include ) -file(INSTALL ${CURRENT_BUILDTREES_DIR}/src/mpg123-1.23.3/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/mpg123 RENAME copyright) +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/mpg123 RENAME copyright) vcpkg_copy_pdbs() message(STATUS "Installing done") diff --git a/ports/mpir/portfile.cmake b/ports/mpir/portfile.cmake index ff1489291..e2f7040d6 100644 --- a/ports/mpir/portfile.cmake +++ b/ports/mpir/portfile.cmake @@ -1,4 +1,5 @@ include(vcpkg_common_functions) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mpir-2.7.2) vcpkg_download_distfile(ARCHIVE_FILE URLS "http://mpir.org/mpir-2.7.2.tar.lz" FILENAME "mpir-2.7.2.tar.lz" @@ -7,7 +8,7 @@ vcpkg_download_distfile(ARCHIVE_FILE vcpkg_extract_source_archive(${ARCHIVE_FILE}) vcpkg_build_msbuild( - PROJECT_PATH ${CURRENT_BUILDTREES_DIR}/src/mpir-2.7.2/build.vc14/dll_mpir_gc/dll_mpir_gc.vcxproj + PROJECT_PATH ${SOURCE_PATH}/build.vc14/dll_mpir_gc/dll_mpir_gc.vcxproj ) IF (TRIPLET_SYSTEM_ARCH MATCHES "x86") @@ -17,32 +18,32 @@ ELSE() ENDIF() file(INSTALL - ${CURRENT_BUILDTREES_DIR}/src/mpir-2.7.2/dll/${BUILD_ARCH}/Debug/gmp.h - ${CURRENT_BUILDTREES_DIR}/src/mpir-2.7.2/dll/${BUILD_ARCH}/Debug/gmpxx.h - ${CURRENT_BUILDTREES_DIR}/src/mpir-2.7.2/dll/${BUILD_ARCH}/Debug/mpir.h - ${CURRENT_BUILDTREES_DIR}/src/mpir-2.7.2/dll/${BUILD_ARCH}/Debug/mpirxx.h + ${SOURCE_PATH}/dll/${BUILD_ARCH}/Debug/gmp.h + ${SOURCE_PATH}/dll/${BUILD_ARCH}/Debug/gmpxx.h + ${SOURCE_PATH}/dll/${BUILD_ARCH}/Debug/mpir.h + ${SOURCE_PATH}/dll/${BUILD_ARCH}/Debug/mpirxx.h DESTINATION ${CURRENT_PACKAGES_DIR}/include ) file(INSTALL - ${CURRENT_BUILDTREES_DIR}/src/mpir-2.7.2/dll/${BUILD_ARCH}/Debug/mpir.dll - ${CURRENT_BUILDTREES_DIR}/src/mpir-2.7.2/dll/${BUILD_ARCH}/Debug/mpir.pdb + ${SOURCE_PATH}/dll/${BUILD_ARCH}/Debug/mpir.dll + ${SOURCE_PATH}/dll/${BUILD_ARCH}/Debug/mpir.pdb DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin ) file(INSTALL - ${CURRENT_BUILDTREES_DIR}/src/mpir-2.7.2/dll/${BUILD_ARCH}/Release/mpir.dll - ${CURRENT_BUILDTREES_DIR}/src/mpir-2.7.2/dll/${BUILD_ARCH}/Release/mpir.pdb + ${SOURCE_PATH}/dll/${BUILD_ARCH}/Release/mpir.dll + ${SOURCE_PATH}/dll/${BUILD_ARCH}/Release/mpir.pdb DESTINATION ${CURRENT_PACKAGES_DIR}/bin ) file(INSTALL - ${CURRENT_BUILDTREES_DIR}/src/mpir-2.7.2/dll/${BUILD_ARCH}/Debug/mpir.lib + ${SOURCE_PATH}/dll/${BUILD_ARCH}/Debug/mpir.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib ) file(INSTALL - ${CURRENT_BUILDTREES_DIR}/src/mpir-2.7.2/dll/${BUILD_ARCH}/Release/mpir.lib + ${SOURCE_PATH}/dll/${BUILD_ARCH}/Release/mpir.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib ) -file(INSTALL ${CURRENT_BUILDTREES_DIR}/src/mpir-2.7.2/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/mpir RENAME copyright) +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/mpir RENAME copyright) vcpkg_copy_pdbs() message(STATUS "Installing done") diff --git a/ports/openal-soft/portfile.cmake b/ports/openal-soft/portfile.cmake index d80bc373c..1e9781fd3 100644 --- a/ports/openal-soft/portfile.cmake +++ b/ports/openal-soft/portfile.cmake @@ -1,4 +1,5 @@ include(vcpkg_common_functions) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openal-soft-1.17.2) vcpkg_download_distfile(ARCHIVE URLS "http://openal-soft.org/openal-releases/openal-soft-1.17.2.tar.bz2" FILENAME "openal-soft-1.17.2.tar.bz2" @@ -8,7 +9,7 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_configure_cmake( - SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openal-soft-1.17.2 + SOURCE_PATH ${SOURCE_PATH} OPTIONS -DALSOFT_UTILS=OFF -DALSOFT_NO_CONFIG_UTIL=ON @@ -22,7 +23,7 @@ vcpkg_build_cmake() vcpkg_install_cmake() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(COPY ${CURRENT_BUILDTREES_DIR}/src/openal-soft-1.17.2/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/openal-soft) +file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/openal-soft) file(RENAME ${CURRENT_PACKAGES_DIR}/share/openal-soft/COPYING ${CURRENT_PACKAGES_DIR}/share/openal-soft/copyright) vcpkg_copy_pdbs() diff --git a/ports/opencv/portfile.cmake b/ports/opencv/portfile.cmake index ad6bd2a53..a40cc9e19 100644 --- a/ports/opencv/portfile.cmake +++ b/ports/opencv/portfile.cmake @@ -1,4 +1,5 @@ include(vcpkg_common_functions) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/opencv-92387b1ef8fad15196dd5f7fb4931444a68bc93a) vcpkg_download_distfile(ARCHIVE URLS "https://github.com/opencv/opencv/archive/92387b1ef8fad15196dd5f7fb4931444a68bc93a.zip" FILENAME "opencv-92387b1ef8fad15196dd5f7fb4931444a68bc93a.zip" @@ -6,8 +7,6 @@ vcpkg_download_distfile(ARCHIVE ) vcpkg_extract_source_archive(${ARCHIVE}) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/opencv-92387b1ef8fad15196dd5f7fb4931444a68bc93a) - vcpkg_apply_patches( SOURCE_PATH ${SOURCE_PATH} PATCHES "${CMAKE_CURRENT_LIST_DIR}/opencv-installation-options.patch" diff --git a/ports/openssl/portfile.cmake b/ports/openssl/portfile.cmake index 345ec8e3b..9f45f0ce4 100644 --- a/ports/openssl/portfile.cmake +++ b/ports/openssl/portfile.cmake @@ -1,4 +1,5 @@ include(vcpkg_common_functions) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openssl-1.0.2h) vcpkg_find_acquire_program(PERL) find_program(NMAKE nmake) @@ -11,10 +12,10 @@ vcpkg_download_distfile(OPENSSL_SOURCE_ARCHIVE SHA512 780601f6f3f32f42b6d7bbc4c593db39a3575f9db80294a10a68b2b0bb79448d9bd529ca700b9977354cbdfc65887c76af0aa7b90d3ee421f74ab53e6f15c303 ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${CURRENT_BUILDTREES_DIR}/src/openssl-1.0.2h) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) vcpkg_configure_cmake( - SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openssl-1.0.2h + SOURCE_PATH ${SOURCE_PATH} GENERATOR "NMake Makefiles" OPTIONS -DCURRENT_INSTALLED_DIR=${CURRENT_INSTALLED_DIR} diff --git a/ports/range-v3/portfile.cmake b/ports/range-v3/portfile.cmake index 4f547c2c8..692adf347 100644 --- a/ports/range-v3/portfile.cmake +++ b/ports/range-v3/portfile.cmake @@ -1,4 +1,5 @@ include(vcpkg_common_functions) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/Range-V3-VS2015-ede9ad367fd5ec764fecb039c874614bd908e6b6) vcpkg_download_distfile(ARCHIVE URLS "https://github.com/Microsoft/Range-V3-VS2015/archive/ede9ad367fd5ec764fecb039c874614bd908e6b6.zip" FILENAME "range-v3-ede9ad367fd5ec764fecb039c874614bd908e6b6.zip" @@ -6,7 +7,7 @@ vcpkg_download_distfile(ARCHIVE ) vcpkg_extract_source_archive(${ARCHIVE}) -file(COPY ${CURRENT_BUILDTREES_DIR}/src/Range-V3-VS2015-ede9ad367fd5ec764fecb039c874614bd908e6b6/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/range-v3) +file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/range-v3) file(RENAME ${CURRENT_PACKAGES_DIR}/share/range-v3/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/range-v3/copyright) -file(INSTALL ${CURRENT_BUILDTREES_DIR}/src/Range-V3-VS2015-ede9ad367fd5ec764fecb039c874614bd908e6b6/include DESTINATION ${CURRENT_PACKAGES_DIR} FILES_MATCHING PATTERN "*.hpp") +file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR} FILES_MATCHING PATTERN "*.hpp") vcpkg_copy_pdbs() diff --git a/ports/rapidjson/portfile.cmake b/ports/rapidjson/portfile.cmake index 53008daea..d907210d0 100644 --- a/ports/rapidjson/portfile.cmake +++ b/ports/rapidjson/portfile.cmake @@ -1,4 +1,5 @@ include(vcpkg_common_functions) +SET(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/rapidjson-879def80f2e466cdf4c86dc7e53ea2dd4cafaea0) vcpkg_download_distfile(ARCHIVE URLS "https://github.com/miloyip/rapidjson/archive/879def80f2e466cdf4c86dc7e53ea2dd4cafaea0.zip" FILENAME "rapidjson-879def80f2e466cdf4c86dc7e53ea2dd4cafaea0.zip" @@ -7,9 +8,9 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive(${ARCHIVE}) # Put the licence file where vcpkg expects it -file(COPY ${CURRENT_BUILDTREES_DIR}/src/rapidjson-879def80f2e466cdf4c86dc7e53ea2dd4cafaea0/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/rapidjson) +file(COPY ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/rapidjson) file(RENAME ${CURRENT_PACKAGES_DIR}/share/rapidjson/license.txt ${CURRENT_PACKAGES_DIR}/share/rapidjson/copyright) # Copy the rapidjson header files -file(INSTALL ${CURRENT_BUILDTREES_DIR}/src/rapidjson-879def80f2e466cdf4c86dc7e53ea2dd4cafaea0/include DESTINATION ${CURRENT_PACKAGES_DIR} FILES_MATCHING PATTERN "*.h") +file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR} FILES_MATCHING PATTERN "*.h") vcpkg_copy_pdbs() diff --git a/ports/rapidxml/portfile.cmake b/ports/rapidxml/portfile.cmake index 9551e17a5..90dd06911 100644 --- a/ports/rapidxml/portfile.cmake +++ b/ports/rapidxml/portfile.cmake @@ -1,4 +1,5 @@ include(vcpkg_common_functions) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/rapidxml-1.13) vcpkg_download_distfile(ARCHIVE URLS "https://sourceforge.net/projects/rapidxml/files/rapidxml/rapidxml%201.13/rapidxml-1.13.zip/download" FILENAME "rapidxml-1.13.zip" @@ -7,8 +8,8 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive(${ARCHIVE}) # Handle copyright -file(COPY ${CURRENT_BUILDTREES_DIR}/src/rapidxml-1.13/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/rapidxml) +file(COPY ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/rapidxml) file(RENAME ${CURRENT_PACKAGES_DIR}/share/rapidxml/license.txt ${CURRENT_PACKAGES_DIR}/share/rapidxml/copyright) # Copy the header files -file(INSTALL ${CURRENT_BUILDTREES_DIR}/src/rapidxml-1.13/ DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN "*.hpp") +file(INSTALL ${SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN "*.hpp") diff --git a/ports/sdl2/portfile.cmake b/ports/sdl2/portfile.cmake index 0f0409160..73a1c3b12 100644 --- a/ports/sdl2/portfile.cmake +++ b/ports/sdl2/portfile.cmake @@ -1,4 +1,5 @@ include(vcpkg_common_functions) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/SDL2-2.0.4) vcpkg_download_distfile(ARCHIVE_FILE URLS "http://libsdl.org/release/SDL2-2.0.4.tar.gz" FILENAME "SDL2-2.0.4.tar.gz" @@ -8,27 +9,27 @@ vcpkg_extract_source_archive(${ARCHIVE_FILE}) if(TRIPLET_SYSTEM_NAME MATCHES "WindowsStore") vcpkg_build_msbuild( - PROJECT_PATH ${CURRENT_BUILDTREES_DIR}/src/SDL2-2.0.4/VisualC-WinRT/UWP_VS2015/SDL-UWP.vcxproj + PROJECT_PATH ${SOURCE_PATH}/VisualC-WinRT/UWP_VS2015/SDL-UWP.vcxproj ) file(COPY - ${CURRENT_BUILDTREES_DIR}/src/SDL2-2.0.4/VisualC-WinRT/UWP_VS2015/Debug/SDL-UWP/SDL2.dll - ${CURRENT_BUILDTREES_DIR}/src/SDL2-2.0.4/VisualC-WinRT/UWP_VS2015/Debug/SDL-UWP/SDL2.pdb + ${SOURCE_PATH}/VisualC-WinRT/UWP_VS2015/Debug/SDL-UWP/SDL2.dll + ${SOURCE_PATH}/VisualC-WinRT/UWP_VS2015/Debug/SDL-UWP/SDL2.pdb DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) file(COPY - ${CURRENT_BUILDTREES_DIR}/src/SDL2-2.0.4/VisualC-WinRT/UWP_VS2015/Release/SDL-UWP/SDL2.dll - ${CURRENT_BUILDTREES_DIR}/src/SDL2-2.0.4/VisualC-WinRT/UWP_VS2015/Release/SDL-UWP/SDL2.pdb + ${SOURCE_PATH}/VisualC-WinRT/UWP_VS2015/Release/SDL-UWP/SDL2.dll + ${SOURCE_PATH}/VisualC-WinRT/UWP_VS2015/Release/SDL-UWP/SDL2.pdb DESTINATION ${CURRENT_PACKAGES_DIR}/bin) - file(COPY ${CURRENT_BUILDTREES_DIR}/src/SDL2-2.0.4/VisualC-WinRT/UWP_VS2015/Debug/SDL-UWP/SDL2.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - file(COPY ${CURRENT_BUILDTREES_DIR}/src/SDL2-2.0.4/VisualC-WinRT/UWP_VS2015/Release/SDL-UWP/SDL2.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(COPY ${SOURCE_PATH}/VisualC-WinRT/UWP_VS2015/Debug/SDL-UWP/SDL2.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY ${SOURCE_PATH}/VisualC-WinRT/UWP_VS2015/Release/SDL-UWP/SDL2.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/include) - file(COPY ${CURRENT_BUILDTREES_DIR}/src/SDL2-2.0.4/include DESTINATION ${CURRENT_PACKAGES_DIR}/include) + file(COPY ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR}/include) file(RENAME ${CURRENT_PACKAGES_DIR}/include/include ${CURRENT_PACKAGES_DIR}/include/SDL2) else() vcpkg_configure_cmake( - SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/SDL2-2.0.4 + SOURCE_PATH ${SOURCE_PATH} OPTIONS -DSDL_STATIC=OFF ) @@ -39,5 +40,5 @@ else() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) endif() -file(INSTALL ${CURRENT_BUILDTREES_DIR}/src/SDL2-2.0.4/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/sdl2 RENAME copyright) +file(INSTALL ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/sdl2 RENAME copyright) vcpkg_copy_pdbs() diff --git a/ports/sery/portfile.cmake b/ports/sery/portfile.cmake index 94a236b85..d19fad1c5 100644 --- a/ports/sery/portfile.cmake +++ b/ports/sery/portfile.cmake @@ -1,4 +1,5 @@ include(vcpkg_common_functions) +SET(SOURCE_PATH "${CURRENT_BUILDTREES_DIR}/src/Sery-1.0") vcpkg_download_distfile(ARCHIVE URLS "https://github.com/Ninetainedo/Sery/archive/v1.0.zip" FILENAME "sery-1.0.0.zip" @@ -6,10 +7,8 @@ vcpkg_download_distfile(ARCHIVE ) vcpkg_extract_source_archive(${ARCHIVE}) -SET(SERY_ROOT_DIR "${CURRENT_BUILDTREES_DIR}/src/Sery-1.0") - vcpkg_configure_cmake( - SOURCE_PATH ${SERY_ROOT_DIR} + SOURCE_PATH ${SOURCE_PATH} # OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2 # OPTIONS_RELEASE -DOPTIMIZE=1 # OPTIONS_DEBUG -DDEBUGGABLE=1 @@ -23,7 +22,7 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/cmake) # Handle copyright -file(COPY ${SERY_ROOT_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/sery) +file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/sery) file(RENAME ${CURRENT_PACKAGES_DIR}/share/sery/LICENSE ${CURRENT_PACKAGES_DIR}/share/sery/copyright) # Moves cmake files where appropriate diff --git a/ports/sqlite3/portfile.cmake b/ports/sqlite3/portfile.cmake index 75dfc73b5..314142924 100644 --- a/ports/sqlite3/portfile.cmake +++ b/ports/sqlite3/portfile.cmake @@ -1,4 +1,5 @@ include(vcpkg_common_functions) +set(SOURCE_PATH ${CMAKE_CURRENT_LIST_DIR}) vcpkg_download_distfile(ARCHIVE URLS "http://www.sqlite.org/2016/sqlite-amalgamation-3120200.zip" FILENAME "sqlite-amalgamation-3120200.zip" @@ -7,7 +8,7 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_configure_cmake( - SOURCE_PATH ${CMAKE_CURRENT_LIST_DIR} + SOURCE_PATH ${SOURCE_PATH} OPTIONS -DSOURCE=${CURRENT_BUILDTREES_DIR}/src/sqlite-amalgamation-3120200 ) diff --git a/ports/stb/portfile.cmake b/ports/stb/portfile.cmake index 15414d0da..432d84604 100644 --- a/ports/stb/portfile.cmake +++ b/ports/stb/portfile.cmake @@ -1,4 +1,5 @@ include(vcpkg_common_functions) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/stb-e713a69f1ea6ee1e0d55725ed0731520045a5993) vcpkg_download_distfile(ARCHIVE URLS "https://github.com/nothings/stb/archive/e713a69f1ea6ee1e0d55725ed0731520045a5993.zip" FILENAME "stb-e713a69f1ea6ee1e0d55725ed0731520045a5993.zip" @@ -7,10 +8,9 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive(${ARCHIVE}) # Put the licence file where vcpkg expects it -set(SOURCE_DIR ${CURRENT_BUILDTREES_DIR}/src/stb-e713a69f1ea6ee1e0d55725ed0731520045a5993) -file(COPY ${SOURCE_DIR}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/stb/README.md) +file(COPY ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/stb/README.md) file(RENAME ${CURRENT_PACKAGES_DIR}/share/stb/README.md ${CURRENT_PACKAGES_DIR}/share/stb/copyright) # Copy the stb header files -file(GLOB HEADER_FILES ${SOURCE_DIR}/*.h) +file(GLOB HEADER_FILES ${SOURCE_PATH}/*.h) file(COPY ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include) diff --git a/ports/tiff/portfile.cmake b/ports/tiff/portfile.cmake index ef770a2c5..4f6ef11de 100644 --- a/ports/tiff/portfile.cmake +++ b/ports/tiff/portfile.cmake @@ -1,4 +1,5 @@ include(vcpkg_common_functions) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/tiff-4.0.6) vcpkg_download_distfile(ARCHIVE URLS "http://download.osgeo.org/libtiff/tiff-4.0.6.tar.gz" FILENAME "tiff-4.0.6.tar.gz" @@ -7,7 +8,7 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_configure_cmake( - SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/tiff-4.0.6 + SOURCE_PATH ${SOURCE_PATH} OPTIONS -Dcxx=OFF ) @@ -20,7 +21,7 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share ) file(COPY - ${CURRENT_BUILDTREES_DIR}/src/tiff-4.0.6/COPYRIGHT + ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/tiff ) file(RENAME diff --git a/ports/tinyxml2/portfile.cmake b/ports/tinyxml2/portfile.cmake index 3e29b857c..3cb7b4338 100644 --- a/ports/tinyxml2/portfile.cmake +++ b/ports/tinyxml2/portfile.cmake @@ -1,4 +1,5 @@ include(vcpkg_common_functions) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/tinyxml2-3.0.0) vcpkg_download_distfile(ARCHIVE URLS "https://github.com/leethomason/tinyxml2/archive/3.0.0.zip" FILENAME "tinyxml2-3.0.0.zip" @@ -7,7 +8,7 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_configure_cmake( - SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/tinyxml2-3.0.0 + SOURCE_PATH ${SOURCE_PATH} # OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 # OPTIONS_RELEASE -DOPTIMIZE=1 # OPTIONS_DEBUG -DDEBUGGABLE=1 @@ -17,6 +18,6 @@ vcpkg_build_cmake() vcpkg_install_cmake() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(COPY ${CURRENT_BUILDTREES_DIR}/src/tinyxml2-3.0.0/readme.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/tinyxml2) +file(COPY ${SOURCE_PATH}/readme.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/tinyxml2) file(RENAME ${CURRENT_PACKAGES_DIR}/share/tinyxml2/readme.md ${CURRENT_PACKAGES_DIR}/share/tinyxml2/copyright) vcpkg_copy_pdbs() diff --git a/ports/zlib/portfile.cmake b/ports/zlib/portfile.cmake index 82c5caded..ad95b6436 100644 --- a/ports/zlib/portfile.cmake +++ b/ports/zlib/portfile.cmake @@ -1,4 +1,5 @@ include(vcpkg_common_functions) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/zlib-1.2.8) vcpkg_download_distfile(ARCHIVE_FILE URLS "http://zlib.net/zlib128.zip" FILENAME "zlib128.zip" @@ -7,7 +8,7 @@ vcpkg_download_distfile(ARCHIVE_FILE vcpkg_extract_source_archive(${ARCHIVE_FILE}) vcpkg_configure_cmake( - SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/zlib-1.2.8 + SOURCE_PATH ${SOURCE_PATH} OPTIONS -DSKIP_INSTALL_FILES=ON OPTIONS_DEBUG