mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-28 05:27:51 +08:00
24e8be5fcf
* [boost] update to 1.73 * [ompl] remove dependency to boost-disjoint-sets * [libtorrent] include fixes from RC_1_2 branch * [liblas] fix boost headers * [freeopcua] fix std headers * [pcl] fix build with Boost 1.73.0 * [hpx] fix build with Boost 1.73.0 * [libmysql] fix conflict with C++20 header <version> * [boost-modular-build-helper] move port-specific b2 options to the file `<port_dir>/b2-options.cmake` [boost-python] support Python2 (fixes #3495) * [boost-python] remove Python executable from user-config * [libtorrent] update version after merge * [libtorrent] add boost-variant dependency
27 lines
874 B
Diff
27 lines
874 B
Diff
diff --git a/VERSION b/VERSION.txt
|
|
similarity index 100%
|
|
rename from VERSION
|
|
rename to VERSION.txt
|
|
diff --git a/cmake/mysql_version.cmake b/cmake/mysql_version.cmake
|
|
index bed6e9f02e2..a924ef09bac 100644
|
|
--- a/cmake/mysql_version.cmake
|
|
+++ b/cmake/mysql_version.cmake
|
|
@@ -30,7 +30,7 @@ SET(PROTOCOL_VERSION "10")
|
|
|
|
# Generate "something" to trigger cmake rerun when VERSION changes
|
|
CONFIGURE_FILE(
|
|
- ${CMAKE_SOURCE_DIR}/VERSION
|
|
+ ${CMAKE_SOURCE_DIR}/VERSION.txt
|
|
${CMAKE_BINARY_DIR}/VERSION.dep
|
|
)
|
|
|
|
@@ -38,7 +38,7 @@ CONFIGURE_FILE(
|
|
|
|
MACRO(MYSQL_GET_CONFIG_VALUE keyword var)
|
|
IF(NOT ${var})
|
|
- FILE (STRINGS ${CMAKE_SOURCE_DIR}/VERSION str REGEX "^[ ]*${keyword}=")
|
|
+ FILE (STRINGS ${CMAKE_SOURCE_DIR}/VERSION.txt str REGEX "^[ ]*${keyword}=")
|
|
IF(str)
|
|
STRING(REPLACE "${keyword}=" "" str ${str})
|
|
STRING(REGEX REPLACE "[ ].*" "" str "${str}")
|