diff options
| author | Naios <naios-dev@live.de> | 2015-10-05 16:14:31 +0200 |
|---|---|---|
| committer | Naios <naios-dev@live.de> | 2015-10-05 17:18:15 +0200 |
| commit | 1bce131bdc117680036f673e4afbc05f5987f358 (patch) | |
| tree | 74c7066ad545206848c1b6da2314aa6a2d9e1f59 | |
| parent | 02ab60a13399d3d9d7418b88f8416d41bd8cf26b (diff) | |
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)
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/server/database/CMakeLists.txt | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 11444f93229..816eb4e9b98 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,6 +58,7 @@ set(OPENSSL_EXPECTED_VERSION 1.0.0) find_package(PCHSupport) find_package(OpenSSL REQUIRED) find_package(Threads REQUIRED) +find_package(MySQL) include(ConfigureBoost) diff --git a/src/server/database/CMakeLists.txt b/src/server/database/CMakeLists.txt index 2375f18d7b5..19fa0ee0acf 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}) |