forked from qt-creator/qt-creator
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>
This commit is contained in:
@@ -138,6 +138,25 @@ else()
|
||||
)
|
||||
endif()
|
||||
|
||||
# install qmake support files
|
||||
install(
|
||||
FILES
|
||||
qtcreator.pri
|
||||
qtcreatordata.pri
|
||||
qtcreator_ide_branding.pri
|
||||
DESTINATION include
|
||||
COMPONENT Devel EXCLUDE_FROM_ALL
|
||||
)
|
||||
install(
|
||||
FILES
|
||||
src/qtcreatorlibrary.pri
|
||||
src/qtcreatorplugin.pri
|
||||
src/qtcreatortool.pri
|
||||
src/rpath.pri
|
||||
DESTINATION include/src
|
||||
COMPONENT Devel EXCLUDE_FROM_ALL
|
||||
)
|
||||
|
||||
feature_summary(INCLUDE_QUIET_PACKAGES WHAT
|
||||
PACKAGES_FOUND PACKAGES_NOT_FOUND
|
||||
ENABLED_FEATURES DISABLED_FEATURES
|
||||
|
@@ -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)
|
||||
|
@@ -43,6 +43,9 @@ add_qtc_library(KSyntaxHighlighting SHARED
|
||||
src/lib/xml_p.h
|
||||
)
|
||||
qtc_add_public_header(autogenerated/src/lib/State)
|
||||
# transitional qmake plugin build support
|
||||
qtc_add_public_header(${CMAKE_CURRENT_SOURCE_DIR}/../../../shared/syntax/syntax_shared.pri)
|
||||
qtc_add_public_header(syntax-highlighting_dependencies.pri)
|
||||
|
||||
if(TARGET KSyntaxHighlighting)
|
||||
install(
|
||||
|
@@ -20,3 +20,5 @@ add_qtc_library(QtcSsh
|
||||
sshremoteprocessrunner.cpp sshremoteprocessrunner.h
|
||||
sshsettings.cpp sshsettings.h
|
||||
)
|
||||
# transitional qmake plugin build support
|
||||
qtc_add_public_header(ssh_dependencies.pri)
|
||||
|
@@ -201,3 +201,6 @@ if ((NOT WIN32) AND (NOT APPLE))
|
||||
)
|
||||
endforeach()
|
||||
endif()
|
||||
|
||||
# transitional qmake plugin build support
|
||||
qtc_add_public_header(coreplugin_dependencies.pri)
|
||||
|
Reference in New Issue
Block a user