diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-07-31 14:23:31 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-08-01 09:50:19 +0000 |
| commit | 100e21c0d4eb2ed135b567d0c97a658f01bceaca (patch) | |
| tree | e3e0daf2439c6c1104b51d9a4ea422a2c2a73b3d /cmake | |
| parent | c6777035435f218adedf99d51d9136923151fbf0 (diff) | |
CMake build: Add PUBLIC_DEFINES to extend_qtc_target/add_qtc_plugin
Change-Id: I65d5af13f697ed7dcf4d3584e3b4cd776dcdf6c0
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtCreatorAPI.cmake | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/cmake/QtCreatorAPI.cmake b/cmake/QtCreatorAPI.cmake index 3c11c348bf..003ac10c30 100644 --- a/cmake/QtCreatorAPI.cmake +++ b/cmake/QtCreatorAPI.cmake @@ -364,7 +364,7 @@ function(add_qtc_plugin target_name) cmake_parse_arguments(_arg "EXPERIMENTAL;SKIP_DEBUG_CMAKE_FILE_CHECK;SKIP_INSTALL" "VERSION;COMPAT_VERSION;PLUGIN_JSON_IN;PLUGIN_PATH;PLUGIN_NAME;OUTPUT_NAME" - "CONDITION;DEPENDS;PUBLIC_DEPENDS;DEFINES;INCLUDES;PUBLIC_INCLUDES;PLUGIN_DEPENDS;PLUGIN_RECOMMENDS;SOURCES;EXPLICIT_MOC" + "CONDITION;DEPENDS;PUBLIC_DEPENDS;DEFINES;PUBLIC_DEFINES;INCLUDES;PUBLIC_INCLUDES;PLUGIN_DEPENDS;PLUGIN_RECOMMENDS;SOURCES;EXPLICIT_MOC" ${ARGN} ) @@ -501,6 +501,7 @@ function(add_qtc_plugin target_name) target_compile_definitions(${target_name} PRIVATE ${EXPORT_SYMBOL} ${DEFAULT_DEFINES} ${_arg_DEFINES} ${TEST_DEFINES} + PUBLIC ${_arg_PUBLIC_DEFINES} ) add_qtc_depends(${target_name} @@ -548,7 +549,7 @@ function(extend_qtc_target target_name) cmake_parse_arguments(_arg "" "SOURCES_PREFIX" - "CONDITION;DEPENDS;PUBLIC_DEPENDS;DEFINES;INCLUDES;PUBLIC_INCLUDES;SOURCES;EXPLICIT_MOC" + "CONDITION;DEPENDS;PUBLIC_DEPENDS;DEFINES;PUBLIC_DEFINES;INCLUDES;PUBLIC_INCLUDES;SOURCES;EXPLICIT_MOC" ${ARGN} ) @@ -567,7 +568,10 @@ function(extend_qtc_target target_name) PRIVATE ${_arg_DEPENDS} PUBLIC ${_arg_PUBLIC_DEPENDS} ) - target_compile_definitions(${target_name} PRIVATE ${_arg_DEFINES}) + target_compile_definitions(${target_name} + PRIVATE ${_arg_DEFINES} + PUBLIC ${_arg_PUBLIC_DEFINES} + ) target_include_directories(${target_name} PRIVATE ${_arg_INCLUDES}) set_public_includes(${target_name} "${_arg_PUBLIC_INCLUDES}") |