Changeset View
Changeset View
Standalone View
Standalone View
plugins/cmake/cmakecommitchangesjob.cpp
Show First 20 Lines • Show All 156 Lines • ▼ Show 20 Line(s) | 153 | foreach(const Subdirectory& subf, data.subdirectories) { | |||
---|---|---|---|---|---|
157 | m_subdirectories += subf; | 157 | m_subdirectories += subf; | ||
158 | 158 | | |||
159 | ret += Path(m_path, subf.name); | 159 | ret += Path(m_path, subf.name); | ||
160 | } | 160 | } | ||
161 | 161 | | |||
162 | QString dir = m_path.toLocalFile(); | 162 | QString dir = m_path.toLocalFile(); | ||
163 | if(data.vm.value("CMAKE_INCLUDE_CURRENT_DIR")==QStringList("ON")) { | 163 | if(data.vm.value("CMAKE_INCLUDE_CURRENT_DIR")==QStringList("ON")) { | ||
164 | m_directories += dir; | 164 | m_directories += dir; | ||
165 | m_directories += CMakeParserUtils::binaryPath(dir, m_project->path().toLocalFile(), CMake::currentBuildDir(m_project).toLocalFile(QUrl::RemoveTrailingSlash)); | 165 | m_directories += CMakeParserUtils::binaryPath(dir, m_project->path().toLocalFile(), CMake::currentBuildDir(m_project, true).toLocalFile(QUrl::RemoveTrailingSlash)); | ||
166 | } | 166 | } | ||
167 | m_directories += resolvePaths(m_path, data.properties[DirectoryProperty][dir]["INCLUDE_DIRECTORIES"]); | 167 | m_directories += resolvePaths(m_path, data.properties[DirectoryProperty][dir]["INCLUDE_DIRECTORIES"]); | ||
168 | m_directories.removeAll(QString()); | 168 | m_directories.removeAll(QString()); | ||
169 | 169 | | |||
170 | m_definitions.unite(data.definitions); | 170 | m_definitions.unite(data.definitions); | ||
171 | CMakeParserUtils::addDefinitions(data.properties[DirectoryProperty][dir]["COMPILE_DEFINITIONS"], &m_definitions); | 171 | CMakeParserUtils::addDefinitions(data.properties[DirectoryProperty][dir]["COMPILE_DEFINITIONS"], &m_definitions); | ||
172 | CMakeParserUtils::addDefinitions(data.vm["CMAKE_CXX_FLAGS"], &m_definitions, true); | 172 | CMakeParserUtils::addDefinitions(data.vm["CMAKE_CXX_FLAGS"], &m_definitions, true); | ||
173 | 173 | | |||
▲ Show 20 Lines • Show All 262 Lines • Show Last 20 Lines |