diff options
| author | Brett Stottlemyer <bstottle@ford.com> | 2020-06-16 07:59:48 -0400 |
|---|---|---|
| committer | Brett Stottlemyer <bstottle@ford.com> | 2020-06-29 10:48:37 -0400 |
| commit | cf3573d3d6e4153f8639ac59da71e03bfb19bc23 (patch) | |
| tree | 6f1ded97b1f21ae509deb705f1c4d56da2f09545 /tools | |
| parent | 40481e5600f3a3866f7b8b19f48a8e5954fbcb70 (diff) | |
Update via run_pro2cmake.py
... and address special cases
Change-Id: I2ceb88e9505c59fe48dd4612cfed82935eb2dfc4
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/repc/.prev_CMakeLists.txt | 8 | ||||
| -rw-r--r-- | tools/repc/CMakeLists.txt | 8 |
2 files changed, 10 insertions, 6 deletions
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 ) |