Move find_package() calls to root list file

roboticslab-uc3m/questions-and-answers#54
asrob-uc3m · Sep 4, 2018 · 45d01fa · 45d01fa
1 parent f372cd0
commit 45d01fa
Show file tree

Hide file tree

Showing 13 changed files with 10 additions and 42 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -40,6 +40,16 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake
 find_package(YCM REQUIRED)
 find_package(COLOR_DEBUG REQUIRED)
 find_package(ASROB_YARP_DEVICES REQUIRED)
+find_package(YARP REQUIRED)
+find_package(SDL2 REQUIRED)
+find_package(SDL2_image REQUIRED)
+find_package(SDL2_mixer REQUIRED)
+find_package(SDL2_ttf REQUIRED)
+find_package(ZBar REQUIRED)
+
+# Find project's soft dependencies.
+find_package(Doxygen QUIET)
+find_package(GTestSources 1.6.0 QUIET)
 
 # Standard installation directories.
 include(GNUInstallDirs)
@@ -70,8 +80,6 @@ add_subdirectory(src)
 add_subdirectory(tests)
 
 # Generate documentation.
-find_package(Doxygen QUIET)
-
 cmake_dependent_option(GENERATE_doc_html "Choose if you want to generate HTML documentation through Doxygen" OFF
                        DOXYGEN_FOUND OFF)
 

diff --git a/src/libraries/ImageLib/CMakeLists.txt b/src/libraries/ImageLib/CMakeLists.txt
@@ -2,9 +2,6 @@
 # CopyPolicy: released under the terms of the LGPLv2.1, see LICENSE at project root.
 # URL: https://github.com/asrob-uc3m/robotDevastation
 
-find_package(YARP REQUIRED)
-find_package(ZBar REQUIRED)
-
 add_library(ImageLib ImageEventListener.hpp
                      ImageManager.hpp
                      ImageManager.cpp

diff --git a/src/libraries/InputLib/CMakeLists.txt b/src/libraries/InputLib/CMakeLists.txt
@@ -2,8 +2,6 @@
 # CopyPolicy: released under the terms of the LGPLv2.1, see LICENSE at project root.
 # URL: https://github.com/asrob-uc3m/robotDevastation
 
-find_package(SDL2 REQUIRED)
-
 add_library(InputLib InputEventListener.hpp
                      InputManager.hpp
                      InputManager.cpp

diff --git a/src/libraries/MusicLib/CMakeLists.txt b/src/libraries/MusicLib/CMakeLists.txt
@@ -2,10 +2,6 @@
 # CopyPolicy: released under the terms of the LGPLv2.1, see LICENSE at project root.
 # URL: https://github.com/asrob-uc3m/robotDevastation
 
-find_package(YARP REQUIRED)
-find_package(SDL2 REQUIRED)
-find_package(SDL2_mixer REQUIRED)
-
 add_library(MusicLib AudioManager.hpp
                      AudioManager.cpp
                      MockAudioManager.hpp

diff --git a/src/libraries/NetworkLib/CMakeLists.txt b/src/libraries/NetworkLib/CMakeLists.txt
@@ -2,8 +2,6 @@
 # CopyPolicy: released under the terms of the LGPLv2.1, see LICENSE at project root.
 # URL: https://github.com/asrob-uc3m/robotDevastation
 
-find_package(YARP REQUIRED)
-
 add_library(NetworkLib MockNetworkEventListener.hpp
                        MockNetworkEventListener.cpp
                        MockNetworkManager.hpp

diff --git a/src/libraries/RobotLib/CMakeLists.txt b/src/libraries/RobotLib/CMakeLists.txt
@@ -2,8 +2,6 @@
 # CopyPolicy: released under the terms of the LGPLv2.1, see LICENSE at project root.
 # URL: https://github.com/asrob-uc3m/robotDevastation
 
-find_package(YARP REQUIRED)
-
 add_library(RobotLib MockRobotManager.cpp
                      MockRobotManager.hpp)
 

diff --git a/src/libraries/ServerLib/CMakeLists.txt b/src/libraries/ServerLib/CMakeLists.txt
@@ -2,8 +2,6 @@
 # CopyPolicy: released under the terms of the LGPLv2.1, see LICENSE at project root.
 # URL: https://github.com/asrob-uc3m/robotDevastation
 
-find_package(YARP REQUIRED)
-
 add_library(ServerLib RpcResponder.hpp
                       RpcResponder.cpp
                       Server.hpp

diff --git a/src/libraries/StateMachineLib/CMakeLists.txt b/src/libraries/StateMachineLib/CMakeLists.txt
@@ -2,8 +2,6 @@
 # CopyPolicy: released under the terms of the LGPLv2.1, see LICENSE at project root.
 # URL: https://github.com/asrob-uc3m/robotDevastation
 
-find_package(YARP REQUIRED)
-
 add_library(StateMachineLib MockState.hpp
                             MockState.cpp
                             State.hpp

diff --git a/src/libraries/UserInterfaceLib/CMakeLists.txt b/src/libraries/UserInterfaceLib/CMakeLists.txt
@@ -2,12 +2,6 @@
 # CopyPolicy: released under the terms of the LGPLv2.1, see LICENSE at project root.
 # URL: https://github.com/asrob-uc3m/robotDevastation
 
-find_package(YARP REQUIRED)
-
-find_package(SDL2 REQUIRED)
-find_package(SDL2_image REQUIRED)
-find_package(SDL2_ttf REQUIRED)
-
 add_library(UserInterfaceLib DeadScreen.hpp
                              DeadScreen.cpp
                              GameScreen.hpp

diff --git a/src/libraries/UtilsLib/CMakeLists.txt b/src/libraries/UtilsLib/CMakeLists.txt
@@ -2,10 +2,6 @@
 # CopyPolicy: released under the terms of the LGPLv2.1, see LICENSE at project root.
 # URL: https://github.com/asrob-uc3m/robotDevastation
 
-find_package(SDL2 REQUIRED)
-find_package(SDL2_image REQUIRED)
-find_package(SDL2_ttf REQUIRED)
-
 add_library(UtilsLib ManagerHub.hpp
                      ManagerHub.cpp
                      SDLUtils.hpp

diff --git a/src/programs/rdServer/CMakeLists.txt b/src/programs/rdServer/CMakeLists.txt
@@ -6,9 +6,6 @@ option(ENABLE_rdServer "Choose if you want to compile rdServer" ON)
 
 if(ENABLE_rdServer)
 
-# Find YARP.  Point the YARP_DIR environment variable at your build.
-find_package(YARP REQUIRED)
-
 # Set up our main executable.
 add_executable(rdServer main.cpp)
 

diff --git a/src/programs/robotDevastation/CMakeLists.txt b/src/programs/robotDevastation/CMakeLists.txt
@@ -6,9 +6,6 @@ option(ENABLE_robotDevastation "Choose if you want to compile robotDevastation"
 
 if(ENABLE_robotDevastation)
 
-# Find YARP.  Point the YARP_DIR environment variable at your build.
-find_package(YARP REQUIRED)
-
 add_executable(robotDevastation main.cpp
                                 RobotDevastation.hpp
                                 RobotDevastation.cpp)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -2,8 +2,6 @@
 # CopyPolicy: released under the terms of the LGPLv2.1, see LICENSE at project root.
 # URL: https://github.com/asrob-uc3m/robotDevastation
 
-find_package(GTestSources 1.6.0 QUIET)
-
 if(NOT GTestSources_FOUND AND (NOT DEFINED ENABLE_tests OR ENABLE_tests))
     message(WARNING "GTestSources package not found, disabling tests")
 endif()
@@ -16,11 +14,6 @@ if(ENABLE_tests)
 set(gtest_force_shared_crt ON CACHE INTERNAL "") # needed for Windows
 add_subdirectory(${GTestSources_SOURCE_DIR} ${CMAKE_BINARY_DIR}/gtest)
 
-find_package(YARP REQUIRED)
-find_package(SDL2 REQUIRED)
-find_package(SDL2_image REQUIRED)
-find_package(SDL2_ttf REQUIRED)
-
 include_directories(${GTestSources_INCLUDE_DIR})
 
 if(WIN32)