summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-09-27 12:22:47 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-09-27 12:22:47 (GMT)
commite56eca3f6838d715fa10623a5ca538b3c9476493 (patch)
tree82a4b719736190137a15db1b989f9684ed72d83f /Modules
parent45fff9328d7b75366614be60ca3a7a52bc3aeed1 (diff)
parent33ec71f343f8b508b16437cc282607d77b996df1 (diff)
downloadCMake-e56eca3f6838d715fa10623a5ca538b3c9476493.zip
CMake-e56eca3f6838d715fa10623a5ca538b3c9476493.tar.gz
CMake-e56eca3f6838d715fa10623a5ca538b3c9476493.tar.bz2
Merge topic 'find-matlab-pthread'
33ec71f3 FindMatlab: Fix -pthread check for projects with only C enabled
Diffstat (limited to 'Modules')
-rw-r--r--Modules/FindMatlab.cmake7
1 files changed, 6 insertions, 1 deletions
diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake
index 8b41bb9..d016848 100644
--- a/Modules/FindMatlab.cmake
+++ b/Modules/FindMatlab.cmake
@@ -225,6 +225,7 @@ set(_FindMatlab_SELF_DIR "${CMAKE_CURRENT_LIST_DIR}")
include(FindPackageHandleStandardArgs)
include(CheckCXXCompilerFlag)
+include(CheckCCompilerFlag)
# The currently supported versions. Other version can be added by the user by
@@ -871,7 +872,11 @@ function(matlab_add_mex)
if(NOT WIN32)
# we do not need all this on Windows
# 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
# this compiler_flag function.
#check_cxx_compiler_flag(-Wl,--exclude-libs,ALL HAS_SYMBOL_HIDING_CAPABILITY)