diff options
| -rw-r--r-- | src/core/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/process/CMakeLists.txt | 21 |
2 files changed, 23 insertions, 2 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 995c32475..783a3b03a 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -70,6 +70,10 @@ foreach(arch ${GN_ARCHITECTURES}) get_forward_declaration_macro(forwardDeclarationMacro) get_target_property(qtWebEngineProcessName WebEngineCore QTWEBENGINEPROCESS_NAME) + if(QT_FEATURE_debug_and_release AND ("${config}" STREQUAL "Debug")) + set(qtWebEngineProcessName "${qtWebEngineProcessName}${CMAKE_DEBUG_POSTFIX}") + endif() + set(gnCxxCompileOptions "") if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") # Silence warning in boringssl headers. diff --git a/src/process/CMakeLists.txt b/src/process/CMakeLists.txt index 6d35d632c..3afdcc9bc 100644 --- a/src/process/CMakeLists.txt +++ b/src/process/CMakeLists.txt @@ -28,7 +28,18 @@ target_link_libraries(${qtWebEngineProcessName} ) target_include_directories(${qtWebEngineProcessName} PRIVATE ../core) -get_install_config(config) + +qt_get_cmake_configurations(configs) +foreach(config ${configs}) + string(TOUPPER "${config}" config_upper) + set_target_properties(${qtWebEngineProcessName} PROPERTIES + RUNTIME_OUTPUT_DIRECTORY_${config_upper} "${QT_BUILD_DIR}/${INSTALL_LIBEXECDIR}") +endforeach() + +if(QT_FEATURE_debug_and_release) + set_target_properties(${qtWebEngineProcessName} PROPERTIES + OUTPUT_NAME_DEBUG ${qtWebEngineProcessName}${CMAKE_DEBUG_POSTFIX}) +endif() if(isFramework) set_target_properties(${qtWebEngineProcessName} PROPERTIES MACOSX_BUNDLE TRUE) @@ -48,8 +59,14 @@ if(isFramework) ) else() install(TARGETS ${qtWebEngineProcessName} + CONFIGURATIONS ${configs} RUNTIME DESTINATION "${INSTALL_LIBEXECDIR}" - CONFIGURATIONS ${config} + ) +endif() + +if(MSVC) + install(FILES "$<TARGET_PDB_FILE:${qtWebEngineProcessName}>" OPTIONAL + DESTINATION "${INSTALL_LIBEXECDIR}" ) endif() |