Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
D
dynamic-graph
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD 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
Stack Of Tasks
dynamic-graph
Commits
25e0fa81
"README.md" did not exist on "0c5ca3e7b57b66d517d9ffb95565196f68acf2fe"
Commit
25e0fa81
authored
14 years ago
by
Thomas Moulard
Browse files
Options
Downloads
Patches
Plain Diff
Switch to generic pthread detection macro.
parent
f62d3d66
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+3
-17
3 additions, 17 deletions
CMakeLists.txt
cmake
+1
-1
1 addition, 1 deletion
cmake
with
4 additions
and
18 deletions
CMakeLists.txt
+
3
−
17
View file @
25e0fa81
...
@@ -17,6 +17,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
...
@@ -17,6 +17,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
INCLUDE
(
cmake/base.cmake
)
INCLUDE
(
cmake/base.cmake
)
INCLUDE
(
cmake/boost.cmake
)
INCLUDE
(
cmake/boost.cmake
)
INCLUDE
(
cmake/pthread.cmake
)
SET
(
PROJECT_NAME dynamic-graph
)
SET
(
PROJECT_NAME dynamic-graph
)
SET
(
PROJECT_VERSION 1.0.0.99
)
SET
(
PROJECT_VERSION 1.0.0.99
)
...
@@ -44,26 +45,11 @@ SET(PKG_CONFIG_EXTRA
...
@@ -44,26 +45,11 @@ SET(PKG_CONFIG_EXTRA
plugindir=
${
CMAKE_INSTALL_PREFIX
}
/
${
PLUGINDIR
}
"
)
plugindir=
${
CMAKE_INSTALL_PREFIX
}
/
${
PLUGINDIR
}
"
)
# Add dependency toward dynamic graph library in pkg-config file.
# Add dependency toward dynamic graph library in pkg-config file.
SET
(
PKG_CONFIG_
LIBS
"
${
PKG_CONFIG_LIBS
}
${
LIBINCL_KW
}
dynamic-graph
${
LIB_EXT
}
"
)
PKG_CONFIG_
APPEND_LIBS
(
"
dynamic-graph"
)
# Search for Boost.
# Search for Boost.
SEARCH_FOR_BOOST
()
SEARCH_FOR_BOOST
()
SEARCH_FOR_PTHREAD
()
# Search for Pthread.
INCLUDE
(
FindThreads
)
IF
(
UNIX
)
IF
(
CMAKE_USE_PTHREADS_INIT
)
ADD_DEFINITIONS
(
-pthread
)
ELSE
(
CMAKE_USE_PTHREADS_INIT
)
MESSAGE
(
FATAL_ERROR
"Pthread is required on Unix, but "
${
CMAKE_THREAD_LIBS_INIT
}
" has been detected."
)
ENDIF
(
CMAKE_USE_PTHREADS_INIT
)
ELSEIF
(
WIN32
)
# Nothing to do.
ELSE
(
UNIX
)
MESSAGE
(
FATAL_ERROR
"Thread support for this platform is not implemented."
)
ENDIF
(
UNIX
)
# Remove additional warnings.
# Remove additional warnings.
IF
(
WIN32
)
IF
(
WIN32
)
...
...
This diff is collapsed.
Click to expand it.
cmake
@
30f815f6
Compare
027d2035
...
30f815f6
Subproject commit
027d20357f83e69338bca882e9e8b73e89385139
Subproject commit
30f815f6d9e4d3486eca42c2445e20bc2e116a67
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