kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'find-matlab-pthread' 

33ec71f3 FindMatlab: Fix -pthread check for projects with only C enabled
This commit is contained in:
Brad King 2016-09-27 08:22:47 -04:00 committed by CMake Topic Stage
parent 45fff9328d 33ec71f343
commit e56eca3f68
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Modules/FindMatlab.cmake
View File

@ -225,6 +225,7 @@ set(_FindMatlab_SELF_DIR "${CMAKE_CURRENT_LIST_DIR}")
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
include(CheckCXXCompilerFlag) include(CheckCXXCompilerFlag)
include(CheckCCompilerFlag)
# 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
@ -871,7 +872,11 @@ 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 # pthread options
check_cxx_compiler_flag(-pthread HAS_MINUS_PTHREAD) 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)