dilim/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-08-04 14:50:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

FindMatlab: Use find_package(Threads) instead of checking -pthread

Browse Source
This commit is contained in:
Hermann von Kleist
2024-02-02 17:23:50 +01:00
parent ce426e2a45
commit 91c672e5ae
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Modules/FindMatlab.cmake
View File

@@ -287,9 +287,12 @@ cmake_policy(SET CMP0057 NEW) # if IN_LIST
set(_FindMatlab_SELF_DIR "${CMAKE_CURRENT_LIST_DIR}") set(_FindMatlab_SELF_DIR "${CMAKE_CURRENT_LIST_DIR}")
include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
include(CheckCXXCompilerFlag)
include(CheckCCompilerFlag)
if(NOT WIN32 AND NOT APPLE AND NOT Threads_FOUND)
# MEX files use pthread if available
set(THREADS_PREFER_PTHREAD_FLAG ON)
find_package(Threads)
endif()
# The currently supported versions. Other version can be added by the user by # The currently supported versions. Other version can be added by the user by
# providing MATLAB_ADDITIONAL_VERSIONS # providing MATLAB_ADDITIONAL_VERSIONS
@@ -1046,12 +1049,6 @@ function(matlab_add_mex)
if(NOT WIN32) if(NOT WIN32)
# we do not need all this on Windows # we do not need all this on Windows
# pthread options
if(CMAKE_CXX_COMPILER_LOADED)
check_cxx_compiler_flag(-pthread HAS_MINUS_PTHREAD)
elseif(CMAKE_C_COMPILER_LOADED)
check_c_compiler_flag(-pthread HAS_MINUS_PTHREAD)
endif()
# we should use try_compile instead, the link flags are discarded from # we should use try_compile instead, the link flags are discarded from
# this compiler_flag function. # this compiler_flag function.
#check_cxx_compiler_flag(-Wl,--exclude-libs,ALL HAS_SYMBOL_HIDING_CAPABILITY) #check_cxx_compiler_flag(-Wl,--exclude-libs,ALL HAS_SYMBOL_HIDING_CAPABILITY)
@@ -1225,10 +1222,8 @@ function(matlab_add_mex)
else() # Linux else() # Linux
if(HAS_MINUS_PTHREAD) if(Threads_FOUND)
# Apparently, compiling with -pthread generated the proper link flags target_link_libraries(${${prefix}_NAME} Threads::Threads)
# and some defines at compilation
target_compile_options(${${prefix}_NAME} PRIVATE "-pthread")
endif() endif()
string(APPEND _link_flags " -Wl,--as-needed") string(APPEND _link_flags " -Wl,--as-needed")