mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-27 23:17:54 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
fd6a336227
vcpkg/ports/qttools/no_src_changes.patch

42 lines
1.9 KiB
Diff
Raw Normal View History

[Qt6] update to 6.2.3 (#22846) * update qt to 6.2.3 * update few details * fix filepath. * use vcpkg_cmake_install * use the old fixup since the new one is missing TOOLS_PATH * more fixes * fix bugs * regex tuning * more bug fixes * fix qtwebengine * version stuff * ci retrigger * fix more unused vars * fix some details and silent maybe_unused warnings * version stuff * fix last warning * [skip actions] version stuff * change QT_NAMESPACE to VCPKG_QT_NAMESPACE since that is what the guidelines say for global variables. * version stuff * Apply suggestions from code review Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> * [skip actions] version stuff * version-semver -> version * add license: null * [skip actions] version stuff * small but important prl fix * [skip actions] version stuff * move submodule hashes into port details. * switch to vcpkg-cmake-config because the merge takes so long. * version stuff and hopefully silent bot. * don't let qt "cleanup" compiler flags * add missing dependency. * forgot to chain vcpkg-cmake-config * bit of feature setting to fix dep issues in cmake PR * version stuff * fix unused warnings. * version stuff * silence more warnings * version stuff * do the silencing in qttranslations correctly. * version stuff * silence GHA * version stuff Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2022-02-16 12:24:55 +08:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 20bd474..7b69743 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -187,13 +187,13 @@ endif()
if(WIN32)
file(TO_NATIVE_PATH ${XXD_COMMAND} XXD_COMMAND)
file(TO_NATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/include/master.css MASTER_FILE)
- add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc
- COMMAND type ${MASTER_FILE} | "${XXD_COMMAND}" -i > ${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc)
+ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/src/master.css.inc
+ COMMAND type ${MASTER_FILE} | "${XXD_COMMAND}" -i > ${CMAKE_CURRENT_BINARY_DIR}/src/master.css.inc)
else()
- add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc
- COMMAND cat ${CMAKE_CURRENT_SOURCE_DIR}/include/master.css | xxd -i > ${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc)
+ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/src/master.css.inc
+ COMMAND cat ${CMAKE_CURRENT_SOURCE_DIR}/include/master.css | xxd -i > ${CMAKE_CURRENT_BINARY_DIR}/src/master.css.inc)
endif()
-set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc PROPERTIES GENERATED TRUE)
+set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/src/master.css.inc PROPERTIES GENERATED TRUE)
# Tests
@@ -218,7 +218,7 @@ if (BUILD_TESTING)
add_executable(
${TEST_NAME}
${TEST_LITEHTML}
- ${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc
+ ${CMAKE_CURRENT_BINARY_DIR}/src/master.css.inc
)
set_target_properties(${TEST_NAME} PROPERTIES
@@ -243,7 +243,7 @@ if (BUILD_TESTING)
endif()
# set(TEST_NAME ${PROJECT_NAME}_tests)
-# add_executable(${TEST_NAME} ${TEST_LITEHTML} ${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc)
+# add_executable(${TEST_NAME} ${TEST_LITEHTML} ${CMAKE_CURRENT_BINARY_DIR}/src/master.css.inc)
# set_target_properties(${TEST_NAME} PROPERTIES
# CXX_STANDARD 11
# C_STANDARD 99
Reference in New Issue Copy Permalink