diff options
Diffstat (limited to 'src/core/CMakeLists.txt')
| -rw-r--r-- | src/core/CMakeLists.txt | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 46121687c..e4283e1d9 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -270,8 +270,9 @@ foreach(arch ${archs}) read_gn_target(${buildGn} ${WEBENGINE_ROOT_BUILD_DIR}/src/core/api/${config}/gn_config.cxx.cmake) read_gn_target(${buildGn} ${WEBENGINE_ROOT_BUILD_DIR}/src/core/api/${config}/gn_config.c.cmake) configure_gn_target(${buildGn} ${config} - ${WEBENGINE_ROOT_SOURCE_DIR}/src/core/configure/BUILD.root.gn.in ${buildDir}/${config}/${arch}/BUILD.gn) - + ${WEBENGINE_ROOT_SOURCE_DIR}/src/core/configure/BUILD.root.gn.in "${buildDir}/${config}/${arch}/BUILD.gn" + core/${config}/${arch} + ) ## # GN PARAMETERS SETUP @@ -468,7 +469,7 @@ target_include_directories(WebEngineCore PRIVATE ${buildDir}/$<CONFIG>/${arch}/gen/third_party/perfetto/build_config ) -add_gn_build_aritfacts_to_target(WebEngineCore QtWebEngineCore ON ${buildDir}) +add_gn_build_aritfacts_to_target(WebEngineCore QtWebEngineCore ${buildDir}) ## # SANDBOX @@ -478,8 +479,10 @@ if(WIN32) add_library(WebEngineCoreSandbox STATIC IMPORTED GLOBAL) foreach(config ${configs}) string(TOUPPER ${config} cfg) - add_ninja_command("" WebEngineCoreSandbox QtWebEngineCoreSandbox - QtWebEngineCoreSandbox.lib ${buildDir}/${config}/${arch} + add_ninja_command( + TARGET QtWebEngineCoreSandbox + OUTPUT QtWebEngineCoreSandbox.lib + BUILDDIR ${buildDir}/${config}/${arch} ) set(sandboxLibraryPath ${buildDir}/${config}/${arch}/QtWebEngineCoreSandbox.lib) set_property(TARGET WebEngineCoreSandbox @@ -591,6 +594,6 @@ if(QT_FEATURE_webengine_spellchecker) ../3rdparty/chromium/third_party/boringssl/src/include ${buildDir}/${config}/${arch}/gen ) - add_gn_build_aritfacts_to_target(${dict_target_name} convert_dict OFF ${buildDir}) + add_gn_build_aritfacts_to_target(${dict_target_name} convert_dict ${buildDir}) endif() |