diff options
| author | Oleksii Serdiuk <contacts@oleksii.name> | 2013-07-07 23:49:13 +0200 |
|---|---|---|
| committer | Oleksii Serdiuk <contacts@oleksii.name> | 2013-09-16 13:30:54 +0200 |
| commit | 328a24edee3008a8d6bbbc7f57ac064bcd806d37 (patch) | |
| tree | c899f97a60503e03cf42d06fd414274dbbc5f0da /src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp | |
| parent | 0392435ddb915cc84048dd999e8c82d1ce6fb186 (diff) | |
| download | qt-creator-328a24edee3008a8d6bbbc7f57ac064bcd806d37.tar.gz | |
CMake: Make CMake plugin work with RemoteLinux plugin.
Modified CMake plugin to work correctly with RemoteLinux plugin.
Because of not being able to extract files to be installed from CMake
project, only executable targets are automatically added to deployment
files. All other files have to be specified in CMakeDeployment.txt file
which should be placed into root of CMake project. The file format is:
> deployment/prefix
> relative/source/file1:relative/destination/dir1
> ...
> relative/source/filen:relative/destination/dirn
Where:
- deployment/prefix is (absolute) path prefix to which files will be
deployed on the remote machine.
- relative/source/file is file path relative to CMake project root.
Plain files - no directories or wildcards supported.
- relative/destination/dir is destination directory path relative to
deployment/prefix.
Change-Id: I0831636c1b9aac3ff16bb6293104c512d2abfb5a
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Diffstat (limited to 'src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp')
| -rw-r--r-- | src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp index bbc937d226..790ba14cb4 100644 --- a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp @@ -42,6 +42,7 @@ #include <projectexplorer/abi.h> #include <projectexplorer/projectexplorerconstants.h> #include <texteditor/fontsettings.h> +#include <remotelinux/remotelinux_constants.h> #include <QVBoxLayout> #include <QFormLayout> @@ -179,7 +180,8 @@ QList<GeneratorInfo> GeneratorInfo::generatorInfosFor(ProjectExplorer::Kit *k, N if (!tc) return results; Core::Id deviceType = ProjectExplorer::DeviceTypeKitInformation::deviceTypeId(k); - if (deviceType != ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE) + if (deviceType != ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE + && deviceType != RemoteLinux::Constants::GenericLinuxOsType) return results; ProjectExplorer::Abi targetAbi = tc->targetAbi(); if (n != ForceNinja) { |