diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2008-11-09 16:59:29 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2008-11-09 16:59:29 +0000 |
| commit | b670cd61d11bc6aee66bd95f53cc2512ffd98e0f (patch) | |
| tree | 41086b4babea4c2b07460ac832c493b490835841 | |
| parent | bbf81d6e9d7e8d520fe01850a975a257e7c71754 (diff) | |
| download | extra-cmake-modules-b670cd61d11bc6aee66bd95f53cc2512ffd98e0f.tar.gz extra-cmake-modules-b670cd61d11bc6aee66bd95f53cc2512ffd98e0f.tar.bz2 | |
-use PATH_SUFFIXES instead of listing each subdir twice, once with and once without mysql appended
Alex
Jarosloaw: can you please check that this still works as you expect ?
CCMAIL: js@iidea.pl
svn path=/trunk/KDE/kdelibs/; revision=882056
| -rw-r--r-- | modules/FindMySQL.cmake | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/modules/FindMySQL.cmake b/modules/FindMySQL.cmake index 4d32661c..6a0f8941 100644 --- a/modules/FindMySQL.cmake +++ b/modules/FindMySQL.cmake @@ -30,12 +30,10 @@ else(WIN32) PATHS $ENV{MYSQL_INCLUDE_DIR} $ENV{MYSQL_DIR}/include - /usr/include/mysql - /usr/local/include/mysql /usr/local/mysql/include - /usr/local/mysql/include/mysql /opt/mysql/mysql/include - /opt/mysql/mysql/include/mysql + PATH_SUFFIXES + mysql ) endif(WIN32) @@ -68,12 +66,10 @@ else(WIN32) $ENV{MYSQL_DIR}/libmysql_r/.libs $ENV{MYSQL_DIR}/lib $ENV{MYSQL_DIR}/lib/mysql - /usr/lib/mysql - /usr/local/lib/mysql /usr/local/mysql/lib - /usr/local/mysql/lib/mysql /opt/mysql/mysql/lib - /opt/mysql/mysql/lib/mysql + PATH_SUFFIXES + mysql ) endif(WIN32) @@ -93,12 +89,10 @@ else(WIN32) $ENV{MYSQL_DIR}/libmysql_r/.libs $ENV{MYSQL_DIR}/lib $ENV{MYSQL_DIR}/lib/mysql - /usr/lib/mysql - /usr/local/lib/mysql /usr/local/mysql/lib - /usr/local/mysql/lib/mysql /opt/mysql/mysql/lib - /opt/mysql/mysql/lib/mysql + PATH_SUFFIXES + mysql ) find_library(MYSQL_LIBRARIES NAMES mysqlclient PATHS |