diff options
| author | Janne Blomqvist <janne.blomqvist@aalto.fi> | 2017-09-13 17:43:12 +0300 |
|---|---|---|
| committer | Janne Blomqvist <janne.blomqvist@aalto.fi> | 2017-09-13 17:43:12 +0300 |
| commit | f739af1e43e0005971641738f588f28c9abae08d (patch) | |
| tree | f0ea0f6a8456e270ff90b7a3daa086fe31690d9a /cmake | |
| parent | 205df66325b566d2ae5f87f8a68f9d829765d4d5 (diff) | |
Simplify pthreads library detection
Use the cmake builtin Threads library detection, and bail out if it
wasn't pthreads. This allows deleting the cmake/FindPTHREAD.cmake file
which complains because pthreads doesn't provide a pkg-config file.
In newer versions of cmake the FindThreads module has the
THREADS_PREFER_PTHREAD_FLAG variable and creates a Threads::Threads
import target. However, in order top remain compatible with older
cmake version this is not used.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/FindPTHREAD.cmake | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/cmake/FindPTHREAD.cmake b/cmake/FindPTHREAD.cmake deleted file mode 100644 index cd22882cb..000000000 --- a/cmake/FindPTHREAD.cmake +++ /dev/null @@ -1,38 +0,0 @@ -# Remmina - The GTK+ Remote Desktop Client -# -# Copyright (C) 2011 Marc-Andre Moreau -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. - -find_package(PkgConfig) -pkg_check_modules(PC_PTHREAD pthread) -set(PTHREAD_DEFINITIONS ${PC_PTHREAD_CFLAGS_OTHER}) - -find_path(PTHREAD_INCLUDE_DIR NAMES pthread.h - HINTS ${PC_PTHREAD_INCLUDEDIR} ${PC_PTHREAD_INCLUDE_DIRS}) - -find_library(PTHREAD_LIBRARY NAMES pthread - HINTS ${PC_PTHREAD_LIBDIR} ${PC_PTHREAD_LIBRARY_DIRS}) - -include(FindPackageHandleStandardArgs) - -find_package_handle_standard_args(PTHREAD DEFAULT_MSG PTHREAD_LIBRARY PTHREAD_INCLUDE_DIR) - -set(PTHREAD_LIBRARIES ${PTHREAD_LIBRARY}) -set(PTHREAD_INCLUDE_DIRS ${PTHREAD_INCLUDE_DIR}) - -mark_as_advanced(PTHREAD_INCLUDE_DIR PTHREAD_LIBRARY) - |