Bug#28024992 MAKE IT POSSIBLE TO BUILD WITH SYSTEM RAPIDJSON

Post-push fix: Older versions of CMake (pre 3.0) does not support STRING(CONCAT ...), so the bootstrap stage in pushbuild failed. Use SET(var "str") instead. Change-Id: Icb2a7375b84eb9cf049988409ff4fd681bbc3ebf
mysql · Jun 5, 2018 · 1756a6e · 1756a6e
1 parent 1b72c2f
commit 1756a6e
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/cmake/rapidjson.cmake b/cmake/rapidjson.cmake
@@ -46,10 +46,8 @@ MACRO (CHECK_RAPIDJSON_VERSION)
   MESSAGE(STATUS "RAPIDJSON_MAJOR_VERSION is ${RAPIDJSON_MAJOR_VERSION_NUMBER}")
   MESSAGE(STATUS "RAPIDJSON_MINOR_VERSION is ${RAPIDJSON_MINOR_VERSION_NUMBER}")
 
-  STRING(CONCAT RAPIDJSON_FULL_VERSION
-         ${RAPIDJSON_MAJOR_VERSION_NUMBER}
-         "."
-         ${RAPIDJSON_MINOR_VERSION_NUMBER})
+  SET(RAPIDJSON_FULL_VERSION
+      "${RAPIDJSON_MAJOR_VERSION_NUMBER}.${RAPIDJSON_MINOR_VERSION_NUMBER}")
 
   IF (RAPIDJSON_FULL_VERSION VERSION_LESS "1.1")
     WRONG_RAPIDJSON_VERSION()