You've already forked macports-ports
mirror of
https://github.com/macports/macports-ports.git
synced 2026-07-12 18:20:25 -07:00
Ken Cunningham
44c085bfac
there is a conflict with c++17, which uses a header called version see: https://trac.macports.org/ticket/60400
23 lines
765 B
Diff
23 lines
765 B
Diff
diff --git a/cmake/mysql_version.cmake b/cmake/mysql_version.cmake
|
|
index 34ed6f4..89e238c 100644
|
|
--- a/cmake/mysql_version.cmake
|
|
+++ b/cmake/mysql_version.cmake
|
|
@@ -31,7 +31,7 @@ SET(DOT_FRM_VERSION "6")
|
|
|
|
# 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
|
|
)
|
|
|
|
@@ -39,7 +39,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}")
|