From 45d01faad4124c910fe8edff2ce9edd88fbd8a9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20=C5=81ukawski?= Date: Tue, 4 Sep 2018 13:31:27 +0200 Subject: [PATCH] Move find_package() calls to root list file https://github.com/roboticslab-uc3m/questions-and-answers/issues/54 --- CMakeLists.txt | 12 ++++++++++-- src/libraries/ImageLib/CMakeLists.txt | 3 --- src/libraries/InputLib/CMakeLists.txt | 2 -- src/libraries/MusicLib/CMakeLists.txt | 4 ---- src/libraries/NetworkLib/CMakeLists.txt | 2 -- src/libraries/RobotLib/CMakeLists.txt | 2 -- src/libraries/ServerLib/CMakeLists.txt | 2 -- src/libraries/StateMachineLib/CMakeLists.txt | 2 -- src/libraries/UserInterfaceLib/CMakeLists.txt | 6 ------ src/libraries/UtilsLib/CMakeLists.txt | 4 ---- src/programs/rdServer/CMakeLists.txt | 3 --- src/programs/robotDevastation/CMakeLists.txt | 3 --- tests/CMakeLists.txt | 7 ------- 13 files changed, 10 insertions(+), 42 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 26e56334..409b62d9 100644 --- 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 index b8984a2a..a73d1b91 100644 --- 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 index 73d152f9..7071f2e0 100644 --- 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 index e5a0efb3..007cb918 100644 --- 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 index de0a0605..ec1146cf 100644 --- 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 index 96cfad4d..73a3bc8c 100644 --- 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 index a594fc4f..db50f549 100644 --- 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 index fe3acad1..0e57e980 100644 --- 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 index eccd247d..4a006820 100644 --- 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 index 7c799bb9..57cd3e51 100644 --- 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 index 4f48527b..dbc4e08f 100644 --- 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 index 6b6af451..ceda618c 100644 --- 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 index 501bfd20..a82c3f96 100644 --- 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)