Skip to content

Commit

Permalink
Detect ign instead of using cmake module to check for ignition-tools (#…
Browse files Browse the repository at this point in the history
…166)

Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
  • Loading branch information
j-rivero authored Jul 20, 2021
1 parent c7b6478 commit e32a8bc
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
5 changes: 2 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,8 @@ ign_find_package(ignition-math6 REQUIRED)
set(IGN_MATH_VER ${ignition-math6_VERSION_MAJOR})

#--------------------------------------
# Find ignition-tools
ign_find_package(ignition-tools
QUIET)
# Find if ign command is available
find_program(HAVE_IGN_TOOLS ign)

#--------------------------------------
# Find Tinyxml2
Expand Down
3 changes: 2 additions & 1 deletion tools/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ if (MSVC)
list(REMOVE_ITEM test_sources ign_TEST.cc)
endif()

if (IGNITION-TOOLS_BINARY_DIRS)

if (HAVE_IGN_TOOLS)
ign_build_tests(TYPE UNIT SOURCES ${test_sources})
endif ()

0 comments on commit e32a8bc

Please sign in to comment.