Revision: 75632
http://sourceforge.net/p/brlcad/code/75632
Author: starseeker
Date: 2020-04-29 16:35:02 +0000 (Wed, 29 Apr 2020)
Log Message:
-----------
CMAKE_THREAD_LIBS_INIT isn't defined with Visual Studio, which turned off
threads for Tcl/Tk on Windows.
Modified Paths:
--------------
brlcad/trunk/CMakeLists.txt
brlcad/trunk/src/other/tcl/CMakeLists.txt
brlcad/trunk/src/other/tk/CMakeLists.txt
Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt 2020-04-29 16:13:38 UTC (rev 75631)
+++ brlcad/trunk/CMakeLists.txt 2020-04-29 16:35:02 UTC (rev 75632)
@@ -2359,7 +2359,7 @@
# Look for threads (doesn't check for headers)
# The variable CMAKE_THREAD_LIBS_INIT is the one of interest
# when writing target_link_libraries lists.
-find_package(Threads)
+find_package(Threads REQUIRED)
# Check for the C++ STL library - need to link it explicitly in
# some compilation situations
Modified: brlcad/trunk/src/other/tcl/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/tcl/CMakeLists.txt 2020-04-29 16:13:38 UTC (rev
75631)
+++ brlcad/trunk/src/other/tcl/CMakeLists.txt 2020-04-29 16:35:02 UTC (rev
75632)
@@ -181,14 +181,12 @@
endif (HAVE_PTHREAD_ATFORK)
endfunction(check_extra_pthread_funcs)
-find_package(Threads)
-if (NOT ${CMAKE_THREAD_LIBS_INIT} STREQUAL "")
- add_definitions(-DTCL_THREADS=1)
- add_definitions(-DUSE_THREAD_ALLOC=1)
- add_definitions(-D_REENTRANT=1)
- add_definitions(-D_THREAD_SAFE=1)
- check_extra_pthread_funcs()
-endif (NOT ${CMAKE_THREAD_LIBS_INIT} STREQUAL "")
+find_package(Threads REQUIRED)
+add_definitions(-DTCL_THREADS=1)
+add_definitions(-DUSE_THREAD_ALLOC=1)
+add_definitions(-D_REENTRANT=1)
+add_definitions(-D_THREAD_SAFE=1)
+check_extra_pthread_funcs()
#--------------------------------------------------------------------
# Header checks.
@@ -553,7 +551,7 @@
endif (HAVE_${UPPERFUNC})
endfunction(tcl_5_4_arg_functest)
-if (NOT ${CMAKE_THREAD_LIBS_INIT} STREQUAL "")
+if (NOT WIN32)
#------------------------------------------------------------------
# getpwuid_r
@@ -728,7 +726,7 @@
endif (${CMAKE_SYSTEM_MAJOR_VERSION} GREATER 5)
endif (${CMAKE_SYSTEM_NAME} MATCHES "^Darwin$")
-endif (NOT ${CMAKE_THREAD_LIBS_INIT} STREQUAL "")
+endif (NOT WIN32)
#--------------------------------------------------------------------
include("${CMAKE_CURRENT_SOURCE_DIR}/CMake/tcl.cmake")
Modified: brlcad/trunk/src/other/tk/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/tk/CMakeLists.txt 2020-04-29 16:13:38 UTC (rev
75631)
+++ brlcad/trunk/src/other/tk/CMakeLists.txt 2020-04-29 16:35:02 UTC (rev
75632)
@@ -134,10 +134,8 @@
#------------------------------------------------------------------------
# Threads support
#------------------------------------------------------------------------
-find_package(Threads)
-if (NOT ${CMAKE_THREAD_LIBS_INIT} STREQUAL "")
- add_definitions(-DTCL_THREADS=1)
-endif (NOT ${CMAKE_THREAD_LIBS_INIT} STREQUAL "")
+find_package(Threads REQUIRED)
+add_definitions(-DTCL_THREADS=1)
#-----------------------------------------------------------------------------
# Tcl/Tk's normal build system uses autotools macros, referred to as the
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
