Merge branch 'master' into show_and_edit_dipoles

Author: tpat

.travis.yml

@@ -17,18 +17,6 @@ matrix:
       sudo: required
       compiler: clang
       env: PYTHON_VERSION=3.5.6 OSPRAY_BUILD=OFF
-    - os: osx
-      osx_image: xcode7.2
-      env: PYTHON_VERSION=3.4.3 OSPRAY_BUILD=OFF
-    - os: osx
-      osx_image: xcode8.3
-      env: PYTHON_VERSION=3.4.3 OSPRAY_BUILD=OFF
-    - os: osx
-      osx_image: xcode9.3
-      env: PYTHON_VERSION=3.4.3 OSPRAY_BUILD=OFF
-    - os: osx
-      osx_image: xcode10.1
-      env: PYTHON_VERSION=3.4.3 OSPRAY_BUILD=OFF
     - os: osx
       osx_image: xcode7.2
       env: PYTHON_VERSION=3.5.6 OSPRAY_BUILD=OFF
@@ -44,12 +32,6 @@ matrix:
     - os: osx
       osx_image: xcode7.2
       env: PYTHON_VERSION=3.6.7 OSPRAY_BUILD=OFF
-    - os: osx
-      osx_image: xcode8.3
-      env: PYTHON_VERSION=3.6.7 OSPRAY_BUILD=OFF
-    - os: osx
-      osx_image: xcode9.3
-      env: PYTHON_VERSION=3.6.7 OSPRAY_BUILD=OFF
     - os: osx
       osx_image: xcode10.1
       env: PYTHON_VERSION=3.6.7 OSPRAY_BUILD=OFF

src/CMakeLists.txt

@@ -207,6 +207,18 @@ IF(BUILD_TESTING)
   ADD_DEFINITIONS(-DTEST_RESOURCE_ROOT_DIR="${SCIRUN_TEST_RESOURCE_DIR}" -DBUILD_TESTING)
 ENDIF()
 
+#########################################################################
+# Configure Spdlog
+set (cxxfeaturelist ${CMAKE_CXX_COMPILE_FEATURES})
+
+list (FIND cxxfeaturelist "cxx_thread_local" _index)
+if (${_index} GREATER -1)
+  message("Found cxx_thread_local")
+else()
+  message(WARNING "Did NOT find cxx_thread_local--turning off feature of spdlog")
+  add_definitions(-DDISABLE_SPDLOG_TLS=1)
+endif()
+
 #########################################################################
 # External projects
 

src/Core/Algorithms/Legacy/Fields/CMakeLists.txt

@@ -47,7 +47,7 @@ SET(Core_Algorithms_Legacy_Fields_HEADERS
   FieldData/SetFieldData.h
   FieldData/SetFieldDataToConstantValue.h
   FieldData/SwapFieldDataWithMatrixEntriesAlgo.h
-  #FieldData/SmoothVecFieldMedian.h
+  FieldData/SmoothVecFieldMedianAlgo.h
   Mapping/BuildMappingMatrixAlgo.h
   DomainFields/GetDomainBoundaryAlgo.h
   MeshDerivatives/GetFieldBoundaryAlgo.h
@@ -149,7 +149,7 @@ SET(Core_Algorithms_Legacy_Fields_SRCS
   #FieldData/ConvertMappingMatrixToFieldData.cc
   FieldData/SetFieldData.cc
   FieldData/SetFieldDataToConstantValue.cc
-  #FieldData/SmoothVecFieldMedian.cc
+  FieldData/SmoothVecFieldMedianAlgo.cc
   #FilterFieldData/DilateFieldData.cc
   #FilterFieldData/ErodeFieldData.cc
   #FilterFieldData/TriSurfPhaseFilter.cc