Merge branch 'proj4-pthreads' into release

Change-Id: I6a4fef51ca87fa256fc33ef6919b9bea4dbc3e9b

ThirdParty/libproj4/vtklibproj4/CMakeLists.txt

@@ -19,7 +19,7 @@ if ( PROJ_LIST_EXTERNAL AND BUILD_SHARED_LIBS )
 endif ( PROJ_LIST_EXTERNAL AND BUILD_SHARED_LIBS )
 
 # Make libproj4 thread-safe?
-option( PROJ_USE_PTHREADS "Should libproj4 be built as a thread-friendly library?" OFF )
+option( PROJ_USE_PTHREADS "Should libproj4 be built as a thread-friendly library?" ${VTK_USE_PTHREADS} )
 mark_as_advanced( PROJ_USE_PTHREADS )
 if ( PROJ_USE_PTHREADS )
   if ( NOT VTK_USE_PTHREADS )