Skip to content
Snippets Groups Projects
Commit 40d35cb6 authored by Mirko Wächter's avatar Mirko Wächter
Browse files

Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI

parents 2f76fb54 8381f6f1
No related branches found
No related tags found
No related merge requests found
......@@ -15,9 +15,9 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* @package
* @author
* @date
* @package
* @author
* @date
* @copyright http://www.gnu.org/licenses/gpl-2.0.txt
* GNU General Public License
*/
......@@ -382,7 +382,7 @@ namespace armarx
}
else
{
StringList includePaths;
Ice::StringSeq includePaths;
for (const std::string & projectName : packages)
{
if (projectName.empty())
......@@ -391,7 +391,7 @@ namespace armarx
}
CMakePackageFinder project(projectName);
StringList projectIncludePaths;
Ice::StringSeq projectIncludePaths;
auto pathsString = project.getDataDir();
ARMARX_DEBUG_S << "Data paths of ArmarX package " << projectName << ": " << pathsString;
boost::split(projectIncludePaths,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment