diff options
author | Eike Ziller <eike.ziller@qt.io> | 2019-05-24 12:31:19 +0200 |
---|---|---|
committer | MÃ¥rten Nordheim <marten.nordheim@qt.io> | 2019-05-24 13:15:19 +0000 |
commit | d492d14a920f20fe5296dcbab8dd0206e6d4cc92 (patch) | |
tree | b61086cd91f3b7a82c61a6ef89ae57daad1922f5 /src/tools | |
parent | 52d48c75ae6e00561fe128e5ba954817d73ca4d4 (diff) |
CMake build/macOS: Add iostool
Task-number: QTCREATORBUG-22475
Change-Id: Ifd9a9dc1483d223c446fd25a45e3cd1778bc94d1
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/tools')
-rw-r--r-- | src/tools/CMakeLists.txt | 6 | ||||
-rw-r--r-- | src/tools/iostool/CMakeLists.txt | 17 |
2 files changed, 19 insertions, 4 deletions
diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt index 0dacc5feff..031312ccbb 100644 --- a/src/tools/CMakeLists.txt +++ b/src/tools/CMakeLists.txt @@ -31,9 +31,9 @@ if (BUILD_CPLUSPLUS_TOOLS) add_qtc_cpp_tool(cplusplus-update-frontend PATH_CPP_FRONTEND=\"${CMAKE_CURRENT_SOURCE_DIR}/../../libs/3rdparty/cplusplus\" PATH_DUMPERS_FILE=\"${CMAKE_CURRENT_SOURCE_DIR}/../cplusplus-ast2png/dumpers.inc\") endif() -# if (APPLE) -# add_subdirectory(iostool) ## mac only -# endif() +if (APPLE) + add_subdirectory(iostool) +endif() add_subdirectory(qml2puppet) # add_subdirectory(qtcdebugger) ## windows only diff --git a/src/tools/iostool/CMakeLists.txt b/src/tools/iostool/CMakeLists.txt index 5c0721841a..3fd94ff774 100644 --- a/src/tools/iostool/CMakeLists.txt +++ b/src/tools/iostool/CMakeLists.txt @@ -1,7 +1,22 @@ add_qtc_executable(iostool - DEPENDS Qt5::Network Qt5::Widgets Qt5::Xml + DESTINATION ${IDE_LIBEXEC_PATH}/ios + DEPENDS + Qt5::Gui + Qt5::Xml + Qt5::Network + ${FWCoreFoundation} + ${FWCoreServices} + ${FWIOKit} + ${FWSecurity} + ${FWSystemConfiguration} SOURCES Info.plist main.cpp iosdevicemanager.cpp iosdevicemanager.h ) + +if (CMAKE_VERSION VERSION_LESS 3.13) + target_link_libraries(iostool "-Wl,-sectcreate,__TEXT,__info_plist,${CMAKE_CURRENT_SOURCE_DIR}/Info.plist") +else() + target_link_options(iostool PRIVATE "-Wl,-sectcreate,__TEXT,__info_plist,${CMAKE_CURRENT_SOURCE_DIR}/Info.plist") +endif() |