Revision: 77655
http://sourceforge.net/p/brlcad/code/77655
Author: brlcad
Date: 2020-10-28 06:51:30 +0000 (Wed, 28 Oct 2020)
Log Message:
-----------
looking at other projects, more common convention seems to be to just set that
pthread flag is preferred. docs say this is recommended too.
Modified Paths:
--------------
brlcad/trunk/CMakeLists.txt
brlcad/trunk/src/other/gct/CMakeLists.txt
brlcad/trunk/src/other/gdal/CMakeLists.txt
Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt 2020-10-28 06:23:34 UTC (rev 77654)
+++ brlcad/trunk/CMakeLists.txt 2020-10-28 06:51:30 UTC (rev 77655)
@@ -2285,8 +2285,8 @@
# Post 3.1 CMake has switched to recommending using an imported target
# and setting a "prefer pthreads" flag - previously we were using the
# CMAKE_THREAD_LIBS_INIT variable
+set(THREADS_PREFER_PTHREAD_FLAG TRUE)
set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
-set(THREADS_PREFER_PTHREAD_FLAG TRUE)
find_package(Threads REQUIRED)
if(CMAKE_THREAD_LIBS_INIT)
message("Using threading library: ${CMAKE_THREAD_LIBS_INIT}")
Modified: brlcad/trunk/src/other/gct/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/gct/CMakeLists.txt 2020-10-28 06:23:34 UTC (rev
77654)
+++ brlcad/trunk/src/other/gct/CMakeLists.txt 2020-10-28 06:51:30 UTC (rev
77655)
@@ -27,9 +27,10 @@
CHECK_INCLUDE_FILE(pthread.h PROBE_PTHREAD_H_CLOCKID_T)
if (PROBE_PTHREAD_H_CLOCKID_T)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Dclockid_t=clock_t -pthread")
- set(THREADS_PREFER_PTHREAD_FLAG TRUE)
endif (PROBE_PTHREAD_H_CLOCKID_T)
endif (NOT PROBE_PTHREAD_H)
+
+set(THREADS_PREFER_PTHREAD_FLAG TRUE)
set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
find_package(Threads)
Modified: brlcad/trunk/src/other/gdal/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/gdal/CMakeLists.txt 2020-10-28 06:23:34 UTC (rev
77654)
+++ brlcad/trunk/src/other/gdal/CMakeLists.txt 2020-10-28 06:51:30 UTC (rev
77655)
@@ -234,11 +234,13 @@
if (PROBE_PTHREAD_H_CLOCKID_T)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Dclockid_t=clock_t -pthread")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Dclockid_t=clock_t -pthread")
- set(THREADS_PREFER_PTHREAD_FLAG TRUE)
endif (PROBE_PTHREAD_H_CLOCKID_T)
endif (NOT PROBE_PTHREAD_H)
+
+set(THREADS_PREFER_PTHREAD_FLAG TRUE)
set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
find_package(Threads)
+
if(CMAKE_USE_PTHREADS_INIT)
set(CPL_MULTIPROC_PTHREAD 1)
include(CheckSymbolExists)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
