Merge topic 'correct_linking_when_logging_enabled'

171fdffd

 Make sure vtkm_cont links to vtkm_loguru when logging enabled
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1706

vtkm/CMakeLists.txt

@@ -71,11 +71,11 @@ vtkm_declare_headers(
 #-----------------------------------------------------------------------------
 #first add all the components vtkm that are shared between control and exec
 add_subdirectory(thirdparty/diy)
-add_subdirectory(thirdparty/optionparser)
-add_subdirectory(thirdparty/taotuple)
 if(VTKm_ENABLE_LOGGING)
   add_subdirectory(thirdparty/loguru)
 endif()
+add_subdirectory(thirdparty/optionparser)
+add_subdirectory(thirdparty/taotuple)
 add_subdirectory(testing)
 add_subdirectory(internal)
 

vtkm/cont/CMakeLists.txt

@@ -200,6 +200,9 @@ endif()
 
 target_link_libraries(vtkm_cont PUBLIC vtkm_compiler_flags ${backends})
 target_link_libraries(vtkm_cont PUBLIC vtkm_taotuple vtkm_optionparser vtkm_diy)
+if(TARGET vtkm_loguru)
+  target_link_libraries(vtkm_cont PRIVATE vtkm_loguru)
+endif()
 
 #-----------------------------------------------------------------------------
 add_subdirectory(testing)