Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
glslang
Manage
Activity
Members
Plan
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
CodeLinaro
public-release-test-restored
platform
external
deqp-deps
glslang
Commits
af22355b
Unverified
Commit
af22355b
authored
6 years ago
by
John Kessenich
Committed by
GitHub
6 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #1633 from akien-mga/cmake-2.8-pthread
CMake: Fix linking pthread of CMake < 3.1
parents
1a19598e
f0e911c8
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
glslang/OSDependent/Unix/CMakeLists.txt
+13
-3
13 additions, 3 deletions
glslang/OSDependent/Unix/CMakeLists.txt
with
13 additions
and
3 deletions
glslang/OSDependent/Unix/CMakeLists.txt
+
13
−
3
View file @
af22355b
...
...
@@ -2,10 +2,20 @@ add_library(OSDependent STATIC ossource.cpp ../osinclude.h)
set_property
(
TARGET OSDependent PROPERTY FOLDER glslang
)
set_property
(
TARGET OSDependent PROPERTY POSITION_INDEPENDENT_CODE ON
)
# Link pthread
set
(
CMAKE_THREAD_PREFER_PTHREAD ON
)
set
(
THREADS_PREFER_PTHREAD_FLAG ON
)
find_package
(
Threads
)
target_link_libraries
(
OSDependent Threads::Threads
)
if
(
${
CMAKE_VERSION
}
VERSION_LESS
"3.1.0"
)
# Needed as long as we support CMake 2.8 for Ubuntu 14.04,
# which does not support the recommended Threads::Threads target.
# https://cmake.org/cmake/help/v2.8.12/cmake.html#module:FindThreads
find_package
(
Threads
)
target_link_libraries
(
OSDependent
${
CMAKE_THREAD_LIBS_INIT
}
)
else
()
# This is the recommended way, so we use it for 3.1+.
set
(
THREADS_PREFER_PTHREAD_FLAG ON
)
find_package
(
Threads
)
target_link_libraries
(
OSDependent Threads::Threads
)
endif
()
if
(
ENABLE_GLSLANG_INSTALL
)
install
(
TARGETS OSDependent
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment