From 331b80a783a2e2573203c5b475cf891dfb971621 Mon Sep 17 00:00:00 2001
From: NAThompson <nathompson7@protonmail.com>
Date: Tue, 12 May 2020 16:02:16 -0400
Subject: [PATCH] More understandable VTKm options for symbol visibility.

---
 CMake/VTKmWrappers.cmake             | 2 +-
 CMake/testing/VTKmTestWrappers.cmake | 2 +-
 CMakeLists.txt                       | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CMake/VTKmWrappers.cmake b/CMake/VTKmWrappers.cmake
index 08c359053..7e1f1b728 100644
--- a/CMake/VTKmWrappers.cmake
+++ b/CMake/VTKmWrappers.cmake
@@ -378,7 +378,7 @@ function(vtkm_library)
                               EXTENDS_VTKM
                               DEVICE_SOURCES ${VTKm_LIB_DEVICE_SOURCES}
                               )
-  if(NOT VTKm_USE_DEFAULT_SYMBOL_VISIBILITY)
+  if(VTKm_HIDE_PRIVATE_SYMBOLS)
     set_property(TARGET ${lib_name} PROPERTY CUDA_VISIBILITY_PRESET "hidden")
     set_property(TARGET ${lib_name} PROPERTY CXX_VISIBILITY_PRESET "hidden")
   endif()
diff --git a/CMake/testing/VTKmTestWrappers.cmake b/CMake/testing/VTKmTestWrappers.cmake
index 5ea49b5b6..8ec6042f9 100644
--- a/CMake/testing/VTKmTestWrappers.cmake
+++ b/CMake/testing/VTKmTestWrappers.cmake
@@ -134,7 +134,7 @@ function(vtkm_unit_tests)
   endif()
   vtkm_add_target_information(${test_prog} DEVICE_SOURCES ${device_sources})
 
-  if(NOT VTKm_USE_DEFAULT_SYMBOL_VISIBILITY)
+  if(VTKm_HIDE_PRIVATE_SYMBOLS)
     set_property(TARGET ${test_prog} PROPERTY CUDA_VISIBILITY_PRESET "hidden")
     set_property(TARGET ${test_prog} PROPERTY CXX_VISIBILITY_PRESET "hidden")
   endif()
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 093c223a5..aa1b0aeaa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -118,7 +118,7 @@ vtkm_option(VTKm_INSTALL_ONLY_LIBRARIES "install only vtk-m libraries and no hea
 # rather than exporting all symbols. This flag is added so that consumers
 # which require static builds can force all symbols on, which is something
 # VTK does.
-vtkm_option(VTKm_USE_DEFAULT_SYMBOL_VISIBILITY "Don't explicitly hide symbols from libraries." OFF)
+vtkm_option(VTKm_HIDE_PRIVATE_SYMBOLS "Hide symbols from libraries." ON)
 
 vtkm_option(BUILD_SHARED_LIBS "Build VTK-m with shared libraries" OFF)
 set(VTKm_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
@@ -136,7 +136,7 @@ mark_as_advanced(
   VTKm_ENABLE_LOGGING
   VTKm_NO_ASSERT
   VTKm_INSTALL_ONLY_LIBRARIES
-  VTKm_USE_DEFAULT_SYMBOL_VISIBILITY
+  VTKm_HIDE_PRIVATE_SYMBOLS
   VTKm_ENABLE_DEVELOPER_FLAGS
   VTKm_NO_INSTALL_README_LICENSE
   )