adapt for WITH_PLUGINS

roboticslab-uc3m · Mar 23, 2018 · 3ae0732 · 3ae0732
1 parent edee120
commit 3ae0732
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/libraries/YarpPlugins/CMakeLists.txt b/libraries/YarpPlugins/CMakeLists.txt
@@ -2,12 +2,7 @@
 # Authors: Juan G. Victores & Raul de Santos Rico
 # CopyPolicy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT
 
-# Find YARP (common dependency for all devices).
-find_package(YARP REQUIRED)
-
 if(YARP_VERSION_SHORT VERSION_LESS 2.3.70)
-    list(APPEND CMAKE_MODULE_PATH ${YARP_MODULE_PATH})
-    include(YarpPlugin)
     include_directories(${YARP_INCLUDE_DIRS})
 endif()
 

diff --git a/libraries/YarpPlugins/Espeak/CMakeLists.txt b/libraries/YarpPlugins/Espeak/CMakeLists.txt
@@ -43,12 +43,12 @@ if(NOT SKIP_Espeak)
 
     yarp_install(TARGETS Espeak
                  COMPONENT runtime
-                 LIBRARY DESTINATION ${YARP_DYNAMIC_PLUGINS_INSTALL_DIR}
-                 ARCHIVE DESTINATION ${YARP_STATIC_PLUGINS_INSTALL_DIR})
+                 LIBRARY DESTINATION ${ROBOTICSLAB-SPEECH_DYNAMIC_PLUGINS_INSTALL_DIR}
+                 ARCHIVE DESTINATION ${ROBOTICSLAB-SPEECH_STATIC_PLUGINS_INSTALL_DIR})
 
     yarp_install(FILES Espeak.ini
                  COMPONENT runtime
-                 DESTINATION ${YARP_PLUGIN_MANIFESTS_INSTALL_DIR})
+                 DESTINATION ${ROBOTICSLAB-SPEECH_PLUGIN_MANIFESTS_INSTALL_DIR})
 
     # Already included in /share?
     if(NOT DEFINED ROBOTICSLAB-SPEECH_DATA_INSTALL_DIR)