diff --git a/CMakeLists.txt b/CMakeLists.txt index b47f6d68..adcb91aa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -99,6 +99,16 @@ if(YARP_VERSION_SHORT VERSION_LESS 2.3.70) include(YarpInstallationHelpers) endif() +# Find SDL and ZBar. +find_package(SDL2 REQUIRED) +find_package(SDL2_mixer REQUIRED) +find_package(SDL2_image REQUIRED) +find_package(SDL2_ttf REQUIRED) +find_package(ZBar REQUIRED) + +# Find googletest sources (for unit testing). +find_package(GTestSources 1.6.0 QUIET) + # Configure installation paths for YARP resources. yarp_configure_external_installation(rd) diff --git a/src/libraries/ImageLib/CMakeLists.txt b/src/libraries/ImageLib/CMakeLists.txt index 7fd3f47c..464dca47 100644 --- a/src/libraries/ImageLib/CMakeLists.txt +++ b/src/libraries/ImageLib/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(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 eba8532b..a07d6378 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 1971c502..0d46a20a 100644 --- a/src/libraries/MusicLib/CMakeLists.txt +++ b/src/libraries/MusicLib/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(SDL2 REQUIRED) -find_package(SDL2_mixer REQUIRED) - add_library(MusicLib AudioManager.hpp AudioManager.cpp MockAudioManager.hpp diff --git a/src/libraries/UserInterfaceLib/CMakeLists.txt b/src/libraries/UserInterfaceLib/CMakeLists.txt index fd3ebf52..f731d440 100644 --- a/src/libraries/UserInterfaceLib/CMakeLists.txt +++ b/src/libraries/UserInterfaceLib/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(UserInterfaceLib DeadScreen.hpp DeadScreen.cpp GameScreen.hpp diff --git a/src/libraries/UtilsLib/CMakeLists.txt b/src/libraries/UtilsLib/CMakeLists.txt index 20a9f349..3ed3e7d7 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 Hub.hpp Hub.cpp SDLUtils.hpp diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index feabbfcc..4bc37d0a 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,10 +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(SDL2 REQUIRED) -find_package(SDL2_image REQUIRED) -find_package(SDL2_ttf REQUIRED) - include_directories(${GTestSources_INCLUDE_DIR}) if(WIN32)