From 328a24edee3008a8d6bbbc7f57ac064bcd806d37 Mon Sep 17 00:00:00 2001 From: Oleksii Serdiuk Date: Sun, 7 Jul 2013 23:49:13 +0200 Subject: 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 --- src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp') 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 #include #include +#include #include #include @@ -179,7 +180,8 @@ QList 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) { -- cgit v1.2.1