Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
CMake
CMake
Commits
4bf4cbd8
Commit
4bf4cbd8
authored
Aug 19, 2009
by
Philip Lowman
Browse files
Add Boost 1.39 & 1.40. Move ${Boost_INCLUDE_DIR}/lib to front of library search.
parent
0470a0c1
Changes
1
Hide whitespace changes
Inline
Side-by-side
Modules/FindBoost.cmake
View file @
4bf4cbd8
...
...
@@ -57,7 +57,8 @@
#
# Currently this module searches for the following version numbers:
# 1.33, 1.33.0, 1.33.1, 1.34, 1.34.0, 1.34.1, 1.35, 1.35.0, 1.35.1,
# 1.36, 1.36.0, 1.36.1, 1.37, 1.37.0, 1.38, 1.38.0
# 1.36, 1.36.0, 1.36.1, 1.37, 1.37.0, 1.38, 1.38.0, 1.39, 1.39.0,
# 1.40, 1.40.0
#
# NOTE: If you add a new major 1.x version in Boost_ADDITIONAL_VERSIONS you should
# add both 1.x and 1.x.0 as shown above. Official Boost include directories
...
...
@@ -271,7 +272,7 @@ else(Boost_FIND_VERSION_EXACT)
# The user has not requested an exact version. Among known
# versions, find those that are acceptable to the user request.
set
(
_Boost_KNOWN_VERSIONS
${
Boost_ADDITIONAL_VERSIONS
}
"1.38.0"
"1.38"
"1.37.0"
"1.37"
"1.40.0"
"1.40"
"1.39.0"
"1.39"
"1.38.0"
"1.38"
"1.37.0"
"1.37"
"1.36.1"
"1.36.0"
"1.36"
"1.35.1"
"1.35.0"
"1.35"
"1.34.1"
"1.34.0"
"1.34"
"1.33.1"
"1.33.0"
"1.33"
)
set
(
_boost_TEST_VERSIONS
)
...
...
@@ -636,11 +637,11 @@ ELSE (_boost_IN_CACHE)
# ------------------------------------------------------------------------
SET
(
_boost_LIBRARIES_SEARCH_DIRS
${
Boost_INCLUDE_DIR
}
/lib
C:/boost/lib
C:/boost
"$ENV{ProgramFiles}/boost/boost_
${
Boost_MAJOR_VERSION
}
_
${
Boost_MINOR_VERSION
}
_
${
Boost_SUBMINOR_VERSION
}
/lib"
"$ENV{ProgramFiles}/boost/boost_
${
Boost_MAJOR_VERSION
}
_
${
Boost_MINOR_VERSION
}
/lib"
${
Boost_INCLUDE_DIR
}
/lib
"$ENV{ProgramFiles}/boost"
/sw/local/lib
)
...
...
Write
Preview
Supports
Markdown
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!
Cancel
Please
register
or
sign in
to comment