diff options
| author | Barath Kannan <barathsotd@gmail.com> | 2016-11-02 18:47:40 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-02 18:47:40 +1100 |
| commit | de42c4597d928db9dc481d7184dcda3b2c879f63 (patch) | |
| tree | 12cbd5ba6a4be64fb5512693276b847456c991eb /ports | |
| parent | a79c348045f513de8fb24ffb12532c1b1a396c3c (diff) | |
| parent | b25c13c1551456dc89ca959c7133b1cc6117532e (diff) | |
| download | vcpkg-de42c4597d928db9dc481d7184dcda3b2c879f63.tar.gz vcpkg-de42c4597d928db9dc481d7184dcda3b2c879f63.zip | |
Merge pull request #1 from barcharcraz/barath-qt5-additions
made some qt5 fixes
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/qt5/fixcmake.py | 10 | ||||
| -rw-r--r-- | ports/qt5/portfile.cmake | 20 |
2 files changed, 26 insertions, 4 deletions
diff --git a/ports/qt5/fixcmake.py b/ports/qt5/fixcmake.py index dbee0ed16..bd37c1e54 100644 --- a/ports/qt5/fixcmake.py +++ b/ports/qt5/fixcmake.py @@ -27,10 +27,18 @@ for f in files: builder += " else()" builder += "\n " + line.replace("/lib/", "/debug/lib/") builder += " endif()\n" + elif "_install_prefix}/lib/qtmaind.lib" in line: + builder += line.replace("/lib/", "/debug/lib/") + elif "_install_prefix}/plugins/${PLUGIN_LOCATION}" in line: + builder += " if (${Configuration} STREQUAL \"RELEASE\")" + builder += "\n " + line + builder += " else()" + builder += "\n " + line.replace("/plugins/", "/debug/plugins/") + builder += " endif()\n" elif exepattern.search(line) != None: builder += line.replace("/bin/", "/tools/") else: builder += line new_file = open(f, "w") new_file.write(builder) - new_file.close() + new_file.close()
\ No newline at end of file diff --git a/ports/qt5/portfile.cmake b/ports/qt5/portfile.cmake index 81b30767c..d1181911b 100644 --- a/ports/qt5/portfile.cmake +++ b/ports/qt5/portfile.cmake @@ -7,9 +7,12 @@ set(ENV{PATH} "${OUTPUT_PATH}/qtbase/bin;$ENV{PATH}") find_program(NMAKE nmake) vcpkg_find_acquire_program(JOM) -find_program(PYTHON python) +vcpkg_find_acquire_program(PERL) +vcpkg_find_acquire_program(PYTHON3) +get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY) +get_filename_component(PYTHON3_EXE_PATH ${PYTHON3} DIRECTORY) get_filename_component(JOM_EXE_PATH ${JOM} DIRECTORY) -set(ENV{PATH} "${JOM_EXE_PATH};$ENV{PATH}") +set(ENV{PATH} "${JOM_EXE_PATH};${PYTHON3_EXE_PATH};${PERL_EXE_PATH};$ENV{PATH}") vcpkg_download_distfile(ARCHIVE_FILE URLS "http://download.qt.io/official_releases/qt/5.7/5.7.0/single/qt-everywhere-opensource-src-5.7.0.7z" @@ -112,6 +115,17 @@ file(REMOVE ${DEBUG_LIB_FILES}) file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/Qt5Gamepad.lib ${CURRENT_PACKAGES_DIR}/lib/Qt5Gamepad.lib) file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/Qt5Gamepad.prl ${CURRENT_PACKAGES_DIR}/lib/Qt5Gamepad.prl) file(GLOB BINARY_TOOLS "${CURRENT_PACKAGES_DIR}/bin/*.exe") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/plugins") +file(GLOB_RECURSE DEBUG_PLUGINS + "${CURRENT_PACKAGES_DIR}/plugins/*d.dll" + "${CURRENT_PACKAGES_DIR}/plugins/*d.pdb") +foreach(file ${DEBUG_PLUGINS}) + get_filename_component(file_n ${file} NAME) + file(RELATIVE_PATH file_rel "${CURRENT_PACKAGES_DIR}/plugins" ${file}) + get_filename_component(rel_dir ${file_rel} DIRECTORY) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/plugins/${rel_dir}") + file(RENAME ${file} "${CURRENT_PACKAGES_DIR}/debug/plugins/${rel_dir}/${file_n}") +endforeach() foreach(BINARY ${BINARY_TOOLS}) execute_process(COMMAND dumpbin /PDBPATH ${BINARY} COMMAND findstr PDB @@ -135,7 +149,7 @@ if(DEFINED VCPKG_CRT_LINKAGE AND VCPKG_CRT_LINKAGE STREQUAL dynamic) endif() vcpkg_execute_required_process( - COMMAND ${PYTHON} ${CMAKE_CURRENT_LIST_DIR}/fixcmake.py + COMMAND ${PYTHON3} ${CMAKE_CURRENT_LIST_DIR}/fixcmake.py WORKING_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/cmake LOGNAME fix-cmake ) |