aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Croitor <[email protected]>2022-07-20 17:40:35 +0200
committerAlexandru Croitor <[email protected]>2022-07-21 13:19:04 +0200
commiteed7b3f4e7fe53d3a8c92a0413e42a14a80e34bc (patch)
treedd7efaebbcb9eacbd5808edf980546b179084774
parenta78463ef31abf258704761dff5266c3844a14dc9 (diff)
CMake: Don't use PUBLIC_LIBRARIES for executables
Change-Id: I346ea4eac1dfbfb7fb81609307f5f7c4716bb8d1 Reviewed-by: Alexey Edelev <[email protected]>
-rw-r--r--src/qmltyperegistrar/CMakeLists.txt2
-rw-r--r--tools/qml/CMakeLists.txt2
-rw-r--r--tools/qmlcachegen/CMakeLists.txt2
-rw-r--r--tools/qmldom/CMakeLists.txt2
-rw-r--r--tools/qmleasing/CMakeLists.txt2
-rw-r--r--tools/qmlformat/CMakeLists.txt2
-rw-r--r--tools/qmlimportscanner/CMakeLists.txt2
-rw-r--r--tools/qmljs/CMakeLists.txt2
-rw-r--r--tools/qmljsrootgen/CMakeLists.txt2
-rw-r--r--tools/qmllint/CMakeLists.txt2
-rw-r--r--tools/qmlls/CMakeLists.txt2
-rw-r--r--tools/qmlplugindump/CMakeLists.txt1
-rw-r--r--tools/qmlpreview/CMakeLists.txt2
-rw-r--r--tools/qmlprofiler/CMakeLists.txt2
-rw-r--r--tools/qmlscene/CMakeLists.txt2
-rw-r--r--tools/qmltestrunner/CMakeLists.txt2
-rw-r--r--tools/qmltime/CMakeLists.txt2
17 files changed, 16 insertions, 17 deletions
diff --git a/src/qmltyperegistrar/CMakeLists.txt b/src/qmltyperegistrar/CMakeLists.txt
index 85b53ddc56..e7bca836fb 100644
--- a/src/qmltyperegistrar/CMakeLists.txt
+++ b/src/qmltyperegistrar/CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_module(QmlTypeRegistrarPrivate
DEFINES
QT_NO_CAST_FROM_ASCII
QT_NO_CAST_TO_ASCII
- PUBLIC_LIBRARIES
+ LIBRARIES
Qt::CorePrivate
GENERATE_CPP_EXPORTS
GENERATE_PRIVATE_CPP_EXPORTS
diff --git a/tools/qml/CMakeLists.txt b/tools/qml/CMakeLists.txt
index 1fbcac09a2..439cb8c9b5 100644
--- a/tools/qml/CMakeLists.txt
+++ b/tools/qml/CMakeLists.txt
@@ -12,7 +12,7 @@ qt_internal_add_app(qml
SOURCES
conf.h
main.cpp
- PUBLIC_LIBRARIES
+ LIBRARIES
Qt::CorePrivate
Qt::QmlPrivate
)
diff --git a/tools/qmlcachegen/CMakeLists.txt b/tools/qmlcachegen/CMakeLists.txt
index 6aff90c5c2..ec8206e2cd 100644
--- a/tools/qmlcachegen/CMakeLists.txt
+++ b/tools/qmlcachegen/CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_tool(${target_name}
DEFINES
QT_NO_CAST_FROM_ASCII
QT_NO_CAST_TO_ASCII
- PUBLIC_LIBRARIES
+ LIBRARIES
Qt::QmlCompilerPrivate
)
qt_internal_return_unless_building_tools()
diff --git a/tools/qmldom/CMakeLists.txt b/tools/qmldom/CMakeLists.txt
index edf8879cf1..9f637d9e20 100644
--- a/tools/qmldom/CMakeLists.txt
+++ b/tools/qmldom/CMakeLists.txt
@@ -11,7 +11,7 @@ qt_internal_add_tool(${target_name}
TOOLS_TARGET Qml # special case
SOURCES
qmldomtool.cpp
- PUBLIC_LIBRARIES
+ LIBRARIES
Qt::CorePrivate
Qt::QmlDomPrivate
)
diff --git a/tools/qmleasing/CMakeLists.txt b/tools/qmleasing/CMakeLists.txt
index 34f47b65a2..d4668820da 100644
--- a/tools/qmleasing/CMakeLists.txt
+++ b/tools/qmleasing/CMakeLists.txt
@@ -16,7 +16,7 @@ qt_internal_add_app(qmleasing
properties.ui
segmentproperties.cpp segmentproperties.h
splineeditor.cpp splineeditor.h
- PUBLIC_LIBRARIES
+ LIBRARIES
Qt::Gui
Qt::Qml
Qt::Quick
diff --git a/tools/qmlformat/CMakeLists.txt b/tools/qmlformat/CMakeLists.txt
index ee62f2334f..667438175b 100644
--- a/tools/qmlformat/CMakeLists.txt
+++ b/tools/qmlformat/CMakeLists.txt
@@ -15,7 +15,7 @@ qt_internal_add_tool(${target_name}
qmlformat.cpp
../shared/qqmltoolingsettings.h
../shared/qqmltoolingsettings.cpp
- PUBLIC_LIBRARIES
+ LIBRARIES
Qt::Core
Qt::QmlDomPrivate
)
diff --git a/tools/qmlimportscanner/CMakeLists.txt b/tools/qmlimportscanner/CMakeLists.txt
index 620915f42a..247bfe2e48 100644
--- a/tools/qmlimportscanner/CMakeLists.txt
+++ b/tools/qmlimportscanner/CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_tool(${target_name}
DEFINES
QT_NO_CAST_FROM_ASCII
QT_NO_CAST_TO_ASCII
- PUBLIC_LIBRARIES
+ LIBRARIES
Qt::QmlCompilerPrivate
Qt::QmlPrivate
)
diff --git a/tools/qmljs/CMakeLists.txt b/tools/qmljs/CMakeLists.txt
index 94db5585c3..d31a4b4867 100644
--- a/tools/qmljs/CMakeLists.txt
+++ b/tools/qmljs/CMakeLists.txt
@@ -35,7 +35,7 @@ qt_internal_add_app(qmljs
../../src/3rdparty/masm/stubs/runtime
../../src/3rdparty/masm/stubs/wtf
../../src/3rdparty/masm/wtf
- PUBLIC_LIBRARIES
+ LIBRARIES
Qt::CorePrivate
Qt::QmlPrivate
)
diff --git a/tools/qmljsrootgen/CMakeLists.txt b/tools/qmljsrootgen/CMakeLists.txt
index df7b7d48c9..d60e03c57f 100644
--- a/tools/qmljsrootgen/CMakeLists.txt
+++ b/tools/qmljsrootgen/CMakeLists.txt
@@ -8,7 +8,7 @@ qt_internal_add_tool(${target_name}
INSTALL_DIR "${INSTALL_LIBEXECDIR}"
SOURCES
main.cpp
- PUBLIC_LIBRARIES
+ LIBRARIES
Qt::CorePrivate
Qt::QmlPrivate
)
diff --git a/tools/qmllint/CMakeLists.txt b/tools/qmllint/CMakeLists.txt
index 2316afae8e..8dd2b75940 100644
--- a/tools/qmllint/CMakeLists.txt
+++ b/tools/qmllint/CMakeLists.txt
@@ -15,7 +15,7 @@ qt_internal_add_tool(${target_name}
main.cpp
../shared/qqmltoolingsettings.h
../shared/qqmltoolingsettings.cpp
- PUBLIC_LIBRARIES
+ LIBRARIES
Qt::CorePrivate
Qt::QmlCompilerPrivate
)
diff --git a/tools/qmlls/CMakeLists.txt b/tools/qmlls/CMakeLists.txt
index 4576f1fc80..f4463d223f 100644
--- a/tools/qmlls/CMakeLists.txt
+++ b/tools/qmlls/CMakeLists.txt
@@ -26,7 +26,7 @@ qt_internal_add_app(qmlls
../shared/qqmltoolingsettings.cpp
DEFINES
QT_USE_QSTRINGBUILDER
- PUBLIC_LIBRARIES
+ LIBRARIES
Qt::QmlPrivate
Qt::CorePrivate
Qt::QmlDomPrivate
diff --git a/tools/qmlplugindump/CMakeLists.txt b/tools/qmlplugindump/CMakeLists.txt
index 04f24104d1..ad68b3b1d4 100644
--- a/tools/qmlplugindump/CMakeLists.txt
+++ b/tools/qmlplugindump/CMakeLists.txt
@@ -16,7 +16,6 @@ qt_internal_add_tool(${target_name}
qmltypereader.cpp qmltypereader.h
LIBRARIES
Qt::QmlTypeRegistrarPrivate
- PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::Gui
Qt::Qml
diff --git a/tools/qmlpreview/CMakeLists.txt b/tools/qmlpreview/CMakeLists.txt
index 515cddafc7..44f47f76de 100644
--- a/tools/qmlpreview/CMakeLists.txt
+++ b/tools/qmlpreview/CMakeLists.txt
@@ -13,7 +13,7 @@ qt_internal_add_app(qmlpreview
main.cpp
qmlpreviewapplication.cpp qmlpreviewapplication.h
qmlpreviewfilesystemwatcher.cpp qmlpreviewfilesystemwatcher.h
- PUBLIC_LIBRARIES
+ LIBRARIES
Qt::Network
Qt::QmlDebugPrivate
)
diff --git a/tools/qmlprofiler/CMakeLists.txt b/tools/qmlprofiler/CMakeLists.txt
index f1fa216eea..02a347d14e 100644
--- a/tools/qmlprofiler/CMakeLists.txt
+++ b/tools/qmlprofiler/CMakeLists.txt
@@ -18,7 +18,7 @@ qt_internal_add_tool(${target_name}
qmlprofilerapplication.cpp qmlprofilerapplication.h
qmlprofilerclient.cpp qmlprofilerclient.h
qmlprofilerdata.cpp qmlprofilerdata.h
- PUBLIC_LIBRARIES
+ LIBRARIES
Qt::Network
Qt::QmlDebugPrivate
)
diff --git a/tools/qmlscene/CMakeLists.txt b/tools/qmlscene/CMakeLists.txt
index b7b0d4d09a..9ecf62e8a0 100644
--- a/tools/qmlscene/CMakeLists.txt
+++ b/tools/qmlscene/CMakeLists.txt
@@ -11,7 +11,7 @@ qt_internal_add_app(qmlscene
main.cpp
DEFINES
QML_RUNTIME_TESTING
- PUBLIC_LIBRARIES
+ LIBRARIES
Qt::CorePrivate
Qt::Gui
Qt::GuiPrivate
diff --git a/tools/qmltestrunner/CMakeLists.txt b/tools/qmltestrunner/CMakeLists.txt
index ae6f83567e..7dcab9ca47 100644
--- a/tools/qmltestrunner/CMakeLists.txt
+++ b/tools/qmltestrunner/CMakeLists.txt
@@ -13,7 +13,7 @@ qt_internal_add_tool(${target_name}
TOOLS_TARGET Qml # special case
SOURCES
main.cpp
- PUBLIC_LIBRARIES
+ LIBRARIES
Qt::Gui
Qt::Qml
Qt::QuickTest
diff --git a/tools/qmltime/CMakeLists.txt b/tools/qmltime/CMakeLists.txt
index a6a07368a5..d8e0c52342 100644
--- a/tools/qmltime/CMakeLists.txt
+++ b/tools/qmltime/CMakeLists.txt
@@ -13,7 +13,7 @@ qt_internal_add_tool(${target_name}
TOOLS_TARGET Qml # special case
SOURCES
qmltime.cpp qmltime.h
- PUBLIC_LIBRARIES
+ LIBRARIES
Qt::Gui
Qt::Qml
Qt::Quick