MOVED - Percona Playback

Merge lp:~stewart/percona-playback/improve-mysql-cmake-config-fail into lp:~percona-dev/percona-playback/light

  1. improve-mysql-cmake-config-fail
  2. Merge into light
Proposed by Stewart Smith
Status: Merged
Merged at revision: 122
Proposed branch: lp:~stewart/percona-playback/improve-mysql-cmake-config-fail
Merge into: lp:~percona-dev/percona-playback/light
Prerequisite: lp:~stewart/percona-playback/cassert-header
Diff against target: 21 lines (+10/-1)
1 file modified
CMakeLists.txt (+10/-1)
To merge this branch: bzr merge lp:~stewart/percona-playback/improve-mysql-cmake-config-fail
Reviewer Review Type Date Requested Status
Percona developers Pending
Review via email: mp+67502@code.launchpad.net

Description of the change

this at least gives me a correct error message.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2011-05-11 17:12:18 +0000
3+++ CMakeLists.txt 2011-07-11 08:09:56 +0000
4@@ -97,7 +97,16 @@
5 IF(WITH_MYSQL)
6 MESSAGE(STATUS "Functional tests enabled")
7 ELSE(WITH_MYSQL)
8- MESSAGE(FATAL_ERROR "Functional tests required, but mysql binary not found")
9+ if(NOT MYSQL_INSTALL_DB_FOUND)
10+ MESSAGE(FATAL_ERROR "Functional tests required, but mysql_install_db not found")
11+ ENDIF(NOT MYSQL_INSTALL_DB_FOUND)
12+ if(NOT MYSQLD_FOUND)
13+ MESSAGE(FATAL_ERROR "Functional tests required, but mysqld not found")
14+ ENDIF(NOT MYSQLD_FOUND)
15+ if(NOT MYSQL_FOUND)
16+ MESSAGE(FATAL_ERROR "Functional tests required, but mysql not found")
17+ ENDIF(NOT MYSQL_FOUND)
18+
19 ENDIF(WITH_MYSQL)
20 ELSE(WITH_FUNCTIONAL_TEST)
21 MESSAGE(STATUS "Functional tests disabled")

Subscribers

People subscribed via source and target branches