diff options
| author | Kevin Funk <kevin.funk.ford@kdab.com> | 2017-04-11 09:37:39 +0200 |
|---|---|---|
| committer | Kevin Funk <kevin.funk@kdab.com> | 2017-04-11 11:50:44 +0000 |
| commit | 0eaa90b1245ba2932c895118418ff9dc4d8ab3c0 (patch) | |
| tree | d3212014414a753d0b66c0aa66f52494dbe169ae | |
| parent | 3ddf345c9625e8d284d84ab70bc7800df29deb2a (diff) | |
CMake: Rename files generated by qt5_generate_repc
Align the file names to the names used by the QMake build system. If
you're using a CMake-based build system you need to fix your #includes
of the repc-generated files now.
Changes based on a example:
test_replica.h -> rep_test_replica.h
test_source.h -> rep_test_source.h
Note this is a SIC change, but we should do this before the first
tech-preview of QtRemoteObjects.
Change-Id: I8a1a00b5e2b5ee2b125a75a2362bbb0874d8eeab
Task-number: QTBUG-60051
Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
Reviewed-by: Fabrice Salvaire <qt@fabrice-salvaire.fr>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| -rw-r--r-- | src/remoteobjects/Qt5RemoteObjectsMacros.cmake | 4 | ||||
| -rw-r--r-- | tests/auto/cmake/test_cmake_macros/main.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/remoteobjects/Qt5RemoteObjectsMacros.cmake b/src/remoteobjects/Qt5RemoteObjectsMacros.cmake index 4df6d6d..a9004c4 100644 --- a/src/remoteobjects/Qt5RemoteObjectsMacros.cmake +++ b/src/remoteobjects/Qt5RemoteObjectsMacros.cmake @@ -56,10 +56,10 @@ macro(qt5_generate_repc outfiles infile outputtype) get_filename_component(infile_name "${infile}" NAME) string(REPLACE ".rep" "" _infile_base ${infile_name}) if(${outputtype} STREQUAL "SOURCE") - set(_outfile_base "${_infile_base}_source") + set(_outfile_base "rep_${_infile_base}_source") set(_repc_args -o source) else() - set(_outfile_base "${_infile_base}_replica") + set(_outfile_base "rep_${_infile_base}_replica") set(_repc_args -o replica) endif() set(_outfile_header "${CMAKE_CURRENT_BINARY_DIR}/${_outfile_base}.h") diff --git a/tests/auto/cmake/test_cmake_macros/main.cpp b/tests/auto/cmake/test_cmake_macros/main.cpp index 9fed259..fae17c1 100644 --- a/tests/auto/cmake/test_cmake_macros/main.cpp +++ b/tests/auto/cmake/test_cmake_macros/main.cpp @@ -33,7 +33,7 @@ #include <QRemoteObjectNode> -#include "pod_replica.h" +#include "rep_pod_replica.h" int main(int argc, char **argv) { |