Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
arbor
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Analyze
Contributor analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
arbor-sim
arbor
Commits
0e4970de
Commit
0e4970de
authored
8 years ago
by
Ben Cumming
Committed by
GitHub
8 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #39 from halfflat/bugfix/findtbb-lib-search
Add "lib" to search prefixes for libtbb
parents
0a37a6dd
3201d721
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
cmake/FindTBB.cmake
+3
-2
3 additions, 2 deletions
cmake/FindTBB.cmake
with
3 additions
and
2 deletions
cmake/FindTBB.cmake
+
3
−
2
View file @
0e4970de
...
...
@@ -158,6 +158,7 @@ if(NOT TBB_FOUND)
elseif
(
CMAKE_SYSTEM_PROCESSOR MATCHES
"^i.86$"
)
set
(
TBB_LIB_PATH_SUFFIX
"lib/ia32/gcc4.4"
)
endif
()
list
(
APPEND TBB_LIB_PATH_SUFFIX
"lib"
)
endif
()
##################################
...
...
@@ -179,12 +180,12 @@ if(NOT TBB_FOUND)
find_library
(
TBB_
${
_comp
}
_LIBRARY_RELEASE
${
_comp
}
HINTS
${
TBB_LIBRARY
}
${
TBB_SEARCH_DIR
}
PATHS
${
TBB_DEFAULT_SEARCH_DIR
}
ENV LIBRARY_PATH
PATH_SUFFIXES
"
${
TBB_LIB_PATH_SUFFIX
}
"
)
PATH_SUFFIXES
${
TBB_LIB_PATH_SUFFIX
}
)
find_library
(
TBB_
${
_comp
}
_LIBRARY_DEBUG
${
_comp
}
_debug
HINTS
${
TBB_LIBRARY
}
${
TBB_SEARCH_DIR
}
PATHS
${
TBB_DEFAULT_SEARCH_DIR
}
ENV LIBRARY_PATH
PATH_SUFFIXES
"
${
TBB_LIB_PATH_SUFFIX
}
"
)
PATH_SUFFIXES
${
TBB_LIB_PATH_SUFFIX
}
)
# Set the library to be used for the component
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
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