[Issue JdeRobot#485] Refactor easyiceconfig C++ to use CMAKE_INSTALL_…

…PREFIX
lr-morales · Jul 30, 2016 · e91d454 · e91d454
1 parent 38fabf0
commit e91d454
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 14 deletions.
diff --git a/src/libs/easyiceconfig_cpp/CMakeLists.txt b/src/libs/easyiceconfig_cpp/CMakeLists.txt
@@ -11,12 +11,20 @@ list(APPEND Ice_LIBRARIES Ice IceUtil)
 
 
 ### Project config
-include_directories(include)
+include_directories(
+    include
+    ${CMAKE_CURRENT_BINARY_DIR}/include
+)
+
+configure_file(
+    include/easyiceconfig/hardcodedlocations.h.in
+    include/easyiceconfig/hardcodedlocations.h
+    @ONLY
+)
 
 set(HEADERS
     include/easyiceconfig/EasyIce.h
-    include/easyiceconfig/hardcoredlocations.h
-
+    ${CMAKE_CURRENT_BINARY_DIR}/include/easyiceconfig/hardcodedlocations.h
     include/easyiceconfig/loader.hpp
     include/easyiceconfig/initializer.hpp
     include/easyiceconfig/injector.hpp

diff --git a/...nclude/easyiceconfig/hardcoredlocations.h → ...ude/easyiceconfig/hardcodedlocations.h.in b/...nclude/easyiceconfig/hardcoredlocations.h → ...ude/easyiceconfig/hardcodedlocations.h.in
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 1997-2015 JDE Developers Team
+ *  Copyright (C) 1997-2016 JDE Developers Team
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -14,22 +14,22 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see http://www.gnu.org/licenses/.
  *  Authors :
- *       Victor Arribas Raigadas <.varribas.urjc@gmail.com>
+ *       Victor Arribas Raigadas <varribas.urjc@gmail.com>
  */
 
 
 #ifndef HARDCOREDLOCATIONS_H
 #define HARDCOREDLOCATIONS_H
 
 const char* HARDCORED_LOCATIONS =
-"/usr/local/share/jderobot/conf\
-:/usr/local/share/jderobot/gazebo/plugins/car\
-:/usr/local/share/jderobot/gazebo/plugins/flyingKinect\
-:/usr/local/share/jderobot/gazebo/plugins/kinect\
-:/usr/local/share/jderobot/gazebo/plugins/nao\
-:/usr/local/share/jderobot/gazebo/plugins/pioneer\
-:/usr/local/share/jderobot/gazebo/plugins/quadrotor\
-:/usr/local/share/jderobot/gazebo/plugins/turtlebot\
+"@CMAKE_INSTALL_PREFIX@/share/jderobot/conf\
+:@CMAKE_INSTALL_PREFIX@/share/jderobot/gazebo/plugins/car\
+:@CMAKE_INSTALL_PREFIX@/share/jderobot/gazebo/plugins/flyingKinect\
+:@CMAKE_INSTALL_PREFIX@/share/jderobot/gazebo/plugins/kinect\
+:@CMAKE_INSTALL_PREFIX@/share/jderobot/gazebo/plugins/nao\
+:@CMAKE_INSTALL_PREFIX@/share/jderobot/gazebo/plugins/pioneer\
+:@CMAKE_INSTALL_PREFIX@/share/jderobot/gazebo/plugins/quadrotor\
+:@CMAKE_INSTALL_PREFIX@/share/jderobot/gazebo/plugins/turtlebot\
 ";
 
 

diff --git a/src/libs/easyiceconfig_cpp/src/loader.cpp b/src/libs/easyiceconfig_cpp/src/loader.cpp
@@ -19,7 +19,7 @@
 
 
 #include "easyiceconfig/loader.hpp"
-#include "easyiceconfig/hardcoredlocations.h"
+#include "easyiceconfig/hardcodedlocations.h"
 
 namespace easyiceconfig{
 namespace loader{