Merge topic 'proj-freebsd-fix' into release

956e725e Merge branch 'upstream-libproj' into HEAD
5222651e libproj-release 2019-03-20 (00566600)
ad60e2df libproj: update for freebsd fix

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5326

ThirdParty/libproj/update.sh

@@ -8,7 +8,7 @@ readonly name="libproj"
 readonly ownership="Proj Upstream <kwrobot@kitware.com>"
 readonly subtree="ThirdParty/$name/vtk$name"
 readonly repo="https://gitlab.kitware.com/third-party/proj.git"
-readonly tag="for/vtk-old"
+readonly tag="for/vtk-old-20190320-4.9.3"
 readonly paths="
 .gitattributes
 ChangeLog

ThirdParty/libproj/vtklibproj/CMakeLists.txt

@@ -68,11 +68,21 @@ endif(SELFTEST)
 set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
 find_package (Threads)
 
-include(CheckSymbolExists)
-CHECK_SYMBOL_EXISTS(PTHREAD_MUTEX_RECURSIVE pthread.h HAVE_PTHREAD_MUTEX_RECURSIVE_DEFN)
-if (HAVE_PTHREAD_MUTEX_RECURSIVE_DEFN)
+if (Threads_FOUND AND CMAKE_USE_PTHREADS_INIT)
+  set (CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}")
+  check_c_source_compiles("
+#include <pthread.h>
+
+int main(int argc, char* argv[]) {
+  (void)PTHREAD_MUTEX_RECURSIVE;
+  (void)argv;
+  return argc;
+}
+  " HAVE_PTHREAD_MUTEX_RECURSIVE_DEFN)
+  if (HAVE_PTHREAD_MUTEX_RECURSIVE_DEFN)
     add_definitions(-DHAVE_PTHREAD_MUTEX_RECURSIVE=1)
-endif()
+  endif()
+endif ()
 
 boost_report_value(PROJ_PLATFORM_NAME)
 boost_report_value(PROJ_COMPILER_NAME)