find_program, link to fs

Signed-off-by: Louise Poubel <louise@openrobotics.org>

Author: chapulina

CMakeLists.txt

@@ -16,6 +16,12 @@ find_package(ignition-cmake2 2.8.0 REQUIRED)
 #============================================================================
 ign_configure_project()
 
+if (UNIX AND NOT APPLE)
+  set (EXTRA_TEST_LIB_DEPS stdc++fs)
+else()
+  set (EXTRA_TEST_LIB_DEPS)
+endif()
+
 #============================================================================
 # Set project-specific options
 #============================================================================
@@ -69,11 +75,11 @@ ign_find_package(ignition-math6 REQUIRED)
 set(IGN_MATH_VER ${ignition-math6_VERSION_MAJOR})
 
 #--------------------------------------
-# Find if ign command is available
+# Find if command is available. This is used to enable tests.
+# Note that CLI files are installed regardless of whether the dependency is
+# available during build time
 find_program(HAVE_IGN_TOOLS ign)
-if (HAVE_IGN_TOOLS)
-  set(IGN_TOOLS_VER 1)
-endif()
+set(IGN_TOOLS_VER 1)
 
 #--------------------------------------
 # Find Tinyxml2

src/cmd/CMakeLists.txt

@@ -51,10 +51,8 @@ install(FILES ${cmd_script_generated} DESTINATION lib/ruby/ignition)
 configure_file(
   "msgs.bash_completion.sh"
     "${CMAKE_CURRENT_BINARY_DIR}/msgs${PROJECT_VERSION_MAJOR}.bash_completion.sh" @ONLY)
-if (HAVE_IGN_TOOLS)
-  install(
-    FILES
-      ${CMAKE_CURRENT_BINARY_DIR}/msgs${PROJECT_VERSION_MAJOR}.bash_completion.sh
-    DESTINATION
-      ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/gz/gz${IGN_TOOLS_VER}.completion.d)
-endif()
+install(
+  FILES
+    ${CMAKE_CURRENT_BINARY_DIR}/msgs${PROJECT_VERSION_MAJOR}.bash_completion.sh
+  DESTINATION
+    ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/gz/gz${IGN_TOOLS_VER}.completion.d)

tools/CMakeLists.txt

@@ -12,7 +12,10 @@ if (MSVC)
   list(REMOVE_ITEM test_sources ign_TEST.cc)
 endif()
 
-
 if (HAVE_IGN_TOOLS)
-  ign_build_tests(TYPE UNIT SOURCES ${test_sources})
+  ign_build_tests(
+    TYPE UNIT
+    SOURCES ${test_sources}
+    LIB_DEPS
+      ${EXTRA_TEST_LIB_DEPS})
 endif ()