feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.14'

Browse Source 
Change-Id: Ib9512b4fc5e17b04ca4be79fc315e79a52d06497
This commit is contained in:
Eike Ziller
2021-02-22 12:19:58 +01:00
parent f47c7b2e90 7cb81fb5ba
commit c55e59cb77
8 changed files with 60 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/QtCreatorAPI.cmake
+14
View File
@@ -161,7 +161,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)
@@ -412,7 +419,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)