diff options
| author | myd7349 <myd7349@gmail.com> | 2019-07-02 18:13:44 +0800 |
|---|---|---|
| committer | myd7349 <myd7349@gmail.com> | 2019-07-02 18:13:44 +0800 |
| commit | 086c72777369e9a8db0a58e4ad43360b3b613c78 (patch) | |
| tree | 240047d021f2e08af14d58b8a6a5db4b6f0fda60 /ports/qt5-modularscripts | |
| parent | 3efdcef0e62aa6df7ff9088c001cff8d47304386 (diff) | |
| parent | f15d52becf620a0b234b4b7735579b5415f8d7b7 (diff) | |
| download | vcpkg-086c72777369e9a8db0a58e4ad43360b3b613c78.tar.gz vcpkg-086c72777369e9a8db0a58e4ad43360b3b613c78.zip | |
Merge branch 'master' into rdkafka-init
Diffstat (limited to 'ports/qt5-modularscripts')
| -rw-r--r-- | ports/qt5-modularscripts/qt_modular_library.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ports/qt5-modularscripts/qt_modular_library.cmake b/ports/qt5-modularscripts/qt_modular_library.cmake index dd3abb94f..61eea306b 100644 --- a/ports/qt5-modularscripts/qt_modular_library.cmake +++ b/ports/qt5-modularscripts/qt_modular_library.cmake @@ -2,8 +2,8 @@ set(_qt5base_port_dir "${CMAKE_CURRENT_LIST_DIR}") function(qt_modular_fetch_library NAME HASH TARGET_SOURCE_PATH) string(LENGTH "${CURRENT_BUILDTREES_DIR}" BUILDTREES_PATH_LENGTH) - if(BUILDTREES_PATH_LENGTH GREATER 45) - message(WARNING "Qt5's buildsystem uses very long paths and may fail on your system.\n" + if(BUILDTREES_PATH_LENGTH GREATER 37 AND CMAKE_HOST_WIN32) + message(WARNING "${PORT}'s buildsystem uses very long paths and may fail on your system.\n" "We recommend moving vcpkg to a short path such as 'C:\\src\\vcpkg' or using the subst command." ) endif() @@ -37,7 +37,7 @@ function(qt_modular_build_library SOURCE_PATH) #Find Python and add it to the path vcpkg_find_acquire_program(PYTHON2) get_filename_component(PYTHON2_EXE_PATH ${PYTHON2} DIRECTORY) - set(ENV{PATH} "${PYTHON2_EXE_PATH};$ENV{PATH}") + vcpkg_add_to_path("${PYTHON2_EXE_PATH}") file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" NATIVE_INSTALLED_DIR) file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}" NATIVE_PACKAGES_DIR) @@ -110,7 +110,7 @@ function(qt_modular_build_library SOURCE_PATH) #Move release and debug dlls to the correct directory if(EXISTS ${CURRENT_PACKAGES_DIR}/tools/qt5) - file(RENAME ${CURRENT_PACKAGES_DIR}/tools/qt5 ${CURRENT_PACKAGES_DIR}/tools/${PORT}) + file(RENAME ${CURRENT_PACKAGES_DIR}/tools/qt5 ${CURRENT_PACKAGES_DIR}/tools/${PORT}) endif() if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/tools/qt5) file(RENAME ${CURRENT_PACKAGES_DIR}/debug/tools/qt5 ${CURRENT_PACKAGES_DIR}/debug/tools/${PORT}) |