Merge pull request ros-industrial#9 from gavanderhoorn/master

Fix issue ros-industrial#7 ('non-homogeneous workspace' error)
OrebroUniversity · Jun 4, 2013 · d27d0ff · d27d0ff
2 parents fdb3a96 + 4a34702
commit d27d0ff
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/industrial_core/CMakeLists.txt b/industrial_core/CMakeLists.txt
@@ -1,4 +1,4 @@
 cmake_minimum_required(VERSION 2.8.3)
-project(PACKAGE_NAME)
+project(industrial_core)
 find_package(catkin REQUIRED)
 catkin_metapackage()
diff --git a/industrial_core/CMakeLists.txt~ b/industrial_core/CMakeLists.txt~