mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-26 05:49:00 +08:00
184c724033
* [libmysql] Update to 8.0.20 * Fix the redefinition'MYSQL_BIND' between libmysql and libodb-mysql
14 lines
440 B
Diff
14 lines
440 B
Diff
diff --git a/cmake/boost.cmake b/cmake/boost.cmake
|
|
index 592a67f..202a770 100644
|
|
--- a/cmake/boost.cmake
|
|
+++ b/cmake/boost.cmake
|
|
@@ -297,7 +297,7 @@ IF(NOT BOOST_MAJOR_VERSION EQUAL 10)
|
|
COULD_NOT_FIND_BOOST()
|
|
ENDIF()
|
|
|
|
-IF(NOT BOOST_MINOR_VERSION EQUAL 70)
|
|
+IF(NOT BOOST_MINOR_VERSION EQUAL 70 AND NOT IGNORE_BOOST_VERSION)
|
|
MESSAGE(WARNING "Boost minor version found is ${BOOST_MINOR_VERSION} "
|
|
"we need 70"
|
|
)
|