Move find_package() calls to root list file

roboticslab-uc3m/questions-and-answers#54
roboticslab-uc3m · Jun 22, 2018 · b8cdb27 · b8cdb27
1 parent 0cb8060
commit b8cdb27
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -36,7 +36,7 @@ endif()
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake
                               ${CMAKE_SOURCE_DIR}/cmake/find-modules)
 
-# Find project's hard dependencies.
+# Hard dependencies.
 find_package(YCM 0.8 REQUIRED)
 find_package(YARP 3.0 QUIET)
 # https://github.com/roboticslab-uc3m/questions-and-answers/issues/65
@@ -45,6 +45,9 @@ if(NOT YARP_FOUND)
 endif()
 find_package(COLOR_DEBUG REQUIRED)
 
+# Soft dependencies.
+find_package(Espeak QUIET)
+
 # Always build YARP devices as MODULE libraries.
 set(YARP_FORCE_DYNAMIC_PLUGINS TRUE CACHE INTERNAL "Force dynamic plugins")
 

diff --git a/libraries/YarpPlugins/Espeak/CMakeLists.txt b/libraries/YarpPlugins/Espeak/CMakeLists.txt
@@ -2,8 +2,6 @@
 # Author: Juan G. Victores & Raul de Santos Rico
 # CopyPolicy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT
 
-find_package(Espeak QUIET)
-
 if(NOT Espeak_FOUND AND (NOT DEFINED ENABLE_Espeak OR ENABLE_Espeak))
     if(NOT Espeak_FOUND)
         message(WARNING "Espeak package not found, disabling Espeak device")