Skip to content

Commit

Permalink
Move find_package() calls to root list file
Browse files Browse the repository at this point in the history
  • Loading branch information
PeterBowman committed Jun 22, 2018
1 parent 3b48e16 commit 27bba8a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 4 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ project(ROBOTICSLAB_TOOLS LANGUAGES CXX)
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)
# https://github.com/roboticslab-uc3m/questions-and-answers/issues/65
find_package(YARP 3.0 QUIET)
Expand All @@ -20,6 +20,9 @@ if(NOT YARP_FOUND)
endif()
find_package(COLOR_DEBUG REQUIRED)

# Soft dependencies.
find_package(GTestSources 1.6.0 QUIET)

# Retrieve current ROBOTICSLAB_TOOLS version.
include(ROBOTICSLAB_TOOLSVersion)

Expand Down
2 changes: 0 additions & 2 deletions tests/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# Testing things #########################################################################################

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()
Expand Down

0 comments on commit 27bba8a

Please sign in to comment.