Skip to content

Commit

Permalink
Merge branch 'yarp-3.8'
Browse files Browse the repository at this point in the history
  • Loading branch information
robotology-bot committed Mar 7, 2023
2 parents 3c57f56 + 282a223 commit 51292e3
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 2 deletions.
4 changes: 4 additions & 0 deletions src/libYARP_cv/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,7 @@ yarp_install_basic_package_files(YARP_cv
DEPENDENCIES ${YARP_cv_PUBLIC_DEPS}
PRIVATE_DEPENDENCIES ${YARP_cv_PRIVATE_DEPS}
)

if(YARP_COMPILE_TESTS)
add_subdirectory(tests)
endif()
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# SPDX-FileCopyrightText: 2023-2023 Istituto Italiano di Tecnologia (IIT)
# SPDX-License-Identifier: BSD-3-Clause

include(YarpCatchUtils)

add_executable(harness_libyarpcv)
target_sources(harness_libyarpcv
PRIVATE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
#include <yarp/cv/Cv.h>
#include <catch2/catch_amalgamated.hpp>
#include <harness.h>
#include <YarpBuildLocation.h>

using namespace yarp::cv;
using namespace yarp::os;
Expand Down
1 change: 0 additions & 1 deletion tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ add_subdirectory(libYARP_os/impl)
add_subdirectory(libYARP_sig)
add_subdirectory(libYARP_rosmsg)
add_subdirectory(libYARP_dev)
add_subdirectory(libYARP_cv)
add_subdirectory(libYARP_serversql)
add_subdirectory(libYARP_run)
add_subdirectory(libYARP_math)
Expand Down

0 comments on commit 51292e3

Please sign in to comment.