From c47b0c87e405026585ba1f1069c2bb26927fd359 Mon Sep 17 00:00:00 2001 From: ariel- Date: Mon, 11 Jan 2016 21:39:46 -0300 Subject: [PATCH] CMake: Fix bad generation of "revision_data.h" not including MYSQL_EXECUTABLE. * was caused through invoking "FindMySQL" after using ${MYSQL_EXECUTABLE}. * better re-run CMake if you are affected by the mysql exe wasn't found issue. (cherry picked from commit 45a60c2d22a93f6196491a0eb0478d05795e310f) Conflicts: CMakeLists.txt --- CMakeLists.txt | 1 + src/server/database/CMakeLists.txt | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index df0eb0126f4..96d427c1817 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,6 +59,7 @@ find_package(PCHSupport) find_package(OpenSSL REQUIRED) find_package(Threads REQUIRED) find_package(ZMQ REQUIRED) +find_package(MySQL) include(ConfigureBoost) diff --git a/src/server/database/CMakeLists.txt b/src/server/database/CMakeLists.txt index ad1074496ce..5a53899f4cb 100644 --- a/src/server/database/CMakeLists.txt +++ b/src/server/database/CMakeLists.txt @@ -8,7 +8,9 @@ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -find_package(MySQL REQUIRED) +if (NOT MYSQL_FOUND) + message(SEND_ERROR "MySQL wasn't found on your system but it's required to build the servers!") +endif() if( USE_COREPCH ) include_directories(${CMAKE_CURRENT_BINARY_DIR})