diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2021-02-19 17:35:32 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2021-02-22 07:30:33 +0000 |
| commit | 7cb81fb5baafa5ebd4c0fcd7bb6856c32c6205f6 (patch) | |
| tree | 23f0dee912aa77b2348d55944a9855a0fa57643a /cmake | |
| parent | 2f67d75ca411ab5d4c95dde59e2f0d77a1f80e41 (diff) | |
CMake build: Add .pri files to development package
This adds at least partial, transitional support for building
3rdparty plugins with qmake against Qt Creator built with CMake.
This might still miss some other .pri files that follow
their own naming conventions.
Fixes: QTCREATORBUG-24055
Fixes: QTCREATORBUG-25334
Change-Id: I83cc547da938976c2ec12a21a17f286b937147f7
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtCreatorAPI.cmake | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/cmake/QtCreatorAPI.cmake b/cmake/QtCreatorAPI.cmake index f03fd42978..fc9d90d27d 100644 --- a/cmake/QtCreatorAPI.cmake +++ b/cmake/QtCreatorAPI.cmake @@ -136,7 +136,14 @@ function(add_qtc_library name) add_library(${name} ${library_type} ${_arg_SOURCES}) add_library(QtCreator::${name} ALIAS ${name}) + set_public_headers(${name} "${_arg_SOURCES}") + # transitional qmake plugin build support + string(TOLOWER "${name}" lowername) + set(dependencies_pri "${CMAKE_CURRENT_SOURCE_DIR}/${lowername}_dependencies.pri") + if(EXISTS ${dependencies_pri}) + qtc_add_public_header(${dependencies_pri}) + endif() # TODO remove, see above if (_arg_SOURCES_PREFIX) @@ -387,7 +394,14 @@ function(add_qtc_plugin target_name) add_library(${target_name} SHARED ${_arg_SOURCES}) add_library(QtCreator::${target_name} ALIAS ${target_name}) + set_public_headers(${target_name} "${_arg_SOURCES}") + # transitional qmake plugin build support + string(TOLOWER "${target_name}" lowername) + set(dependencies_pri "${CMAKE_CURRENT_SOURCE_DIR}/${lowername}_dependencies.pri") + if(EXISTS ${dependencies_pri}) + qtc_add_public_header(${dependencies_pri}) + endif() ### Generate EXPORT_SYMBOL string(TOUPPER "${name}_LIBRARY" EXPORT_SYMBOL) |