Skip to content

Commit

Permalink
Place YARP-related lines in root CMakeLists.txt
Browse files Browse the repository at this point in the history
  • Loading branch information
PeterBowman committed Jun 20, 2018
1 parent a5a3c56 commit 1c87d8e
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 12 deletions.
7 changes: 7 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,13 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake
set(YCM_TAG v0.2.2)
include(YCMBootstrap)

# Find YARP.
find_package(YARP REQUIRED)

list(APPEND CMAKE_MODULE_PATH ${YARP_MODULE_PATH})
include(YarpInstallationHelpers)
yarp_configure_external_installation(TEMPLATE_LOWER)

# Retrieve current TEMPLATE_NAME version.
include(TEMPLATE_NAMEVersion)

Expand Down
3 changes: 0 additions & 3 deletions libraries/ExampleLibrary/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ if(ENABLE_ExampleLibrary)

set(KEYWORD "ExampleLibrary")

# Find YARP.
find_package(YARP REQUIRED)

# Add current directory to global include paths, retrieve current values.
set_property(GLOBAL APPEND PROPERTY TEMPLATE_NAME_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}")
get_property(_common_dirs GLOBAL PROPERTY TEMPLATE_NAME_INCLUDE_DIRS)
Expand Down
3 changes: 0 additions & 3 deletions programs/exampleProgram/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ if(ENABLE_exampleProgram)

set(KEYWORD "exampleProgram")

# Find YARP.
find_package(YARP REQUIRED)

# Retrieve global include paths and libraries.
get_property(_common_dirs GLOBAL PROPERTY TEMPLATE_NAME_INCLUDE_DIRS)
get_property(_exported_targets GLOBAL PROPERTY TEMPLATE_NAME_TARGETS)
Expand Down
6 changes: 0 additions & 6 deletions share/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,5 @@
# Authors: TEMPLATE_AUTHOR
# CopyPolicy: Released under the terms of the TEMPLATE_LICENSE

find_package(YARP REQUIRED)
list(APPEND CMAKE_MODULE_PATH ${YARP_MODULE_PATH})
include(YarpInstallationHelpers)
yarp_configure_external_installation(TEMPLATE_LOWER)

### Go through single applications

#add_subdirectory(prog)

0 comments on commit 1c87d8e

Please sign in to comment.