diff options
34 files changed, 120 insertions, 47 deletions
diff --git a/.cmake.conf b/.cmake.conf new file mode 100644 index 0000000..9305480 --- /dev/null +++ b/.cmake.conf @@ -0,0 +1 @@ +set(QT_REPO_MODULE_VERSION "6.0.0") diff --git a/.prev_CMakeLists.txt b/.prev_CMakeLists.txt index efb9c4a..8fb7705 100644 --- a/.prev_CMakeLists.txt +++ b/.prev_CMakeLists.txt @@ -2,8 +2,9 @@ cmake_minimum_required(VERSION 3.15.0) +include(.cmake.conf) project(QtRemoteObjects - VERSION 6.0.0 + VERSION "${QT_REPO_MODULE_VERSION}" DESCRIPTION "Qt RemoteObjects Libraries" HOMEPAGE_URL "https://qt.io/" LANGUAGES CXX C diff --git a/CMakeLists.txt b/CMakeLists.txt index d29dc6c..9bbbf36 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,8 +2,9 @@ cmake_minimum_required(VERSION 3.15.0) +include(.cmake.conf) project(QtRemoteObjects - VERSION 6.0.0 + VERSION "${QT_REPO_MODULE_VERSION}" DESCRIPTION "Qt RemoteObjects Libraries" HOMEPAGE_URL "https://qt.io/" LANGUAGES CXX C diff --git a/examples/remoteobjects/clientapp/CMakeLists.txt b/examples/remoteobjects/clientapp/CMakeLists.txt index 6b1446c..3431885 100644 --- a/examples/remoteobjects/clientapp/CMakeLists.txt +++ b/examples/remoteobjects/clientapp/CMakeLists.txt @@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/remoteobjects/clientapp") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/remoteobjects/clientapp") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) diff --git a/examples/remoteobjects/cppclient/CMakeLists.txt b/examples/remoteobjects/cppclient/CMakeLists.txt index 3bea6a8..f6dd299 100644 --- a/examples/remoteobjects/cppclient/CMakeLists.txt +++ b/examples/remoteobjects/cppclient/CMakeLists.txt @@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/remoteobjects/cppclient") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/remoteobjects/cppclient") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS RemoteObjects) diff --git a/examples/remoteobjects/modelviewclient/CMakeLists.txt b/examples/remoteobjects/modelviewclient/CMakeLists.txt index 8b60772..cda7293 100644 --- a/examples/remoteobjects/modelviewclient/CMakeLists.txt +++ b/examples/remoteobjects/modelviewclient/CMakeLists.txt @@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/remoteobjects/modelviewclient") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/remoteobjects/modelviewclient") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) diff --git a/examples/remoteobjects/modelviewserver/CMakeLists.txt b/examples/remoteobjects/modelviewserver/CMakeLists.txt index dfdb56a..6471a35 100644 --- a/examples/remoteobjects/modelviewserver/CMakeLists.txt +++ b/examples/remoteobjects/modelviewserver/CMakeLists.txt @@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/remoteobjects/modelviewserver") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/remoteobjects/modelviewserver") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) diff --git a/examples/remoteobjects/plugins/CMakeLists.txt b/examples/remoteobjects/plugins/CMakeLists.txt index 66cbd3d..ff0c5f4 100644 --- a/examples/remoteobjects/plugins/CMakeLists.txt +++ b/examples/remoteobjects/plugins/CMakeLists.txt @@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/remoteobjects/plugins/imports/TimeExample") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/remoteobjects/plugins/imports/TimeExample") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) diff --git a/examples/remoteobjects/qmlmodelviewclient/CMakeLists.txt b/examples/remoteobjects/qmlmodelviewclient/CMakeLists.txt index 9d77d54..c03320a 100644 --- a/examples/remoteobjects/qmlmodelviewclient/CMakeLists.txt +++ b/examples/remoteobjects/qmlmodelviewclient/CMakeLists.txt @@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/remoteobjects/qmlmodelviewclient") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/remoteobjects/qmlmodelviewclient") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) diff --git a/examples/remoteobjects/server/CMakeLists.txt b/examples/remoteobjects/server/CMakeLists.txt index 161d9df..53506c7 100644 --- a/examples/remoteobjects/server/CMakeLists.txt +++ b/examples/remoteobjects/server/CMakeLists.txt @@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/remoteobjects/server") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/remoteobjects/server") find_package(Qt6 COMPONENTS RemoteObjects) find_package(Qt6 COMPONENTS Core) diff --git a/examples/remoteobjects/simpleswitch/directconnectclient/CMakeLists.txt b/examples/remoteobjects/simpleswitch/directconnectclient/CMakeLists.txt index 641771e..bbdedd9 100644 --- a/examples/remoteobjects/simpleswitch/directconnectclient/CMakeLists.txt +++ b/examples/remoteobjects/simpleswitch/directconnectclient/CMakeLists.txt @@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/remoteobjects/simpleswitch/directconnectclient") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/remoteobjects/simpleswitch/directconnectclient") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS RemoteObjects) diff --git a/examples/remoteobjects/simpleswitch/directconnectdynamicclient/CMakeLists.txt b/examples/remoteobjects/simpleswitch/directconnectdynamicclient/CMakeLists.txt index 03cebca..8818c42 100644 --- a/examples/remoteobjects/simpleswitch/directconnectdynamicclient/CMakeLists.txt +++ b/examples/remoteobjects/simpleswitch/directconnectdynamicclient/CMakeLists.txt @@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/remoteobjects/simpleswitch/directconnectdynamicclient") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/remoteobjects/simpleswitch/directconnectdynamicclient") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS RemoteObjects) diff --git a/examples/remoteobjects/simpleswitch/directconnectserver/CMakeLists.txt b/examples/remoteobjects/simpleswitch/directconnectserver/CMakeLists.txt index 0eac9db..63aa555 100644 --- a/examples/remoteobjects/simpleswitch/directconnectserver/CMakeLists.txt +++ b/examples/remoteobjects/simpleswitch/directconnectserver/CMakeLists.txt @@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/remoteobjects/simpleswitch/directconnectserver") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/remoteobjects/simpleswitch/directconnectserver") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS RemoteObjects) diff --git a/examples/remoteobjects/simpleswitch/registryconnectedclient/CMakeLists.txt b/examples/remoteobjects/simpleswitch/registryconnectedclient/CMakeLists.txt index 6e96a88..258c569 100644 --- a/examples/remoteobjects/simpleswitch/registryconnectedclient/CMakeLists.txt +++ b/examples/remoteobjects/simpleswitch/registryconnectedclient/CMakeLists.txt @@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/remoteobjects/simpleswitch/registryconnectedclient") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/remoteobjects/simpleswitch/registryconnectedclient") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS RemoteObjects) diff --git a/examples/remoteobjects/simpleswitch/registryconnectedserver/CMakeLists.txt b/examples/remoteobjects/simpleswitch/registryconnectedserver/CMakeLists.txt index d944727..74747da 100644 --- a/examples/remoteobjects/simpleswitch/registryconnectedserver/CMakeLists.txt +++ b/examples/remoteobjects/simpleswitch/registryconnectedserver/CMakeLists.txt @@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/remoteobjects/simpleswitch/registryconnectedserver") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/remoteobjects/simpleswitch/registryconnectedserver") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS RemoteObjects) diff --git a/examples/remoteobjects/ssl/sslcppclient/CMakeLists.txt b/examples/remoteobjects/ssl/sslcppclient/CMakeLists.txt index 49e9d87..d6fbe8e 100644 --- a/examples/remoteobjects/ssl/sslcppclient/CMakeLists.txt +++ b/examples/remoteobjects/ssl/sslcppclient/CMakeLists.txt @@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/remoteobjects/ssl/sslcppclient") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/remoteobjects/ssl/sslcppclient") find_package(Qt6 COMPONENTS RemoteObjects) find_package(Qt6 COMPONENTS Core) @@ -17,14 +21,11 @@ find_package(Qt6 COMPONENTS Core) add_executable(SslCppClient main.cpp ) -target_link_libraries(SslCppClient PRIVATE - Qt::RemoteObjectsPrivate -) - target_link_libraries(SslCppClient PUBLIC # Remove: gui Qt::Core Qt::RemoteObjects + Qt::RemoteObjectsPrivate ) diff --git a/examples/remoteobjects/ssl/sslserver/CMakeLists.txt b/examples/remoteobjects/ssl/sslserver/CMakeLists.txt index 149bcf3..117bf5a 100644 --- a/examples/remoteobjects/ssl/sslserver/CMakeLists.txt +++ b/examples/remoteobjects/ssl/sslserver/CMakeLists.txt @@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/remoteobjects/ssl/sslserver") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/remoteobjects/ssl/sslserver") find_package(Qt6 COMPONENTS RemoteObjects) find_package(Qt6 COMPONENTS Core) @@ -19,13 +23,10 @@ add_executable(sslserver sslserver.cpp sslserver.h timemodel.cpp timemodel.h ) -target_link_libraries(sslserver PRIVATE - Qt::RemoteObjectsPrivate -) - target_link_libraries(sslserver PUBLIC Qt::Core Qt::RemoteObjects + Qt::RemoteObjectsPrivate ) diff --git a/examples/remoteobjects/websockets/wsclient/CMakeLists.txt b/examples/remoteobjects/websockets/wsclient/CMakeLists.txt index 4deaed3..d733be6 100644 --- a/examples/remoteobjects/websockets/wsclient/CMakeLists.txt +++ b/examples/remoteobjects/websockets/wsclient/CMakeLists.txt @@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/remoteobjects/websockets/wsclient") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/remoteobjects/websockets/wsclient") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) diff --git a/examples/remoteobjects/websockets/wsserver/CMakeLists.txt b/examples/remoteobjects/websockets/wsserver/CMakeLists.txt index 1ce18e2..d1fe00d 100644 --- a/examples/remoteobjects/websockets/wsserver/CMakeLists.txt +++ b/examples/remoteobjects/websockets/wsserver/CMakeLists.txt @@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/remoteobjects/websockets/wsserver") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/remoteobjects/websockets/wsserver") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) diff --git a/mkspecs/CMakeLists.txt b/mkspecs/CMakeLists.txt new file mode 100644 index 0000000..687a3be --- /dev/null +++ b/mkspecs/CMakeLists.txt @@ -0,0 +1,3 @@ +# Generated from mkspecs.pro. + +add_subdirectory(features) diff --git a/mkspecs/features/CMakeLists.txt b/mkspecs/features/CMakeLists.txt new file mode 100644 index 0000000..e021ede --- /dev/null +++ b/mkspecs/features/CMakeLists.txt @@ -0,0 +1,2 @@ +# Generated from features.pro. + diff --git a/src/imports/remoteobjects/.prev_CMakeLists.txt b/src/imports/remoteobjects/.prev_CMakeLists.txt index e7baf77..296e564 100644 --- a/src/imports/remoteobjects/.prev_CMakeLists.txt +++ b/src/imports/remoteobjects/.prev_CMakeLists.txt @@ -11,12 +11,11 @@ qt_add_qml_module(qtremoteobjects SKIP_TYPE_REGISTRATION SOURCES plugin.cpp - LIBRARIES - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Core Qt::Gui Qt::Qml + Qt::QmlPrivate Qt::RemoteObjects ) diff --git a/src/imports/remoteobjects/CMakeLists.txt b/src/imports/remoteobjects/CMakeLists.txt index 2c84b0c..2afc331 100644 --- a/src/imports/remoteobjects/CMakeLists.txt +++ b/src/imports/remoteobjects/CMakeLists.txt @@ -11,12 +11,11 @@ qt_add_qml_module(qtremoteobjects SKIP_TYPE_REGISTRATION SOURCES plugin.cpp - LIBRARIES - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Core Qt::Gui Qt::Qml + Qt::QmlPrivate Qt::RemoteObjects ) diff --git a/src/remoteobjects/.prev_CMakeLists.txt b/src/remoteobjects/.prev_CMakeLists.txt index 88af4e0..b052f32 100644 --- a/src/remoteobjects/.prev_CMakeLists.txt +++ b/src/remoteobjects/.prev_CMakeLists.txt @@ -37,6 +37,8 @@ qt_add_module(RemoteObjects PUBLIC_LIBRARIES Qt::Core Qt::Network + PRIVATE_MODULE_INTERFACE + Qt::CorePrivate ) #### Keys ignored in scope 1:.:.:remoteobjects.pro:<TRUE>: diff --git a/src/remoteobjects/CMakeLists.txt b/src/remoteobjects/CMakeLists.txt index 94c5bed..15b3b3d 100644 --- a/src/remoteobjects/CMakeLists.txt +++ b/src/remoteobjects/CMakeLists.txt @@ -37,6 +37,8 @@ qt_add_module(RemoteObjects PUBLIC_LIBRARIES Qt::Core Qt::Network + PRIVATE_MODULE_INTERFACE + Qt::CorePrivate ) #### Keys ignored in scope 1:.:.:remoteobjects.pro:<TRUE>: diff --git a/src/repparser/.prev_CMakeLists.txt b/src/repparser/.prev_CMakeLists.txt index d6b8abd..588bfa4 100644 --- a/src/repparser/.prev_CMakeLists.txt +++ b/src/repparser/.prev_CMakeLists.txt @@ -14,6 +14,7 @@ qt_add_module(RepParser #### Keys ignored in scope 1:.:.:repparser.pro:<TRUE>: # MODULE = "repparser" +# OTHER_FILES = "$$PWD/parser.g" # def_build = "debug" ## Scopes: diff --git a/src/repparser/CMakeLists.txt b/src/repparser/CMakeLists.txt index dc1a9d1..d9cf7c7 100644 --- a/src/repparser/CMakeLists.txt +++ b/src/repparser/CMakeLists.txt @@ -14,6 +14,7 @@ qt_add_module(RepParser #### Keys ignored in scope 1:.:.:repparser.pro:<TRUE>: # MODULE = "repparser" +# OTHER_FILES = "$$PWD/parser.g" # def_build = "debug" ## Scopes: diff --git a/tests/.prev_CMakeLists.txt b/tests/.prev_CMakeLists.txt index 0651f91..2214137 100644 --- a/tests/.prev_CMakeLists.txt +++ b/tests/.prev_CMakeLists.txt @@ -1,10 +1,7 @@ # Generated from tests.pro. -if(NOT TARGET Qt::Test) - cmake_minimum_required(VERSION 3.15.0) - project(QtRemoteObjectsTests VERSION 6.0.0 LANGUAGES C CXX) - find_package(Qt6 ${PROJECT_VERSION} REQUIRED COMPONENTS BuildInternals Core SET_ME_TO_SOMETHING_USEFUL) - find_package(Qt6 ${PROJECT_VERSION} OPTIONAL_COMPONENTS SET_ME_TO_SOMETHING_USEFUL) - qt_set_up_standalone_tests_build() +if(QT_BUILD_STANDALONE_TESTS) + # Add qt_find_package calls for extra dependencies that need to be found when building + # the standalone tests here. endif() qt_build_tests() diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index ba93636..e6897f5 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,6 +1,8 @@ # Generated from tests.pro. -if(NOT TARGET Qt::Test) +if(QT_BUILD_STANDALONE_TESTS) + # Add qt_find_package calls for extra dependencies that need to be found when building + # the standalone tests here. cmake_minimum_required(VERSION 3.15.0) project(QtRemoteObjectsTests VERSION 6.0.0 LANGUAGES C CXX) find_package(Qt6 ${PROJECT_VERSION} REQUIRED COMPONENTS BuildInternals Core RemoteObjects Test) # special case diff --git a/tests/auto/modelview/CMakeLists.txt b/tests/auto/modelview/CMakeLists.txt index d5b1c51..39b03a5 100644 --- a/tests/auto/modelview/CMakeLists.txt +++ b/tests/auto/modelview/CMakeLists.txt @@ -21,7 +21,7 @@ qt_extend_target(tst_modelview CONDITION boot2qt SLOW_MODELTEST ) -qt_extend_target(tst_modelview CONDITION mingw +qt_extend_target(tst_modelview CONDITION MINGW DEFINES SLOW_MODELTEST ) diff --git a/tests/auto/repparser/.prev_CMakeLists.txt b/tests/auto/repparser/.prev_CMakeLists.txt index 965ecaf..3bd8cff 100644 --- a/tests/auto/repparser/.prev_CMakeLists.txt +++ b/tests/auto/repparser/.prev_CMakeLists.txt @@ -9,7 +9,7 @@ qt_add_test(tst_parser tst_parser.cpp INCLUDE_DIRECTORIES ${CMAKE_SOURCE_DIR}/src/repparser - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/repparser/CMakeLists.txt b/tests/auto/repparser/CMakeLists.txt index de1830f..1344b21 100644 --- a/tests/auto/repparser/CMakeLists.txt +++ b/tests/auto/repparser/CMakeLists.txt @@ -8,8 +8,8 @@ qt_add_test(tst_parser SOURCES tst_parser.cpp INCLUDE_DIRECTORIES - ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/repparser # special case - LIBRARIES + ${CMAKE_SOURCE_DIR}/src/repparser + PUBLIC_LIBRARIES Qt::CorePrivate ) diff --git a/tools/repc/.prev_CMakeLists.txt b/tools/repc/.prev_CMakeLists.txt index 0a41246..7b87329 100644 --- a/tools/repc/.prev_CMakeLists.txt +++ b/tools/repc/.prev_CMakeLists.txt @@ -4,7 +4,9 @@ ## repc Tool: ##################################################################### -qt_add_tool(repc +qt_get_tool_target_name(target_name repc) +qt_add_tool(${target_name} + TARGET_DESCRIPTION "Qt Remote Objects Compiler" SOURCES cppcodegenerator.cpp cppcodegenerator.h main.cpp @@ -26,7 +28,7 @@ qt_add_tool(repc INCLUDE_DIRECTORIES ${CMAKE_SOURCE_DIR}/src/repparser moc_copy - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate ) @@ -44,7 +46,7 @@ qt_process_qlalr( ## Scopes: ##################################################################### -qt_extend_target(repc CONDITION MSVC +qt_extend_target(${target_name} CONDITION MSVC COMPILE_OPTIONS /wd4129 ) diff --git a/tools/repc/CMakeLists.txt b/tools/repc/CMakeLists.txt index bc34e22..d72f8c5 100644 --- a/tools/repc/CMakeLists.txt +++ b/tools/repc/CMakeLists.txt @@ -4,7 +4,9 @@ ## repc Tool: ##################################################################### -qt_add_tool(repc +qt_get_tool_target_name(target_name repc) +qt_add_tool(${target_name} + TARGET_DESCRIPTION "Qt Remote Objects Compiler" TOOLS_TARGET RemoteObjects # special case SOURCES cppcodegenerator.cpp cppcodegenerator.h @@ -27,7 +29,7 @@ qt_add_tool(repc INCLUDE_DIRECTORIES ${CMAKE_SOURCE_DIR}/src/repparser moc_copy - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate ) @@ -45,7 +47,7 @@ qt_process_qlalr( ## Scopes: ##################################################################### -qt_extend_target(repc CONDITION MSVC +qt_extend_target(${target_name} CONDITION MSVC COMPILE_OPTIONS /wd4129 ) |